From 9b9c6ce867bd4bc57fdce084acfa7e54a925d8b4 Mon Sep 17 00:00:00 2001
From: "artem.didytschuk" <artem.didytschuk@gmx.de>
Date: Mon, 18 Jan 2021 14:40:26 +0100
Subject: [PATCH] findVertex() Um konsolenausgaben zur veranschaulichung
 erweitert

---
 Breitensuche.class | Bin 3431 -> 4124 bytes
 Breitensuche.java  |   6 ++-
 package.bluej      | 109 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 82 insertions(+), 33 deletions(-)

diff --git a/Breitensuche.class b/Breitensuche.class
index 34b28335d790cee248702b658693010ed291f21b..baa7186363fece854654ce38497db4e70f2a6c21 100644
GIT binary patch
literal 4124
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

delta 1708
zcmbVM-E&h_5dYoeCO2MA3wE4J<IomjQIfRCm$XGot$f$UmXBIc#5TP^D5lUhS}YPk
zphX3(7nFu7f=B=>cBagoQAfua-+a;s-y9!&@gMNT5sbf0(zMSebI;kcyJtUsyL-kf
z|Ma*0^zS#{16Yl(OsqoGK(`4Oq7PstECYLe*k{6n{lbj-aKMKi9}fEPst<7kz23$S
zUgpn4F%F5+;nBAGSf7D@6P1VxXFv=jOuUBIg&GvW5n0}lWk^(xn%IUnWjQ8GQuK}s
zbwX55%H6l*cuJH{i?1^Vh7F8N&C%L5?d(*SE1-pHQK!MPv9I&ceuXEoT7$RU>Km{I
z$!-48IT%-{#oG$+;9Yyt-IT1wIfe6hPvL!xQl~9pB`k#xU@Kg}MFSrye1uC1V;EIP
z;j+RwK34byR}?<QRfTJ)Q}|4H*M;}FP&b5^mgOdHDclz73rr|{i8~rpQ=b(Zu;TrR
z=+s@kRI?xP-hNPn9=8SuG#K61VF|)+FyiG{$QrC7wi=UWI;6a$nI+fysegRsnzqLF
zn|q>9QM3sLHH+{x8h9$hUs#JqDu(a}o+0I;<YzRIa-$XB;aO5Tx^WBZNU<!qi1nnz
z#RhB?7qmA*Z4d2D+P|5Lk{*2`co%w!*TEv)K~=bLa<Dk;;IR~XxIO*@JP{F9J6KY$
zmr*q+OK1%1We-#CpgM)6Gp9hv!J}iKhiP8c!SsRl%k-p!nsnxCdRUsyTyRe?E*)#Q
zZpA}f!|<UR^B8x4+$!d~oLH>oe*^Q15QPrrznhs`%(<W0o~C4&$l2J8D`;lbT3D(G
z?hqltbR~0-@Wv+IccUZ84&00_bV@+-KnvB3=Lpw4wnPinU3i}IQtlmD{Z{JdWNqYa
zrEETod#Ex{S#}=_40sG|Tk^2+cNY5X)6nApwcXS%5hUFXD!#QFi;8zhzQtL=PUgFd
zrn|DSR_2roVU-lZa?J`$WdjwC1fyX`&Yc}93M6MN@1^B^wA}l@ExXW;7wCaKgiJn>
z7)u=FC*^P9Uc-+qQITh{x&f9p;NXdI%$cPZN@afKQLa*bVO~<uX4iPrFv(_f{LXDz
zc#>Xool#G$fFYiaLg5&5I!^dca4Jq>1x_)(GwhLJ_QFUKJ8>2-@pXve9MeBPEBROf
z))=e0g}|wNTjZ)OumU1$B_%ah@Z5u9aTl8lytE90u#4Y|^pJ%`3o<CL1jnR<{I&}&
z*|7<6Zk9V(QKyq#!;fhPqzgi%bHgLz`T8XSm1jjnEtUC&n-~+IL}FLWElmn8JS?l8
z!KDFn={m&_E;H0|`1z=nvw=gn%2clrkLzse8%!t7I^IMN--$S9Bf(ef2<KyZIt1I?
zizC!-&WQjqlm*E}%e|bPbuv7DbmC>~p+lLD9A2W<N;CwoB6#k@PrTg08NgnlwN46M
G==u*k_$rG4

diff --git a/Breitensuche.java b/Breitensuche.java
index 7e0356f..ad4f1d4 100644
--- a/Breitensuche.java
+++ b/Breitensuche.java
@@ -49,13 +49,14 @@ public class Breitensuche {
         //       searchQueue ein und arbeite die Knoten in ihr der Reihe nach
         //       ab, bis die Queue leer ist, oder der gesuchte Knoten
         //       gefunden wurde.
-        // TODO: Ergänze deine Methode um Ausgaben, anhand derer die Abarbeitung
+        // Finished: Ergänze deine Methode um Ausgaben, anhand derer die Abarbeitung
         //       deutlich wird.
         // TODO: Wenn dein Algorithmus funnktioniert, kopiere die Methode und
         //       Erstelle Varianten, bei denen die Reihenfolge der Nachbarknoten
         //       modifiziert ist. Dazu
         
         if(g.getVertex("Köln").getID().equals(pVertexID)){
+            System.out.println("Köln gefunden");
             return true;
         } else {
             g.getVertex("Köln").setMark(true);
@@ -66,7 +67,9 @@ public class Breitensuche {
                 ngbrs.toFirst();
                 while(ngbrs.hasAccess()){
                     if(!ngbrs.getContent().isMarked()){
+                        System.out.println(ngbrs.getContent().getID());
                         if(ngbrs.getContent().getID().equals(pVertexID)){
+                            System.out.println(ngbrs.getContent().getID() +" gefunden");
                             return true;
                         }
                         ngbrs.getContent().setMark(true);
@@ -77,6 +80,7 @@ public class Breitensuche {
                 searchQueue.dequeue();
             }
         }
+        System.out.println(pVertexID +" Nicht gefunden");
         return false;
     }
 
diff --git a/package.bluej b/package.bluej
index 677f390..e4d86a5 100644
--- a/package.bluej
+++ b/package.bluej
@@ -1,26 +1,50 @@
 #BlueJ package file
-dependency1.from=BinarySearchTree
-dependency1.to=ComparableContent
+dependency1.from=BreitensucheTest
+dependency1.to=Breitensuche
 dependency1.type=UsesDependency
-dependency2.from=Racingsimulator
-dependency2.to=Athlete
+dependency10.from=Breitensuche
+dependency10.to=List
+dependency10.type=UsesDependency
+dependency2.from=Graph
+dependency2.to=List
 dependency2.type=UsesDependency
-editor.fx.0.height=738
-editor.fx.0.width=816
-editor.fx.0.x=466
-editor.fx.0.y=146
-objectbench.height=100
+dependency3.from=Graph
+dependency3.to=Vertex
+dependency3.type=UsesDependency
+dependency4.from=Graph
+dependency4.to=Edge
+dependency4.type=UsesDependency
+dependency5.from=Edge
+dependency5.to=Vertex
+dependency5.type=UsesDependency
+dependency6.from=Breitensuche
+dependency6.to=Graph
+dependency6.type=UsesDependency
+dependency7.from=Breitensuche
+dependency7.to=Vertex
+dependency7.type=UsesDependency
+dependency8.from=Breitensuche
+dependency8.to=Edge
+dependency8.type=UsesDependency
+dependency9.from=Breitensuche
+dependency9.to=Queue
+dependency9.type=UsesDependency
+editor.fx.0.height=1416
+editor.fx.0.width=2576
+editor.fx.0.x=-8
+editor.fx.0.y=-8
+objectbench.height=130
 objectbench.width=1256
 package.divider.horizontal=0.6
-package.divider.vertical=0.881243063263041
-package.editor.height=787
+package.divider.vertical=0.8477777777777777
+package.editor.height=756
 package.editor.width=1145
-package.editor.x=0
-package.editor.y=0
+package.editor.x=17
+package.editor.y=171
 package.frame.height=1000
 package.frame.width=1296
-package.numDependencies=2
-package.numTargets=4
+package.numDependencies=10
+package.numTargets=7
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -30,30 +54,51 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Racingsimulator
+target1.name=BreitensucheTest
 target1.showInterface=false
-target1.type=ClassTarget
+target1.type=UnitTestTargetJunit4
 target1.width=130
-target1.x=450
-target1.y=472
+target1.x=150
+target1.y=20
 target2.height=50
-target2.name=ComparableContent
+target2.name=Vertex
 target2.showInterface=false
-target2.type=InterfaceTarget
-target2.width=250
-target2.x=160
-target2.y=270
+target2.type=ClassTarget
+target2.width=80
+target2.x=70
+target2.y=70
 target3.height=50
-target3.name=Athlete
+target3.name=Graph
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=90
-target3.x=280
-target3.y=550
+target3.width=80
+target3.x=160
+target3.y=70
 target4.height=50
-target4.name=BinarySearchTree
+target4.name=Breitensuche
 target4.showInterface=false
 target4.type=ClassTarget
-target4.width=230
-target4.x=370
-target4.y=90
+target4.width=100
+target4.x=10
+target4.y=130
+target5.height=50
+target5.name=List
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=150
+target5.x=110
+target5.y=130
+target6.height=50
+target6.name=Edge
+target6.showInterface=false
+target6.type=ClassTarget
+target6.width=80
+target6.x=10
+target6.y=190
+target7.height=50
+target7.name=Queue
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=160
+target7.x=100
+target7.y=190