From: LeonardoBizzoni Date: Sun, 8 Aug 2021 07:07:25 +0000 (+0200) Subject: Removed static variables X-Git-Url: http://git.leonardobizzoni.com/?a=commitdiff_plain;h=6ff9e2646b3805c3a7aa0603f6ce1c397b931e4d;p=astar-visualizer Removed static variables --- diff --git a/src/main/java/Main/AStar.java b/src/main/java/Main/AStar.java index 1625baf..e86a967 100644 --- a/src/main/java/Main/AStar.java +++ b/src/main/java/Main/AStar.java @@ -15,8 +15,8 @@ public class AStar{ public void searchPath(Node parent) { for (int i = 0; i < 4; i++) { - x = (int) Math.round(parent.getX() + (-map.size* Math.cos((Math.PI / 2) * i))); - y = (int) Math.round(parent.getY() + (-map.size* Math.sin((Math.PI / 2) * i))); + x = (int) Math.round(parent.getX() + (-map.getNodeSize()* Math.cos((Math.PI / 2) * i))); + y = (int) Math.round(parent.getY() + (-map.getNodeSize() * Math.sin((Math.PI / 2) * i))); calculateOpenNode(x, y, parent); } @@ -27,12 +27,12 @@ public class AStar{ PathfinderUtils.closedNodes.add(parent); PathfinderUtils.openNodes.remove(parent); - if (!map.isFinished) + if (!map.isFinished()) searchPath(parent); } public void calculateOpenNode(int nextX, int nextY, Node parent) { - if (nextX >= Map.width || nextY >= Map.height || nextX < 0 || nextY < 0) + if (nextX >= map.getWidth() || nextY >= map.getHeight() || nextX < 0 || nextY < 0) return; if (PathfinderUtils.locateBarrier(nextX, nextY) != -1) return; @@ -42,8 +42,8 @@ public class AStar{ PathfinderUtils.endNode.setParentNode(parent); PathfinderUtils.drawPath(); - map.isFinished = true; - map.running = false; + map.setFinished(true); + map.setRunning(false); map.repaint(); return; } @@ -68,9 +68,9 @@ public class AStar{ int g = parent.getG(); if (gx != 0 && gy != 0) { - g += (int) (Math.sqrt(2 * (Math.pow(map.size, 2)))); + g += (int) (Math.sqrt(2 * (Math.pow(map.getNodeSize(), 2)))); } else { - g += map.size; + g += map.getNodeSize(); } openNode.setG(g); @@ -93,7 +93,7 @@ public class AStar{ return PathfinderUtils.openNodes.get(0); } - map.isFinished = true; + map.setFinished(true); map.repaint(); return null; } diff --git a/src/main/java/Main/Map.java b/src/main/java/Main/Map.java index c2d94e5..1d30711 100644 --- a/src/main/java/Main/Map.java +++ b/src/main/java/Main/Map.java @@ -18,12 +18,9 @@ class Map extends JPanel implements MouseListener, MouseMotionListener, KeyListe private JFrame window; private char key = (char) 0; - static int width; - static int height; - boolean isFinished = false; - boolean running = false; - - int size = 20; + private boolean isFinished = false; + private boolean running = false; + private int size = 20; public Map() { this.setBackground(new Color(40, 40, 40)); @@ -42,9 +39,6 @@ class Map extends JPanel implements MouseListener, MouseMotionListener, KeyListe window.pack(); window.setVisible(true); - width = this.getWidth(); - height = this.getHeight(); - this.revalidate(); this.repaint(); } @@ -272,4 +266,28 @@ class Map extends JPanel implements MouseListener, MouseMotionListener, KeyListe @Override public void mouseMoved(MouseEvent e) { } + + public boolean isFinished() { + return isFinished; + } + + public void setFinished(boolean isFinished) { + this.isFinished = isFinished; + } + + public boolean isRunning() { + return running; + } + + public void setRunning(boolean running) { + this.running = running; + } + + public int getNodeSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } } diff --git a/target/PathVisualizer-1.0-SNAPSHOT.jar b/target/PathVisualizer-1.0-SNAPSHOT.jar index 365027e..50e97bd 100644 Binary files a/target/PathVisualizer-1.0-SNAPSHOT.jar and b/target/PathVisualizer-1.0-SNAPSHOT.jar differ diff --git a/target/classes/Main/AStar.class b/target/classes/Main/AStar.class index 0452160..8fb8818 100644 Binary files a/target/classes/Main/AStar.class and b/target/classes/Main/AStar.class differ diff --git a/target/classes/Main/App.class b/target/classes/Main/App.class index 5d655f5..13e30fb 100644 Binary files a/target/classes/Main/App.class and b/target/classes/Main/App.class differ diff --git a/target/classes/Main/Map.class b/target/classes/Main/Map.class index bb87574..e9a8060 100644 Binary files a/target/classes/Main/Map.class and b/target/classes/Main/Map.class differ diff --git a/target/classes/Main/Node.class b/target/classes/Main/Node.class index 930f295..3ec5964 100644 Binary files a/target/classes/Main/Node.class and b/target/classes/Main/Node.class differ diff --git a/target/classes/Main/PathfinderUtils.class b/target/classes/Main/PathfinderUtils.class index a6ec000..ef6af34 100644 Binary files a/target/classes/Main/PathfinderUtils.class and b/target/classes/Main/PathfinderUtils.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 10b2555..6be0d6d 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,4 +1,4 @@ -#Created by Apache Maven 3.8.1 +#Created by Apache Maven 3.3.9 groupId=Main artifactId=PathVisualizer version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index e2dbad2..01f6db6 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,5 +1,5 @@ Main/Node.class Main/AStar.class Main/Map.class -Main/App.class Main/PathfinderUtils.class +Main/App.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index cc3946d..a000219 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,5 +1,5 @@ -/home/leo/Docs/Proj/PathVisualizer/src/main/java/Main/Map.java -/home/leo/Docs/Proj/PathVisualizer/src/main/java/Main/Node.java -/home/leo/Docs/Proj/PathVisualizer/src/main/java/Main/AStar.java -/home/leo/Docs/Proj/PathVisualizer/src/main/java/Main/App.java -/home/leo/Docs/Proj/PathVisualizer/src/main/java/Main/PathfinderUtils.java +/home/leo/Docs/Proj/pathfinding-visualizer/src/main/java/Main/PathfinderUtils.java +/home/leo/Docs/Proj/pathfinding-visualizer/src/main/java/Main/Node.java +/home/leo/Docs/Proj/pathfinding-visualizer/src/main/java/Main/App.java +/home/leo/Docs/Proj/pathfinding-visualizer/src/main/java/Main/Map.java +/home/leo/Docs/Proj/pathfinding-visualizer/src/main/java/Main/AStar.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index e6a42ce..e1f0ebc 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1 +1 @@ -/home/leo/Docs/Proj/PathVisualizer/src/test/java/Main/AppTest.java +/home/leo/Docs/Proj/pathfinding-visualizer/src/test/java/Main/AppTest.java diff --git a/target/surefire-reports/Main.AppTest.txt b/target/surefire-reports/Main.AppTest.txt index 4193956..53a7fdf 100644 --- a/target/surefire-reports/Main.AppTest.txt +++ b/target/surefire-reports/Main.AppTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: Main.AppTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 s - in Main.AppTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.036 s - in Main.AppTest diff --git a/target/surefire-reports/TEST-Main.AppTest.xml b/target/surefire-reports/TEST-Main.AppTest.xml index b9ce485..d0700b0 100644 --- a/target/surefire-reports/TEST-Main.AppTest.xml +++ b/target/surefire-reports/TEST-Main.AppTest.xml @@ -1,63 +1,54 @@ - + - - - - - - + + + + - - - - + + - - - + + + - + - - + + - - + + - - - + + - + - + - + - - + - - + + - - - - - - + + + - + \ No newline at end of file diff --git a/target/test-classes/Main/AppTest.class b/target/test-classes/Main/AppTest.class index 6b3f4e2..a08e3e3 100644 Binary files a/target/test-classes/Main/AppTest.class and b/target/test-classes/Main/AppTest.class differ