From 58ed89d78c980b8f860fb1ae8a5202a6ab99a739 Mon Sep 17 00:00:00 2001
From: i23007 <i23007@hb.dhbw-stuttgart.de>
Date: Wed, 3 Jul 2024 21:49:51 +0200
Subject: [PATCH] Adding AStar Algorithm

---
 .idea/workspace.xml                           |  51 ++++++++---
 graph/DirectedGraph.java                      |  80 ++++++++++++++++++
 graph/Graph.java                              |   1 +
 graph/UndirectedGraph.java                    |   3 +
 .../ProjektGraph/graph/DirectedGraph.class    | Bin 8599 -> 9814 bytes
 out/production/ProjektGraph/graph/Graph.class | Bin 7400 -> 7439 bytes
 .../ProjektGraph/graph/UndirectedGraph.class  | Bin 4462 -> 4609 bytes
 7 files changed, 123 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3b901cb..378374b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="Stable Version 3.0" />
+    <list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="Adding AStar Algorithm">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/graph/DirectedGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/DirectedGraph.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/graph/Graph.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/Graph.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/graph/UndirectedGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/UndirectedGraph.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/OurApplication/OurAlgorithm.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/OurApplication/OurAlgorithm.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/graph/DirectedGraph.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/graph/DirectedGraph.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/graph/Graph.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/graph/Graph.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/graph/UndirectedGraph.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/graph/UndirectedGraph.class" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -12,6 +21,7 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="RESET_MODE" value="HARD" />
   </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 2
@@ -22,16 +32,16 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Application.Display.executor&quot;: &quot;Run&quot;,
-    &quot;Application.OurApplication.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;Versuch__Christian&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Git/ProjektGraphMain&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Application.Display.executor": "Run",
+    "Application.OurApplication.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "main",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "C:/Git/ProjektGraphMain"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Git\ProjektGraph" />
@@ -58,7 +68,23 @@
       <option name="project" value="LOCAL" />
       <updated>1720028543313</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="Adding AStar Algorithm">
+      <option name="closed" value="true" />
+      <created>1720036191925</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1720036191926</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Adding AStar Algorithm">
+      <option name="closed" value="true" />
+      <created>1720036227325</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1720036227325</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -74,6 +100,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Stable Version 3.0" />
-    <option name="LAST_COMMIT_MESSAGE" value="Stable Version 3.0" />
+    <MESSAGE value="Adding AStar Algorithm" />
+    <option name="LAST_COMMIT_MESSAGE" value="Adding AStar Algorithm" />
   </component>
 </project>
\ No newline at end of file
diff --git a/graph/DirectedGraph.java b/graph/DirectedGraph.java
index a1d9ada..41a084a 100644
--- a/graph/DirectedGraph.java
+++ b/graph/DirectedGraph.java
@@ -257,6 +257,86 @@ public class DirectedGraph<T extends VertexMarking, U extends EdgeMarking> exten
             }
         }
 
