From 8de3c54775e8b60a0f150f65f459da843bb0f558 Mon Sep 17 00:00:00 2001 From: cmerkens Date: Sun, 7 Jul 2024 21:13:34 +0200 Subject: [PATCH] Weg Anzeige gefixt --- .idea/workspace.xml | 7 ++----- OurApplication/OurApplication.java | 2 +- graph/DirectedGraph.java | 3 +++ graph/UndirectedGraph.java | 6 ++++++ .../OurApplication/OurAlgorithm.class | Bin 2189 -> 2444 bytes .../OurApplication/OurApplication.class | Bin 2844 -> 3072 bytes .../OurApplication/OurParameterArea.class | Bin 2620 -> 2619 bytes .../ProjektGraph/graph/DirectedGraph.class | Bin 12569 -> 12586 bytes .../ProjektGraph/graph/ExampleGraphs.class | Bin 6284 -> 6300 bytes .../ProjektGraph/graph/UndirectedGraph.class | Bin 11087 -> 11121 bytes 10 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6b2945d..6b60723 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,11 @@ - - - - - + + diff --git a/OurApplication/OurApplication.java b/OurApplication/OurApplication.java index e7b0a6d..1a62e6f 100644 --- a/OurApplication/OurApplication.java +++ b/OurApplication/OurApplication.java @@ -60,7 +60,7 @@ public class OurApplication { OurTextArea textArea = new OurTextArea(logList); OurAlgorithm algorithm = new OurAlgorithm(parameterArea, methodButtons); OurLegendArea legendArea = new OurLegendArea(); - OurHybridWindow applet = new OurHybridWindow(drawArea, textArea, parameterArea, algorithm, logList, legendArea, methodButtons); + OurHybridWindow applet = new OurHybridWindow<>(drawArea, textArea, parameterArea, algorithm, logList, legendArea, methodButtons); diff --git a/graph/DirectedGraph.java b/graph/DirectedGraph.java index 5fcd96e..6c3ced1 100644 --- a/graph/DirectedGraph.java +++ b/graph/DirectedGraph.java @@ -433,6 +433,9 @@ public class DirectedGraph exten continue; } + // Vorgänger aktualisieren + predecessors.put(i, nextVertex.getElement()); + // Aktualisiere Distanz von Start zu nächstem Knoten distance.put(i, dist); diff --git a/graph/UndirectedGraph.java b/graph/UndirectedGraph.java index 6f9f6b6..c7bb47d 100644 --- a/graph/UndirectedGraph.java +++ b/graph/UndirectedGraph.java @@ -231,6 +231,9 @@ public class UndirectedGraph ext continue; } + // Vorgänger aktualisieren + predecessors.put(i, nextVertex.getElement()); + // Aktualisiere Distanz von Start zu nächstem Knoten distance.put(i, dist); @@ -365,6 +368,9 @@ public class UndirectedGraph ext continue; } + // Vorgänger aktualisieren + predecessors.put(i, nextVertex.getElement()); + // Aktualisiere Distanz von Start zu nächstem Knoten distance.put(i, dist); diff --git a/out/production/ProjektGraph/OurApplication/OurAlgorithm.class b/out/production/ProjektGraph/OurApplication/OurAlgorithm.class index 4858e3ea6d785ada941809894acad135dd94b959..3e504facaccb421926a282f2f61c965303016cd5 100644 GIT binary patch delta 1159 zcmaiz&2Jl36vcmU{4tLEj1spogr;EUgEn?T>Xx*rleQ#nT9VpHsN058D42MNgHt;= z6R8plBOw+bsAOgpsmn^)ArRCQ7N|QU{)7tthq6VY<<5*1V1-6A@4k1>Iq%*3&V1SP z#s288Pk#Ctn4!^%exkZscSfgUw=BC-FVAkI7br8EN!D)j1hqhZzTi;dD| zMG?!dxxu(M6}@3zGC8a{!ie*=n%tLR)MQNaGULu4>eRk0$4riEUSYzSFb+quoYYKm z$|)Pk2i%hg0_h$Z6wW4RuvWwP+wQ5^sKjj{LS@SxVoyow$$S_wlSGlY> z;6f{PImed0T(T=O?$$1PMe_#NozDZm7;{IQ&w{Ds|8@Jjt>DLM*uZcbiQ-MUK7$+b zcGDwqP}V|(<@=V?9ZodgmbIv4;h^ODxhavBEP{H6cV%?(B^NJok$^l9OK0Nd4|JtR z@1wt!1p`;;88112DO+oXJh7xt=!glG_gM8dh{=(fJwjEKxh|vZpd5jRMe1I%w9Mh+VEDxZ~F zV4Mg?B|1)Ayq9G{{B%P8o=MJ&y)H0Cg=w}q&27%|5%V-ZWr45AbC)HrU1y~FtVmeA zFVdAx6mmP#X<=Ie`5Sa%%2R)B+=FJ(Ji?v`B(kBVp&GlIpK8XK1tUG0k0XppRUM`SG}4N fK5EYbVQQW?<*dn$+1#ZYBJSI@F43mQ8GQIRnGV*Y delta 940 zcmY+DT~8B16o#MKw!5{gMi)d870ZV}X{i;dP!&P>wk;|OiXT{{LeLOXt0D2CCdNB8 zA$!Fy;8vp+@xpLt;!iMMdF>A{CW>df4QeJiduHZ+-#B0{@C)Z_>;`+?Rx9HGPH7@Z35Vs9S6~r)LGd#+zE*{HoH0za$4yrqw%HndhtVIlTTd z&zD}^{Nj+pks^bWE`9Ws+{lY#OoAN}!*cfsJEi;2C4@Tk-yATo4B`fnhM#D^*zQi6WKwR9jFdut2DcPa4owE=p|*GI tck1dXS>X0YTFx8$r>y!`S#@Sg4d>jn&TSlLX-vf39=t8ttZZsz{{XLIjobhL diff --git a/out/production/ProjektGraph/OurApplication/OurApplication.class b/out/production/ProjektGraph/OurApplication/OurApplication.class index 529d75aab6ef94496dd47adc5b718f10256db29e..75fc353e2ba38196200ce3196ef59112a492665a 100644 GIT binary patch delta 1011 zcmZWnNmCP15dL0fl1wIpC8&{65m2lWMNnKBHi;4-0#Q*QxCV$Yib+f+D!72S@5}Sx z!Hea^gH{PzNfmK9=*jX&c+`tGPgYs>OFW2P-s`WsUw>bBzsH`5LiN+HnRfu1@Ni0f z%~lr&lJTZkY{VQ0S!Og+MX)1m4MzvPNy~~x5-L_fa-x!95ub1@TBcwvLqSVC6dUd~ z6UoqsIhK8>VhyS_*s-4fWYugVue24rH(;}HZDCl_!(~AXm8ef|T@V=tYpX z%l=*;_G#D;2ZJ074IC4U2Q?hZI?RY^2}ejnzi`+SRwzy$9|kpqafHE{2wPp|SeRlf z+uF*zMQm7uiKG0x?2$(piugf$(W@2qPL`i{{O?sTlyc^rmp5xpJm#2TCBn}Q=STJ< zYt2#Ki;4b|`B^DHd<-^PKIkL?aL{?2(0aNV-S$;!u&Hb~LZ_NdUJe;$h!WOvNr>SD zAs6CEIm0kh`v+|jkt7XC8nOg0rB0K4Q%e*d(L;ibG~!uV#ED<=gsHm zFMxJ#J$3#wj7Al+8h^A|Vo=*To*5fT`S}x>5xUvY*Ty9COgRvm!0fVljh>+ZuVIG>av%VdS-4JO|s7=P1wL3%N!Zj zYW*(zX8=Fv7c_9t<&XwK`9fw~kR%zG0gf10`D|g2U(5;@@9tid(p=W%H-0y8gcEcA zz=+UhyieQq|2-bc8LG}I*Ua1Y?ab=E^{VFW_h89>sqRMNbwdQ?#gJ8`2+Mj@y^GYZ z9u~}*;TB@j#E6_-VUen1 zmG(kqeoojG)~3s}B_b8pr@gRec_GjCOfOPqL&B+$OxJEM)0v2R(Qt`wFIr-|=alH_ z)!SaZ?bFKvFFHH;X?8GH;;Ul6F~kbD1j=Vo{7uaaF>eqE#AQC(0ip b8I#6Uu|GwuDlsh*)%w4r-r$DR1-SVITnDy- diff --git a/out/production/ProjektGraph/OurApplication/OurParameterArea.class b/out/production/ProjektGraph/OurApplication/OurParameterArea.class index ffac7dd345c17c29c6f672c58472be5bbbaf394c..998474920b560d0f9257033d1298a40ef9bbb674 100644 GIT binary patch delta 121 zcmdlZvRh<>4X5iW1|}e6VDQ<^z#h4sfzwB83xmKapa2k912H2IvqIS_Kw1-s^?=w| zdmBU61|X3KBqld;8p_%;R57?S)G{;!WyK(7GPE$X0(l$^E|V{CiZQZGe$E*R03hGw9&7{pM97KT5h#&}5m05k*5o^caHvT2T!(xMokw%EiVg2;xpb(9jU% z;v~Jn0_mX$QbP?*2CWT&5K-5Ld!{cO`0?3~oJ7*nYY&r+8i>TSJn+7tS;kw62+4ug zk2;Up*@Y;2wOma>%i6K1n9EwzK>o1FND!(5bI&2NTX=BSj?r%1_F$-%*4 zrc5+Ow49c5Tv;gxwTn_dbNIYZ&wAIZ$7%8~d9DK9LGqBFNNjZ!ctg8Nca>qO;b2Y0 zLkUOj_oKXSn1GM>v}8#W=>Og{tgE3UlOZ5D-Nl>C-i#zxc07T}&Ps!8{g7s8t5A zsLMf}5<^m#lTuv85|+tD+g!p5rpZk^Ttrrvhj#fETe`for_HOnntYV!eXOCMnz^nj n;hw1m$Tpy~0mTf+HXz%8)(vRGfHn;%LoU5O6UiW<-Xo)bK%!N8 diff --git a/out/production/ProjektGraph/graph/ExampleGraphs.class b/out/production/ProjektGraph/graph/ExampleGraphs.class index dcf202ccb5d66b2f14eab27753e343bf3c3d3849..ed65523276ef30de0162973a84782a5e6dc9ea07 100644 GIT binary patch delta 822 zcmZXSNoW&c7>1uOO)@hD(_|Fd0V#rq5SoDLQKf?W(rQ7W41``P-g?tsa}x?ukO84a zQIS%_{n7!0i1p%})PpOy7u>hHAU*jte;r|jfqCb7neX|3_>NRhRIkjhs0(+vN{aK) zHi|<#q&k{deu&fGq}$K;7Fck*L_$^#EP?{Z^l>+}$nL*HhTSbKvNmndLVmxy&5+Cz zSsXNJP_~6+xLV-0yTdTcu-Sr?-CYLROGsy}G{gz2xzaw*nPGKLlV0B)C|8;keJi9C zvVMjQ1~mlA-p5f5@{;l|0zA7EbG*WOL55O_TmNE9mI#uJ>`DK^`!|L&kW- zIFD)Yl+!$8is!lpFLWJV67q`cyyg~jM7&Y@mfyUSJnyB%2ieF+sqsk;@mVJLBGY`8 zn|zZe%*zkHr0Khy=j@EgenS@W$DG{} z*pgl(t#!^Bl!=h^6@2bHdkxDP)+|Wb={Cq(M7q`*L+p;y1RFcbEvdA`O-GuEG#jZE zsom0mF3;&Ll>>^N)nIdjtrKiB_(IwILaN&`ldhll^5Qji{r?@b65Q+>9}jQ(aL*Pw78n9d@(ENzOH@h8?x2vpj#y zwTzYiyO(kFW^hgQ1nX3%uz8Hj6G}`|P;u?9!@@noP1st2F&Gs$(_DFd%2xr&X4^oTSIs(qc$s vA8KVYxhx`xBf>Z$j3dH0B8(%#I3iq%AdC}2O}MRVrnsZMkF+{H*uLQpJ3HV@ diff --git a/out/production/ProjektGraph/graph/UndirectedGraph.class b/out/production/ProjektGraph/graph/UndirectedGraph.class index 2587616cf545d24847c0f8014a4b07582da465c9..878a205f45226b860200ebf4704a4b19e04a7f0d 100644 GIT binary patch delta 970 zcmX|3{XJ6^lqZqkH#ZPYZ=qBI+j!e}C^n`V$hdbQGWjH05V0V~oh!_c#6 z5e-lwq)kvlf>4VVL1-8*auEbBTtwhdTB&vZ|Kfi(=Y<0w&w0P6D|;aO#lV8F&v0Wp zpuGCeg3tV-I~R5eL-oBycc=MWKCjQyhHq_X&C%Uf%J7eB?#x<0bjY%QDI&%;3I!a60tPgw(7s89lz&nowZ&0rz)`5j zQK*|IY=s)6%M_4_Ff$2f&w2b#EQZQdI*Igf&!lmrJ^#k&{CVT_3U|>pBb3>)>_|m(OA*Ibd+rbepn62 zlA4ct%hzgj{itA0^={}|ZeoGJL3C`Alz_p|1*zO><2$pLqztIG?bDN8s;< z;1(uBFP%#DEzNXPCxM^*VHwL|AV|LPm`+}ZkWZ}8$s6^eSjj5*phH?%%>wwMQ<_+# zlOF~pkH@(cHceJchknmrJ&#Rvx*6;iL#@S-YBAU?2D`;@!eXei80syC2KY#y+7)+} z4)r*0y)9e+9}F0Uy1|{QF+QJR>S_EKbJUfMQ>rz=;WgC1Fsa59>RiFd0k{T!3_%b> z5y7>{U>I^3jzX@3lMyIkBE{jrI$@|pJ!x{&GL*b@}B2pis$7E zFX$P%r6EL&xsmkcuWvSDMJ5yEz3Gdqk-b{aXnqRJA}T&bokftV0qQ4ra2~%X^shGnqvYjo8ty@n=`BKZaSyUiA~D?4<3oj AwEzGB