diff --git a/.gitignore b/.gitignore index 6a3417b..e0d52eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /out/ +/.idea/ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ac091b4..e60047f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,9 @@ - - \ No newline at end of file diff --git a/OurApplication/OurLogElement.java b/OurApplication/OurLogElement.java index a9590d2..4248d14 100644 --- a/OurApplication/OurLogElement.java +++ b/OurApplication/OurLogElement.java @@ -48,7 +48,6 @@ public class OurLogElement extends LogElement{ } - public OurLogElement(int step, String description, long value, Edge e){ this.step = step; this.description = description; @@ -56,6 +55,7 @@ public class OurLogElement extends LogElement{ this.edge = e; } + public OurLogElement(int step, String description, long value, visualizationElements.Graph ourGraph ){ this.step = step; this.description = description; diff --git a/graph/DirectedGraph.java b/graph/DirectedGraph.java index b04e453..67422e4 100644 --- a/graph/DirectedGraph.java +++ b/graph/DirectedGraph.java @@ -285,6 +285,9 @@ public class DirectedGraph exten // Gibt Distanz zu gefragtem Knoten zurück return distance.get(n2); } + + + public int getShortestPathAStar(MarkedVertex n1, MarkedVertex n2) { // Erstellt Hashmap um Distanz von Startnoten zu jedem Knoten auf dem Graph zu tracken diff --git a/out/production/ProjektGraph/.idea/workspace.xml b/out/production/ProjektGraph/.idea/workspace.xml index 15310ea..e60047f 100644 --- a/out/production/ProjektGraph/.idea/workspace.xml +++ b/out/production/ProjektGraph/.idea/workspace.xml @@ -4,10 +4,8 @@ - - \ No newline at end of file diff --git a/out/production/ProjektGraph/graph/DirectedGraph.class b/out/production/ProjektGraph/graph/DirectedGraph.class index 940059e..1f4432a 100644 Binary files a/out/production/ProjektGraph/graph/DirectedGraph.class and b/out/production/ProjektGraph/graph/DirectedGraph.class differ