diff --git a/README.md b/README.md deleted file mode 100644 index 1b47e1fa97bd3e6e3781ba0a840b5e8a343e35c1..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# ParallelPathfinding - --1- -# -Praxisprojekt für parallele Programmierung diff --git a/Semester/.idea/.gitignore b/Semester/.idea/.gitignore deleted file mode 100644 index ae117de46c8ff6a662b3b4492c9abddb77a7ea6e..0000000000000000000000000000000000000000 --- a/Semester/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/../../../../../../../../../:\Users\enesh\Desktop\BachelorProjekt\compiler\praxisprojekt-lernsoftware-ws20-bis-ss21\ParallelPathfinderSemester6\.idea/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/Semester/.idea/misc.xml b/Semester/.idea/misc.xml deleted file mode 100644 index 91063aa21119ce3a01ff083d564fc9ebcd1fa1e9..0000000000000000000000000000000000000000 --- a/Semester/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="15" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/out" /> - </component> -</project> \ No newline at end of file diff --git a/Semester/.idea/modules.xml b/Semester/.idea/modules.xml deleted file mode 100644 index 28c395fa0e30fb94ae9d4a98ddf72bdd530eccb8..0000000000000000000000000000000000000000 --- a/Semester/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/ParallelPathfinderSemester6.iml" filepath="$PROJECT_DIR$/ParallelPathfinderSemester6.iml" /> - </modules> - </component> -</project> \ No newline at end of file diff --git a/Semester/.idea/vcs.xml b/Semester/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000 --- a/Semester/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$" vcs="Git" /> - </component> -</project> \ No newline at end of file diff --git a/Semester/out/production/ParallelPathfinderSemester6/Program.class b/Semester/out/production/ParallelPathfinderSemester6/Program.class deleted file mode 100644 index d455cac1a9418cea82df60292b4f6c4d24ea23df..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/Program.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer$1.class b/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer$1.class deleted file mode 100644 index 9bf91cb086236eaeb7d0882b5a38341b5194618a..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer$1.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer$Direction.class b/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer$Direction.class deleted file mode 100644 index df527f54d3c5eb7eaeba20cb63a740434ae77e92..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer$Direction.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer.class b/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer.class deleted file mode 100644 index 934cf500979c207979f70dd282cc1dbd87565d54..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/algorithm/Explorer.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/algorithm/ParallelPathfinder.class b/Semester/out/production/ParallelPathfinderSemester6/algorithm/ParallelPathfinder.class deleted file mode 100644 index 8e8ee9ffbd05f1ad67e8f916a0e2b851ba813668..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/algorithm/ParallelPathfinder.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/algorithm/WorkingExplorers.class b/Semester/out/production/ParallelPathfinderSemester6/algorithm/WorkingExplorers.class deleted file mode 100644 index 3121fad9cdc17adab163833ffc33771559020792..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/algorithm/WorkingExplorers.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/parallel/EagerWorkingThread.class b/Semester/out/production/ParallelPathfinderSemester6/parallel/EagerWorkingThread.class deleted file mode 100644 index d33501c2abbeb0d3f1d0b5a6c471fa45a3548445..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/parallel/EagerWorkingThread.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/parallel/MapLoader.class b/Semester/out/production/ParallelPathfinderSemester6/parallel/MapLoader.class deleted file mode 100644 index 2e16e159b8c90f417302de605ee44da56565acbf..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/parallel/MapLoader.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/parallel/SharedRessources.class b/Semester/out/production/ParallelPathfinderSemester6/parallel/SharedRessources.class deleted file mode 100644 index b7625dfd43355bcf474759051cc36a4d93eec670..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/parallel/SharedRessources.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/structs/Vec3.class b/Semester/out/production/ParallelPathfinderSemester6/structs/Vec3.class deleted file mode 100644 index eeb1bb0875f089539a8bc41b218a1a64d7429cbb..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/structs/Vec3.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/window/Game$1.class b/Semester/out/production/ParallelPathfinderSemester6/window/Game$1.class deleted file mode 100644 index ccc2c7acb5d52e7bffe7a05c889ea1910fd4dcd7..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/window/Game$1.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/window/Game$2.class b/Semester/out/production/ParallelPathfinderSemester6/window/Game$2.class deleted file mode 100644 index d119eae634de8002abe20865dc7687bcea45c6c9..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/window/Game$2.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/window/Game.class b/Semester/out/production/ParallelPathfinderSemester6/window/Game.class deleted file mode 100644 index a77bca504030367a5d09f45f0253ced217188f22..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/window/Game.class and /dev/null differ diff --git a/Semester/out/production/ParallelPathfinderSemester6/window/MainWindow.class b/Semester/out/production/ParallelPathfinderSemester6/window/MainWindow.class deleted file mode 100644 index 35b04c16cd273899f543da3ab412619bf35f0607..0000000000000000000000000000000000000000 Binary files a/Semester/out/production/ParallelPathfinderSemester6/window/MainWindow.class and /dev/null differ diff --git a/Semester/src/Program.java b/src/Program.java similarity index 100% rename from Semester/src/Program.java rename to src/Program.java diff --git a/Semester/src/algorithm/Explorer.java b/src/algorithm/Explorer.java similarity index 100% rename from Semester/src/algorithm/Explorer.java rename to src/algorithm/Explorer.java diff --git a/Semester/src/algorithm/ParallelPathfinder.java b/src/algorithm/ParallelPathfinder.java similarity index 100% rename from Semester/src/algorithm/ParallelPathfinder.java rename to src/algorithm/ParallelPathfinder.java diff --git a/Semester/src/algorithm/WorkingExplorers.java b/src/algorithm/WorkingExplorers.java similarity index 100% rename from Semester/src/algorithm/WorkingExplorers.java rename to src/algorithm/WorkingExplorers.java diff --git a/Semester/src/parallel/EagerWorkingThread.java b/src/parallel/EagerWorkingThread.java similarity index 100% rename from Semester/src/parallel/EagerWorkingThread.java rename to src/parallel/EagerWorkingThread.java diff --git a/Semester/src/parallel/MapLoader.java b/src/parallel/MapLoader.java similarity index 98% rename from Semester/src/parallel/MapLoader.java rename to src/parallel/MapLoader.java index 677c2e07602d7c7e7c5ef34dfcd3fe8ea71e6397..52d1aee846f68b02db5d80164d72f1a1aa859121 100644 --- a/Semester/src/parallel/MapLoader.java +++ b/src/parallel/MapLoader.java @@ -43,7 +43,7 @@ public class MapLoader { for (int j = 0; j < height; j++) { for (int i = 0; i < width; i++) { SharedRessources.getInstance().getWallMatrix()[i + j * width] = - ((BufferedImage) src).getRGB(i, j) == Color.white.getRGB(); + ((BufferedImage) src).getRGB(i, j) == Color.black.getRGB(); } } } diff --git a/Semester/src/parallel/SharedRessources.java b/src/parallel/SharedRessources.java similarity index 100% rename from Semester/src/parallel/SharedRessources.java rename to src/parallel/SharedRessources.java diff --git a/Semester/src/structs/Vec3.java b/src/structs/Vec3.java similarity index 100% rename from Semester/src/structs/Vec3.java rename to src/structs/Vec3.java diff --git a/Semester/src/window/Game.java b/src/window/Game.java similarity index 100% rename from Semester/src/window/Game.java rename to src/window/Game.java diff --git a/Semester/src/window/MainWindow.java b/src/window/MainWindow.java similarity index 91% rename from Semester/src/window/MainWindow.java rename to src/window/MainWindow.java index 01a0ce86f0add287da69d5ca83a4814d72aae08e..5ff08b527e87f4dc05f53c770bbf3afc37f66913 100644 --- a/Semester/src/window/MainWindow.java +++ b/src/window/MainWindow.java @@ -24,7 +24,7 @@ public class MainWindow extends Game { public void loadGame() { SharedRessources.setMaximumCores(Integer.MAX_VALUE); try { - MapLoader.getDefault().load(ImageIO.read(new File("c:/users/enesh/desktop/t.png"))); + MapLoader.getDefault().load(ImageIO.read(new File("c:/users/enesh/desktop/tests/debug.png"))); } catch (IOException e) { e.printStackTrace(); } @@ -37,7 +37,7 @@ public class MainWindow extends Game { public void updateGame() { if (keys[KeyEvent.VK_ENTER]) - pts = parallelPathfinder.calculatePath(70, 26, 23, 24); + pts = parallelPathfinder.calculatePath(10, 114, 33, 30); }