From 04d5175ab0d5ade33c9e582531cc5243e9e7af38 Mon Sep 17 00:00:00 2001
From: i23007 <i23007@hb.dhbw-stuttgart.de>
Date: Fri, 5 Jul 2024 14:00:35 +0200
Subject: [PATCH] Added step to Algorithm to better display start and end
 vertex

---
 .idea/workspace.xml                           |  36 ++++++------------
 graph/DirectedGraph.java                      |  10 +++++
 .../ProjektGraph/graph/DirectedGraph.class    | Bin 11128 -> 11205 bytes
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a66bbd2..b095c51 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,19 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="Adding AStar Algorithm">
+    <list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="Stable Version with finished visualisation">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/OurApplication/OurApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/OurApplication/OurApplication.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/OurApplication/OurDrawArea.java" beforeDir="false" afterPath="$PROJECT_DIR$/OurApplication/OurDrawArea.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/OurApplication/OurLogElement.java" beforeDir="false" afterPath="$PROJECT_DIR$/OurApplication/OurLogElement.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/graph/DirectedGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/DirectedGraph.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/graph/Display.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/OurApplication/OurApplication.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/OurApplication/OurApplication.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/OurApplication/OurDrawArea.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/OurApplication/OurDrawArea.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/OurApplication/OurLogElement.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/OurApplication/OurLogElement.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/Display.class" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -96,7 +86,15 @@
       <option name="project" value="LOCAL" />
       <updated>1720042374225</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="Stable Version with finished visualisation">
+      <option name="closed" value="true" />
+      <created>1720120737939</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1720120737940</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -113,17 +111,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Stable Version 3.0" />
     <MESSAGE value="Adding AStar Algorithm" />
-    <option name="LAST_COMMIT_MESSAGE" value="Adding AStar Algorithm" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/OurApplication/OurDrawArea.java</url>
-          <line>53</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <MESSAGE value="Stable Version with finished visualisation" />
+    <option name="LAST_COMMIT_MESSAGE" value="Stable Version with finished visualisation" />
   </component>
 </project>
\ No newline at end of file
diff --git a/graph/DirectedGraph.java b/graph/DirectedGraph.java
index b8d6ae0..b04e453 100644
--- a/graph/DirectedGraph.java
+++ b/graph/DirectedGraph.java
@@ -231,6 +231,11 @@ public class DirectedGraph<T extends VertexMarking, U extends EdgeMarking> exten
         // Zähler für LogList
         int step = 0;
 
