From 6be0299c4bc1b6d3be43c891b794b803d96a3f5e Mon Sep 17 00:00:00 2001
From: cxn-wr7-u1 <enes.herguel@stud.hs-hannover.de>
Date: Thu, 22 Apr 2021 03:23:13 +0200
Subject: [PATCH] Maze-ready!
---
src/algorithm/Explorer.java | 5 +----
src/algorithm/WorkingExplorers.java | 2 +-
src/parallel/SharedRessources.java | 9 ---------
src/window/MainWindow.java | 1 -
4 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/algorithm/Explorer.java b/src/algorithm/Explorer.java
index eee1875..102ba6d 100644
--- a/src/algorithm/Explorer.java
+++ b/src/algorithm/Explorer.java
@@ -39,13 +39,10 @@ public class Explorer {
(int) SharedRessources.getInstance().getVisitMatrix()[index]
.getZ();
- if (currentStepsOnField <= steps + SharedRessources.getInstance().getEpsilon()) {
+ if (currentStepsOnField <= steps) {
return;
}
-
-
-
boolean wall =
SharedRessources.getInstance().getWallMatrix()[index];
if (wall)
diff --git a/src/algorithm/WorkingExplorers.java b/src/algorithm/WorkingExplorers.java
index 3c9d2eb..edf895d 100644
--- a/src/algorithm/WorkingExplorers.java
+++ b/src/algorithm/WorkingExplorers.java
@@ -17,7 +17,7 @@ public class WorkingExplorers extends EagerWorkingThread {
}
- private ConcurrentLinkedQueue<Explorer> currentWaitingExplorers = new ConcurrentLinkedQueue<Explorer>();
+ private ConcurrentLinkedQueue<Explorer> currentWaitingExplorers = new ConcurrentLinkedQueue<Explorer>(); // suited for maze only!!!
@Override
public void onBegin() {
diff --git a/src/parallel/SharedRessources.java b/src/parallel/SharedRessources.java
index 40c8f56..9e99be2 100644
--- a/src/parallel/SharedRessources.java
+++ b/src/parallel/SharedRessources.java
@@ -55,15 +55,6 @@ public class SharedRessources {
private Object signalingObject;
- private int epsilon;
-
- public void setEpsilon(int epsilon) {
- this.epsilon = epsilon;
- }
-
- public int getEpsilon() {
- return epsilon;
- }
public Object getSignalingObject() {
return signalingObject;
diff --git a/src/window/MainWindow.java b/src/window/MainWindow.java
index eb666b0..9d20d75 100644
--- a/src/window/MainWindow.java
+++ b/src/window/MainWindow.java
@@ -23,7 +23,6 @@ public class MainWindow extends Game {
@Override
public void loadGame() {
SharedRessources.setMaximumCores(Integer.MAX_VALUE);
- SharedRessources.getInstance().setEpsilon(0);
try {
MapLoader.getDefault().load(ImageIO.read(new File("c:/users/enesh/desktop/tests/maze2.png")));
} catch (IOException e) {
--
GitLab