diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7e21120..171e214 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,31 +2,9 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -46,38 +24,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -128,9 +75,10 @@ - @@ -510,8 +458,8 @@ - - + + @@ -520,12 +468,12 @@ - + - + @@ -678,14 +626,6 @@ - - - - - - - - @@ -694,22 +634,6 @@ - - - - - - - - - - - - - - - - @@ -718,10 +642,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program1/Program.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program1/Program.class deleted file mode 100644 index c3a0fd4..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program1/Program.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program2/Program.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program2/Program.class deleted file mode 100644 index 5df919a..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program2/Program.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Person.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Person.class deleted file mode 100644 index ef2730b..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Person.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Program.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Program.class deleted file mode 100644 index c934cef..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Program.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/RennErgebnis.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/RennErgebnis.class deleted file mode 100644 index d09e9d8..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/RennErgebnis.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/RennSimulator.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/RennSimulator.class deleted file mode 100644 index 0d69c9c..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/RennSimulator.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennen.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennen.class deleted file mode 100644 index 4bfb58d..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennen.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennstrecke.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennstrecke.class deleted file mode 100644 index e984337..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Rennstrecke.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Schnecke.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Schnecke.class deleted file mode 100644 index 376910f..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Schnecke.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Wettbüro.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Wettbüro.class deleted file mode 100644 index 5f24c0f..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Wettbüro.class and /dev/null differ diff --git a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Wette.class b/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Wette.class deleted file mode 100644 index d9cb777..0000000 Binary files a/out/production/PGTL-Programs/ninja/brunner/pgtl/program3/Wette.class and /dev/null differ diff --git a/src/ninja/brunner/pgtl/program3/RennSimulator.java b/src/ninja/brunner/pgtl/program3/RennSimulator.java index 70dbdd1..99be430 100644 --- a/src/ninja/brunner/pgtl/program3/RennSimulator.java +++ b/src/ninja/brunner/pgtl/program3/RennSimulator.java @@ -69,7 +69,13 @@ public class RennSimulator { try { rennen.begin(); - while(rennen.schritt()); + while(rennen.schritt()) { + System.out.println(); + System.out.println(); + System.out.println(); + System.out.println(rennen.toString()); + Thread.sleep(100); + } rennen.cleanup(); } diff --git a/src/ninja/brunner/pgtl/program3/Rennen.java b/src/ninja/brunner/pgtl/program3/Rennen.java index 9441d8c..01f6f68 100644 --- a/src/ninja/brunner/pgtl/program3/Rennen.java +++ b/src/ninja/brunner/pgtl/program3/Rennen.java @@ -49,4 +49,18 @@ public class Rennen { return anySchnecke; } + + public String toString() { + StringBuilder sb = new StringBuilder(); + + sb.append(getClass().getName() + " \"" + name + "\" " + (currentlyRenning ? "aktiv" : "inaktiv")); + if(currentlyRenning) { + sb.append(" (Rennstrecke: \"" + rennStrecke.name + "\")\n"); + for(Schnecke schnecke : schnecken) { + sb.append(schnecke.toString() + '\n'); + } + } + + return sb.toString(); + } } diff --git a/src/ninja/brunner/pgtl/program3/Schnecke.java b/src/ninja/brunner/pgtl/program3/Schnecke.java index e50db8a..c0bb289 100644 --- a/src/ninja/brunner/pgtl/program3/Schnecke.java +++ b/src/ninja/brunner/pgtl/program3/Schnecke.java @@ -50,4 +50,24 @@ public class Schnecke { } else return false; } + + public String toString() { + StringBuilder sb = new StringBuilder(); + + sb.append(getClass().getName() + " \"" + name + "\""); + if(currentRennen != null) { + sb.append(' '); + + for(int i = 0; i < position; i++) + sb.append('.'); + + sb.append('@'); + + for(int i = position; i < currentRennen.rennStrecke.length; i++) + sb.append(' '); + sb.append('#'); + } + + return sb.toString(); + } }