From e19a031a1696efbef88f96780bda1d627760579c Mon Sep 17 00:00:00 2001 From: cmerkens Date: Fri, 5 Jul 2024 14:20:39 +0200 Subject: [PATCH 1/2] Stable Version 3.0 --- .idea/workspace.xml | 7 +-- .idea/workspace.xml.BASE | 117 +++++++++++++++++++++++++++++++++++++ .idea/workspace.xml.LOCAL | 79 +++++++++++++++++++++++++ .idea/workspace.xml.REMOTE | 114 ++++++++++++++++++++++++++++++++++++ .idea/workspace.xml.bak | 100 +++++++++++++++++++++++++++++++ 5 files changed, 412 insertions(+), 5 deletions(-) create mode 100644 .idea/workspace.xml.BASE create mode 100644 .idea/workspace.xml.LOCAL create mode 100644 .idea/workspace.xml.REMOTE create mode 100644 .idea/workspace.xml.bak diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b095c51..ac091b4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,10 +4,7 @@ - - \ 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 940059e34b544849c2b527408ac26dd49aed0603..1f4432a7187820d66212c71430203704f8e68b7a 100644 GIT binary patch delta 434 zcmX}n&nv@W90&0C`@w86wFApR4h~=2Oj9T=WitCAc9^y`*=#nmGQ~nNtt90}--G|a zO%YNKoLuE!P(&OYU43lr`&^!PPd&Zf@2B`d;xeUK(lDa~P)mA2tLQI%J$lU1b^Wg0 zvw98(KnKip!bTT79DtW@1UQH=hmhn5avVjOW7wt_yBtS_6F8y|C!E9ur*O+@JTio5 z&f=AG_+f|9sF+)#dQ zsvyg1hFfZ$JJbLi!U_-U36{|p;OvgpS)alB(O?S(>oQos W!TJq$6%DmmS9PbWmsvgR+WP}?989AC delta 414 zcmX|+ODn{26o%jD=Qa|hXksx!nPJK`5)x&MTa+oc7`GYYk}Q;xsSzR@o7pMfK`A2H z@eP!+_a!Vi$p384)2Y+*zDG09)7SA}VU2t$kz7+Y6-?ihg&xUVs!pO#K7uMGq-N^X zO@pF@HA182XjOtX?b4w=I<-%i()8$rUR}_yDlOfp7{CEIIE zamX~s%yP;+cP#M0GA|@DypiOCHJ8JND`V67*>aU^yIOWEl60bCHOo(w0p$}=(w_V5 z_C@*ct;k}W6K7F{Kg|eP0UM(s`{0*`jhuWgXmOU6qf!@O#VA+RbG))jLV4Ei-lD{m zZyj&hHY%{DH`&jIirAmF-_u6)uT6Q{u&0f9+K8uJ_p}?PHET8%uA(J-7C!g}vJphI