+        System.out.println("Done");
+        // Gibt Distanz zu gefragtem Knoten zurück
+        return distance.get(n2);
+    }
+    public int getShortestPathAStar(MarkedVertex<T> n1, MarkedVertex<T> n2) {
+
+        // Erstellt Hashmap um Distanz von Startnoten zu jedem Knoten auf dem Graph zu tracken
+        // Erstellt Hashmap um zu tracken welche Knoten schon besucht wurden
+        // Initialisierung aller Distanzen auf UNENDLICH (= -1)
+        // Initialisierung, dass kein Knoten besucht wurde
+        HashMap<MarkedVertex<T>, Integer> distance = new HashMap<>();
+        HashMap<MarkedVertex<T>, Boolean> visited = new HashMap<>();
+        for (MarkedVertex<T> i: this.getAllVertexes()) {
+            distance.put(i, -1);
+            visited.put(i, false);
+        }
+
+        // Erstelle Schlange wo die nächsten Verbindungen drin sind
+        PriorityQueue<WrapperElement<T>> queue = new PriorityQueue<>(new WrapperComparator<T>());
+
+        // Distanz zu Startknoten auf 0
+        // Weg zu Startknoten in die Schlange aufnehmen
+        distance.put(n1, 0);
+        queue.add(new WrapperElement<>(n1, 0));
+
+        // Variable, die Distanz zwischen aktuellem Knoten und Nachfolger speichert
+        int dist = 0;
+        // Variable, die Distanz zwischen dem potenziell nächsten Knoten und dem Zielknoten speichert
+        int airDist = 0;
+        // Zähler für LogList
+        int step = 0;
+        visualizationElements.Graph display;
+
+        while (!queue.isEmpty()) {
+            // Den nächsten Knoten, der am wenigsten kostet, besuchen
+            WrapperElement<T> nextVertex = queue.poll();
+
+            // Knoten als besucht makieren
+            visited.put(nextVertex.getElement(), true);
+
+
+            // Logging
+            System.out.println("Visit " + nextVertex.getElement().getName());
+            this.logList.add(new OurLogElement(step, "Step: " + step, 0, nextVertex.getElement().getScreenVertex()));
+
+
+            // Gehe von diesem Knoten aus alle erreichbaren Knoten durch
+            for (MarkedVertex<T> i: this.getSuccessors(nextVertex.getElement())) {
+
+                // Kante finde, die den jetzigen und nächsten Knoten verbindet
+                for (MarkedEdge<U> j: this.getAllEdges()) {
+                    if (j.getSource() == nextVertex.getElement() && j.getDestination() == i) {
+
+                        //Berechnung der Heuristik über die Luftdistanz des nächsten Knoten zum Zielknoten
+                        airDist = (int) Math.sqrt(Math.pow((i.getCords()[0] - n2.getCords()[0]), 2)
+                                        + Math.pow((i.getCords()[1] - n2.getCords()[1]), 2));
+
+                        // Berechne Distanz zu nächstem Knoten
+                        dist = distance.get(nextVertex.getElement()) + j.getWeighting() + airDist;
+                        break;
+                    }
+                }
+
+                // Wenn es schon einen kürzeren Weg zum Knoten gibt, überspringen
+                if ((distance.get(i) <= dist && distance.get(i) != -1) || visited.get(i)) {
+                    continue;
+                }
+
+                // Aktualisiere Distanz von Start zu nächstem Knoten
+                distance.put(i, dist);
+
+                // Logging
+                System.out.println("Add " + i.getName() + " with " + dist + " weight to queue.");
+                this.logList.add(new OurLogElement(step, "Step: " + step, 0, nextVertex.getElement().getScreenVertex()));
+
+                // Nehme nächsten Knoten in die Queue auf
+                queue.add(new WrapperElement<>(i, dist));
+            }
+        }
+
         System.out.println("Done");
         // Gibt Distanz zu gefragtem Knoten zurück
         return distance.get(n2);
diff --git a/graph/Graph.java b/graph/Graph.java
index 6ecac68..e4ad131 100644
--- a/graph/Graph.java
+++ b/graph/Graph.java
@@ -267,4 +267,5 @@ public abstract class Graph<T extends VertexMarking, U extends EdgeMarking> {
 
     public abstract int getShortestPathDijkstra(MarkedVertex<T> n1, MarkedVertex<T> n2);
 
+    public abstract int getShortestPathAStar(MarkedVertex<T> n1, MarkedVertex<T> n2);
 }
diff --git a/graph/UndirectedGraph.java b/graph/UndirectedGraph.java
index 21a1f07..119e5d9 100644
--- a/graph/UndirectedGraph.java
+++ b/graph/UndirectedGraph.java
@@ -121,5 +121,8 @@ public class UndirectedGraph<T extends VertexMarking, U extends EdgeMarking> ext
     public int getShortestPathDijkstra(MarkedVertex<T> n1, MarkedVertex<T> n2) {
         return 1;
     }
+    public int getShortestPathAStar(MarkedVertex<T> n1, MarkedVertex<T> n2) {
+        return 2;
+    }
 
 }
diff --git a/out/production/ProjektGraph/graph/DirectedGraph.class b/out/production/ProjektGraph/graph/DirectedGraph.class
index d0397d83964323358b63e72cd2c81d596cc87923..f3195900138605822b69fc38759b51b4c786d664 100644
GIT binary patch
delta 3423
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
Lja<kBtw-n|+Co^_