+        // Färben der Start und Ziel Knoten für Visualisierung + hinzufügen zur LogList
+        n1.getScreenVertex().setColor(Color.RED);
+        n2.getScreenVertex().setColor(Color.RED);
+        this.logList.add(new OurLogElement(step, "Step: " + step, 0, this.getScreenGraphCopy()));
+
         while (!queue.isEmpty()) {
             // Den nächsten Knoten, der am wenigsten kostet, besuchen
             WrapperElement<T> nextVertex = queue.poll();
@@ -308,6 +313,11 @@ public class DirectedGraph<T extends VertexMarking, U extends EdgeMarking> exten
         // Zähler für LogList
         int step = 0;
 
+        // Färben der Start und Ziel Knoten für Visualisierung + hinzufügen zur LogList
+        n1.getScreenVertex().setColor(Color.RED);
+        n2.getScreenVertex().setColor(Color.RED);
+        this.logList.add(new OurLogElement(step, "Step: " + step, 0, this.getScreenGraphCopy()));
+
         while (!queue.isEmpty()) {
             // Den nächsten Knoten, der am wenigsten kostet, besuchen
             WrapperElement<T> nextVertex = queue.poll();
diff --git a/out/production/ProjektGraph/graph/DirectedGraph.class b/out/production/ProjektGraph/graph/DirectedGraph.class
index 0abe4b5c3eb9e0ed66de6d1216663bbdff197afd..940059e34b544849c2b527408ac26dd49aed0603 100644
GIT binary patch
delta 4093
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
F{|{p5#RdQX

delta 4104
zcmcInYj9Op75>)Eedi<+a&N-T<0d2_At4VSyaJd&D6K#!FCpbs2qc7Hnji^ODthTd
zI~2snnbCqHK9~vP8!22~V})_7SgE#Flv>eZ6_i%N(po?WetVyjlZ3)lesnT9*=O&y
z*ZS7l-?#S3&+4x%2tMC^<XHfd<<TDnM+GW^IE)hpeu0q!UrWc-ht_s(RCB*Ha1vt#
z?zQc$tw9{euMGSeFPi&<Llb|4mwouHfm8UMc|KU_2TmJ!1%EJ42C}5kd{IJXRbnXc
zN1XBDPX_*ME=VkxbQXW{;dKLl#oq+UYZ^8*R5U!?Suv%(wS67K)Yi?PDi~1Le_=up
zV{zWV-|-JK7RYzMA;>a^CuNlmgy5el=)VNvq0@@3eXR{`%@y-H*R`}Yb7vYZ8TdEe
zGX23S{{_5lz=L<pX~AlL8m<_)ifg8sSmV8J;0C(Q(}|TcVTfR&z~9o=xuBtSeNzyv
zl3<8iO&ZNjo%KyE&8s`<K8OS2HN>aNW~^v$Z*6L5(>n&jB>@7Hp!tANI^?Vvh9s$!
zy$h$-)y=B+%ZHflJ?(Auy+Kk887Qgdw~g$?bQ$E6h#?u0X})9(_NPm>AyLVB=9)3r
zm${awv!JD;r88Ij!g~4UbvCUXuU<OM=1_j}hM+twpYX{>75WkL>CnsaDYG?P;*JTT
zW_vhl9tszv=JMcOG8n0>o(Eot<e3-4)sk<Pr=^z_aMj=nP$om95RjsNGeh~N_7&)T
z>(Xjw<#T2r+<fNi`8*6k845*tN`s5fa?6t*6-x<s_WD$7+NTV|TgvB`($lJxO9JDw
zRJ*YNdENs^%~*hV!Wz)5^jDZj@t~TR3O^TqwD3GjrHuaSP%Pyfd2o<(6*8Q2J2^Lk
zBM+@l*f2Bj0~v`7#?M2SRLUqOQG#7Enxg~_Jr@bKy^3yGjd85T(rTP}e$cQ7t7JS&
zokyF=^rrIhl<Y@zF9!+In`G_(lceNwmrEwlO$*j2x8~YN;Zo%#S;LvmBxWFlx;~W;
z+bIEInJ6E&D{q~OT2t_?wQ8>Aa_o{CM(9ANj&QkOggJ~bml5XOA;KhKnz}&mjW9`S
zod{DHVUwN1hK#;BEMkPkjIiVm5$-03$Lt)g_KVQK2rC$2<sBm2O%A*8bzP-RnH?nE
zrOaWPbk(F)0f~DL>+NMlS2$;|LZ+$;>A8D3a`9)m+$SI5`FXHZrg7xf^(%qf_MyC4
zKCH7+K3GZHM=j%z<2V9uH<HENnH5UO<-1F!(`J{<(D;6mwVwD!XIJ*Ymq&b)weLm;
zU!&A1b#i~B%;ZSnvoI@s%S2)Bi%<Eeb$lp%mVK?xN7>iXUg68q_<ZL1?DW+8`R-<v
zukiO<*sT$!L?^`*lQXopt@N`EQG5<X*iPwvf&Ju*`n*(Kq7<*Ht?D=x4)zMsC&!&-
zGD~LDtLiaIsFr=TV{g?_*(*jWbV*3Kfy^Kqd3nw??#$(!OXetiGFRh!BRXB<OJf~?
zFC&xa3-L5c*+44rRgF!>%0!B;t7;Eb4z?=k?RrWXmX)fKWkp09hk=Ca@DoM8LeaNQ
zUD)l`KvJUR=DD1KJkF~*Ir=z1z>?gqB3)KRi2MM|OVJVLiQEv;oXO2>Rvq^PEP~8~
zDodWZZ18MG+&eg@K}EErlIBpN#wmM^O$k57%14D=ypOb$y+sLSZ&5<oD`{Ew^JzcM
z9G=%Bs0Cc%*Mf~;l({7@izvGC?gmBuU81NL2Ss)+b9D(($OE!aq2L|zV`5Drd9IlC
z`5R*qPaHqrDNX9{^T%*}yg%ZO_~UrNeF*#G*jv93FX{I<wjaUofjC~Z-`DTMYjK=Y
zm(x*PSQz$&eMj&n5GaY`;z3-F<3IH!w(Yxd6ps%?0*9$I?7(F;suUbEHy4z~Ug$zm
z#E4@{B-n-QGJDH^kKwy<+~k6|mXGo7fp^c%!)1|R9QI1syBn!}CtTmSxsm8Civw}-
z>`;4F(Io6WgzxlZ!}aZ9?-B9a$uuzAIM(lz#P`c4;yH@r3zfTr_-P!^)$h3(*wej(
zB}$cK7N)G!0rx#t-Yu#<J%v1T+mMRb1w6{?Y{f;&|1!Rhw{aBj;57Mh9oHojH-uk=
zZ0Ev;n!tACmCfRl$0bodFUj&ve*OJW2FOWCl`|5O*CZ^jOS-%%5#2~0;Ro1or0YiF
zrMD5Xi0#gx@3VR?7{gYXFN<XfkDrI%LwJtt`-LOxe(}pCSt<{*)1=6GS;mnYi)5E9
z7j+MAkjG>Nd!-i}B_=C5@@a{zLeK`l?rsC9b^z33TF?g2=m5|P(g5`3qyg}9f(4+-
z0kFye&<qdtm0XlA<z`_~fqiYQCcj%Oew&Mnwl$K^I~+a-$cVr#d{*y$`E0%4%4dJr
ze;Ynqw(puVhE7q$T^vbL#7*qNoJe9^1|*c1>SyDVAqgFlG(G9olkW1K$(4sBYx@{q
znFi)ihMvguu&;;gpDE+!Tgcu!L9)lDGB<0+Vf#pK>c@7j_hoxes{P4+yHstm(_0VO
zyHD-uZt6q!n1imD?K^qJK?d^-^GKh33@1A$$PnBog_thIBvKg~r5qhHf>f#`iAH0S
zjKvdDh3zsCUz17L%TI=9*;QYadvTMBh{|++N6(}#?k5Rn$|{*dZOoO}<80BNm3leI
z_I5;;$a7@tX_}mq23LYKx<b<AN|#lx3|Z~Umo-`_Pq6v*3MGmrEtDh%3TvSx62=y-
zlK^|C^R2*<trL!Hoy1&4JwkCs9ig0ZgmTysN}Rzd6lVI2mW=;4lChvv6P^X77ClfJ
z(E~**Mnh4GDOUK@_Yx(ep=ilyD3)Xt6iYHAhs~a1T?VV!maNgoq?PT-B@am(|AzSA
a#d-><T|YmrpB?f^t^_%|Nj@!`5&0kPXVOss