delta 2291
zcmc(h*=t;N6vw}3wmX@bOf!3D$z<B3Njq7KLYzKy5^BY2!30r3C`yS-1)<m~q(wso
z5fOdx3PN4_H%RqG(6?F<>_Y{8sHsccHEpNXEvC`$`TZt$CP>gch-7l_xxags&sl!I
znUD6qv@7!d@>}l!n3S>CBR!FmFGSuBx(B<C7JCHFod*sbI9!piY~sW1hwnSMLmztG
zP@*@!B_jPY;K<e(-jHqXc;Z7Da-+#=U_?-M<H@pnSF$g4j;?+91PKU&2=O}aKA+qv
z=iLvIx#3UwHpVqz7@y&D-oIG2a)D23*Jtb!sXFbZQ@L@q%hE3}(zH|QOMFGWmIr-j
zJ$#LCjE57cZ0$U)lmi$<D}L~A@pZ*oe~a%JYu>$>%1*Yd$NrVI&HsDG8^BiMWp}!N
zpL&VI&+84$u7)&r7;iSGjF(deKj6n^POW!J1?am4zOxZ7QmWC5a=y1JLY)yN7-4da
z2$yhq%?Ov!@FHBHbW<~jTQluB+{_4j7~z&RBCIEez0DlXtcq|OBTO;E^coS?lfx{I
zm?}+Y4{@4KWe4YU3U+cP`Y?o_Snm*@_j^6qkE^Cay7n_AAOG&fFZh-H3t}IBqZBYx
zSLNOMSnzz<Ua1eQr1jCDhu<mZ5n4uEwupl}mN4XCWD)5__+k?)U0tNjEdDUOFXkR4
zZ)D?jZM>Vwd)dUA@pxyjWcC3tgKLzO*XE$S_m~{odDTb5^P#*}zhUxI{RZ<=-jd;U
zs;E2qA@cx*MQk8*xC6^n2@v=Z{y&Z<4D@q_5jUMr5_}-vW5BgYWo~*cbbuD49{4D1
z8+|+s{$#Curl=KSSp5Z0-xgK%wWx~L3I8=jw2(c7v3o*9K}7SPr^=gfPvv)$Bw8pw
zpe<L=MIKCALO-8t9!ah3DA8?awX`5sOXF+Q82n2JGia{{ZO{Lhm;VGKo+<n<xgT4d
z`*!!$VtP)Go-79eIL^FYMn7KR*uTa;oG_c~Kdg%QaXO&gaI4+dyAPI1EX`A;R%!YO
zwlWrVuNn2`ScEYy0SVGxPk6i6RNsz;>f5nUeH{y{AELgtYJ(0)mxB&=Yg=nX94b2R
z;&hX0ibO}d*FzLuCsA1bnMj-ti73&@O8Ke~DN}jc?42W=xH06+#D*k+?GoiK>cka%
zY}TT9RwgATo#^2A=7p6KQfeMyl<W}}mU9vp76l18D_xWVxLcl)gd{l|kIBQ5;tmX9
zRvwZxC1=i5{eDE606a0801F;K11kU-55V-q0GRX70O<K=0kR%I&I8y;0PWZmqRS{a
yc+z~_<C|{WWxnbpPgN@wq)0`dl%$*YH2lIJ3Q{)Lin(r<D&Iu7Iw-?3iu_-m4Xc3w

diff --git a/out/production/ProjektGraph/graph/Graph.class b/out/production/ProjektGraph/graph/Graph.class
index 00d3c304313e132954a06048b891d5f6ecb3c6bd..0e5da0272c2f0bb373257c3aebc5314e89e654f6 100644
GIT binary patch
delta 182
zcmaE1*>A;l>ff$?3=9m83@0{nJ>nD<Nlz^a&d4t+Ni8l3NG!>43@%A5n*55hNPZ_H
z0}~@72g7a<&Bf2gu$PNrAH#ljh66kd1`G!$S94uvJTlpzTZ`owBZJ)J2VCNl_i?dL
zp3QB;D7X0r_bmZ87Dk563>z638LEI5GBIpoV1cr>Fl+^jY-89Cr1^kydw{BTfXQ79
Rhk#;SK>lHdqYTFxBmttHFZBQb

delta 138
zcmeCTdSS_R>ff$?3=9m8497QeJ>s0q%vB)2gOP!Wk&%O87l`KKXJgpI#juxQA3MW-
z9tH!31Cu9lU1mAV$e=oTAD1dKJHye*6S-p<WjDX)z9nGBz`{@kG>(a3Gs6}zy_I1b
fkmdu5>}FtO*bXLlG8_boaRK><7>+O;V~_*@ELtJy

diff --git a/out/production/ProjektGraph/graph/UndirectedGraph.class b/out/production/ProjektGraph/graph/UndirectedGraph.class
index 8e5be8ef3b50a761035932097efaceb0ce1f9c46..0690aa5f9b31ed3f46f2ec47cb2368f7fe07cf14 100644
GIT binary patch
delta 106
zcmaE-)TqLB>ff$?3=9m8468SC^>T`eq^FhyXXF=^q!yP1B$i}22A3ojO`gix%gDP~
znahe@osnTV!(s*|h6bRfGzLZnW+2VPx&}xxGc*E8HlP>-L+xY^!C1}}3@bsh466W}
CY8ih3

delta 44
zcmZovd8fp6>ff$?3=9m8468PB^>R*L$Jx!uv)PKvihc42K@QI43@d<=ObjalXzmU5