diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe01/HelloWorld.java (renamed from src/de/fhswf/in/inf/java1/aufgabe1/HelloWorld.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe04/Fill.java (renamed from src/de/fhswf/in/inf/java1/aufgabe4/Fill.java) | 234 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe05/Bank.java (renamed from src/de/fhswf/in/inf/java1/aufgabe5/Bank.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe05/Konto.java (renamed from src/de/fhswf/in/inf/java1/aufgabe5/Konto.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe05/Person.java (renamed from src/de/fhswf/in/inf/java1/aufgabe5/Person.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe05/Student.java (renamed from src/de/fhswf/in/inf/java1/aufgabe5/Student.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe06/Aufgabe6.java (renamed from src/de/fhswf/in/inf/java1/aufgabe6/Aufgabe6.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe06/ListBenchmark.java (renamed from src/de/fhswf/in/inf/java1/aufgabe6/ListBenchmark.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe07/GleichSpieler.java (renamed from src/de/fhswf/in/inf/java1/aufgabe7/GleichSpieler.java) | 4 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe07/Simulation.java (renamed from src/de/fhswf/in/inf/java1/aufgabe7/Simulation.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe07/Spiel.java (renamed from src/de/fhswf/in/inf/java1/aufgabe7/Spiel.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe07/Spieler.java (renamed from src/de/fhswf/in/inf/java1/aufgabe7/Spieler.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe07/WechselSpieler.java (renamed from src/de/fhswf/in/inf/java1/aufgabe7/WechselSpieler.java) | 4 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe07/ZufallsSpieler.java (renamed from src/de/fhswf/in/inf/java1/aufgabe7/ZufallsSpieler.java) | 104 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe08/FloydAndBentley.java (renamed from src/de/fhswf/in/inf/java1/aufgabe8/FloydAndBentley.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe08/Lottery6OutOf49.java (renamed from src/de/fhswf/in/inf/java1/aufgabe8/Lottery6OutOf49.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe08/LottoZiehungMain.java (renamed from src/de/fhswf/in/inf/java1/aufgabe8/LottoZiehungMain.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe09/WordCount.java (renamed from src/de/fhswf/in/inf/java1/aufgabe9/WordCount.java) | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe09/WordCountTest.java (renamed from src/de/fhswf/in/inf/java1/aufgabe9/WordCountTest.java) | 2 |
19 files changed, 188 insertions, 188 deletions
diff --git a/src/de/fhswf/in/inf/java1/aufgabe1/HelloWorld.java b/src/de/fhswf/in/inf/java1/aufgabe01/HelloWorld.java index 6c72f75..f1af45e 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe1/HelloWorld.java +++ b/src/de/fhswf/in/inf/java1/aufgabe01/HelloWorld.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe1; +package de.fhswf.in.inf.java1.aufgabe01; /** * Begrüßung der Sprache Java. Diese Klasse begrüßt die Sprache Java mit einem diff --git a/src/de/fhswf/in/inf/java1/aufgabe4/Fill.java b/src/de/fhswf/in/inf/java1/aufgabe04/Fill.java index 20fdd84..b60c6c2 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe4/Fill.java +++ b/src/de/fhswf/in/inf/java1/aufgabe04/Fill.java @@ -1,117 +1,117 @@ -/**
- *
- */
-package de.fhswf.in.inf.java1.aufgabe4;
-
-import java.util.Arrays;
-
-/**
- * Tests the different methods to created a prefilled String.
- *
- * @author $Author: $
- * @version $Revision: $, $Date: $ UTC
- */
-public final class Fill
-{
- private Fill()
- {
- }
-
- /**
- *
- * Creates a string of given length filled with the given char.
- *
- * @param length
- * Length of the returned String.
- * @param c
- * Char the String is filled with.
- * @return Returns the generated String.
- */
- public static String createStringFilledWith(int length, char c)
- {
- // String that will be returned
- String result = "";
- for (int i = 0; i < length; i++)
- {
- // Every iteration, a new string is created.
- result += c;
- }
- // Return the build string
- return result;
- }
-
- /**
- *
- * Creates a string of given length filled with the given char.
- *
- * @param length
- * Length of the returned String.
- * @param c
- * Char the String is filled with.
- * @return Returns the generated String.
- */
- public static String createStringFilledWith2(int length, char c)
- {
- // charArray that will be returned
- char[] result = new char[length];
-
- Arrays.fill(result, c);
-
- // Return the build string
- return result.toString();
- }
-
- /**
- *
- * Creates a string of given length filled with the given char.
- *
- * @param length
- * Length of the returned String.
- * @param c
- * Char the String is filled with.
- * @return Returns the generated String.
- */
- public static String createStringFilledWith3(int length, char c)
- {
- // String that will be returned
- StringBuilder result = new StringBuilder(length);
- for (int i = 0; i < length; i++)
- {
- // Every iteration, a new string is created.
- result.append(c);
- }
- // Return the build string
- return result.toString();
- }
-
- /**
- *
- * Calls the function createStringFilledWith() and measures its runtime.
- *
- * @param args
- * Console line arguments.
- */
- public static void main(String[] args)
- {
- final int anzDurchlaefe = 100000000;
-
- long start;
- start = System.currentTimeMillis(); // Gets current time in µs
- Fill.createStringFilledWith(anzDurchlaefe, 'x'); // Function call
- // Calculates the time runtime of creatStringFilledWith()
- System.out.println("Elapsed time: "
- + (System.currentTimeMillis() - start) + " ms");
-
- start = System.currentTimeMillis(); // Gets current time in µs
- Fill.createStringFilledWith2(anzDurchlaefe, 'x'); // Function call
- // Calculates the time runtime of creatStringFilledWith2()
- System.out.println("Elapsed time: "
- + (System.currentTimeMillis() - start) + " ms");
-
- start = System.currentTimeMillis(); // Gets current time in µs
- Fill.createStringFilledWith3(anzDurchlaefe, 'x'); // Function call
- // Calculates the time runtime of creatStringFilledWith3()
- System.out.println("Elapsed time: "
- + (System.currentTimeMillis() - start) + " ms");
- }
-}
+/** + * + */ +package de.fhswf.in.inf.java1.aufgabe04; + +import java.util.Arrays; + +/** + * Tests the different methods to created a prefilled String. + * + * @author $Author: $ + * @version $Revision: $, $Date: $ UTC + */ +public final class Fill +{ + private Fill() + { + } + + /** + * + * Creates a string of given length filled with the given char. + * + * @param length + * Length of the returned String. + * @param c + * Char the String is filled with. + * @return Returns the generated String. + */ + public static String createStringFilledWith(int length, char c) + { + // String that will be returned + String result = ""; + for (int i = 0; i < length; i++) + { + // Every iteration, a new string is created. + result += c; + } + // Return the build string + return result; + } + + /** + * + * Creates a string of given length filled with the given char. + * + * @param length + * Length of the returned String. + * @param c + * Char the String is filled with. + * @return Returns the generated String. + */ + public static String createStringFilledWith2(int length, char c) + { + // charArray that will be returned + char[] result = new char[length]; + + Arrays.fill(result, c); + + // Return the build string + return result.toString(); + } + + /** + * + * Creates a string of given length filled with the given char. + * + * @param length + * Length of the returned String. + * @param c + * Char the String is filled with. + * @return Returns the generated String. + */ + public static String createStringFilledWith3(int length, char c) + { + // String that will be returned + StringBuilder result = new StringBuilder(length); + for (int i = 0; i < length; i++) + { + // Every iteration, a new string is created. + result.append(c); + } + // Return the build string + return result.toString(); + } + + /** + * + * Calls the function createStringFilledWith() and measures its runtime. + * + * @param args + * Console line arguments. + */ + public static void main(String[] args) + { + final int anzDurchlaefe = 100000000; + + long start; + start = System.currentTimeMillis(); // Gets current time in �s + Fill.createStringFilledWith(anzDurchlaefe, 'x'); // Function call + // Calculates the time runtime of creatStringFilledWith() + System.out.println("Elapsed time: " + + (System.currentTimeMillis() - start) + " ms"); + + start = System.currentTimeMillis(); // Gets current time in �s + Fill.createStringFilledWith2(anzDurchlaefe, 'x'); // Function call + // Calculates the time runtime of creatStringFilledWith2() + System.out.println("Elapsed time: " + + (System.currentTimeMillis() - start) + " ms"); + + start = System.currentTimeMillis(); // Gets current time in �s + Fill.createStringFilledWith3(anzDurchlaefe, 'x'); // Function call + // Calculates the time runtime of creatStringFilledWith3() + System.out.println("Elapsed time: " + + (System.currentTimeMillis() - start) + " ms"); + } +} diff --git a/src/de/fhswf/in/inf/java1/aufgabe5/Bank.java b/src/de/fhswf/in/inf/java1/aufgabe05/Bank.java index 22cb577..d90c447 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe5/Bank.java +++ b/src/de/fhswf/in/inf/java1/aufgabe05/Bank.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe5; +package de.fhswf.in.inf.java1.aufgabe05; import java.math.BigDecimal; diff --git a/src/de/fhswf/in/inf/java1/aufgabe5/Konto.java b/src/de/fhswf/in/inf/java1/aufgabe05/Konto.java index faac8f6..235f9af 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe5/Konto.java +++ b/src/de/fhswf/in/inf/java1/aufgabe05/Konto.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe5; +package de.fhswf.in.inf.java1.aufgabe05; import java.math.BigDecimal; diff --git a/src/de/fhswf/in/inf/java1/aufgabe5/Person.java b/src/de/fhswf/in/inf/java1/aufgabe05/Person.java index 15de304..18b619d 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe5/Person.java +++ b/src/de/fhswf/in/inf/java1/aufgabe05/Person.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe5; +package de.fhswf.in.inf.java1.aufgabe05; import java.util.ArrayList; import java.util.List; diff --git a/src/de/fhswf/in/inf/java1/aufgabe5/Student.java b/src/de/fhswf/in/inf/java1/aufgabe05/Student.java index 769c91a..9963af9 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe5/Student.java +++ b/src/de/fhswf/in/inf/java1/aufgabe05/Student.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe5; +package de.fhswf.in.inf.java1.aufgabe05; /** * Extends Person and represents a student. diff --git a/src/de/fhswf/in/inf/java1/aufgabe6/Aufgabe6.java b/src/de/fhswf/in/inf/java1/aufgabe06/Aufgabe6.java index 0fbaf00..0f40448 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe6/Aufgabe6.java +++ b/src/de/fhswf/in/inf/java1/aufgabe06/Aufgabe6.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe6; +package de.fhswf.in.inf.java1.aufgabe06; import java.util.Iterator; import java.util.Vector; diff --git a/src/de/fhswf/in/inf/java1/aufgabe6/ListBenchmark.java b/src/de/fhswf/in/inf/java1/aufgabe06/ListBenchmark.java index 24e4ed4..b03b68d 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe6/ListBenchmark.java +++ b/src/de/fhswf/in/inf/java1/aufgabe06/ListBenchmark.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe6; +package de.fhswf.in.inf.java1.aufgabe06; import java.util.ArrayList; import java.util.LinkedList; diff --git a/src/de/fhswf/in/inf/java1/aufgabe7/GleichSpieler.java b/src/de/fhswf/in/inf/java1/aufgabe07/GleichSpieler.java index f5bf021..be592cd 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe7/GleichSpieler.java +++ b/src/de/fhswf/in/inf/java1/aufgabe07/GleichSpieler.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe7; +package de.fhswf.in.inf.java1.aufgabe07; /** * This player always chooses the same shell. @@ -14,7 +14,7 @@ public class GleichSpieler extends Spieler /* * (non-Javadoc) * - * @see de.fhswf.in.inf.java1.aufgabe7.Spieler#zweiterTipp(int) + * @see de.fhswf.in.inf.java1.aufgabe07.Spieler#zweiterTipp(int) */ @Override public final int zweiterTipp(int leeresHuetchen) diff --git a/src/de/fhswf/in/inf/java1/aufgabe7/Simulation.java b/src/de/fhswf/in/inf/java1/aufgabe07/Simulation.java index 71e23a0..1c6622c 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe7/Simulation.java +++ b/src/de/fhswf/in/inf/java1/aufgabe07/Simulation.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe7; +package de.fhswf.in.inf.java1.aufgabe07; /** * Calculates the the success rate of different players. diff --git a/src/de/fhswf/in/inf/java1/aufgabe7/Spiel.java b/src/de/fhswf/in/inf/java1/aufgabe07/Spiel.java index f33e031..19e2998 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe7/Spiel.java +++ b/src/de/fhswf/in/inf/java1/aufgabe07/Spiel.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe7; +package de.fhswf.in.inf.java1.aufgabe07; import java.util.Random; diff --git a/src/de/fhswf/in/inf/java1/aufgabe7/Spieler.java b/src/de/fhswf/in/inf/java1/aufgabe07/Spieler.java index 40c7254..14d17a8 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe7/Spieler.java +++ b/src/de/fhswf/in/inf/java1/aufgabe07/Spieler.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe7; +package de.fhswf.in.inf.java1.aufgabe07; /** * Represents a player that chooses a shell. diff --git a/src/de/fhswf/in/inf/java1/aufgabe7/WechselSpieler.java b/src/de/fhswf/in/inf/java1/aufgabe07/WechselSpieler.java index 5d9b976..5c6ec55 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe7/WechselSpieler.java +++ b/src/de/fhswf/in/inf/java1/aufgabe07/WechselSpieler.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe7; +package de.fhswf.in.inf.java1.aufgabe07; /** * This player always changes the shell. @@ -12,7 +12,7 @@ package de.fhswf.in.inf.java1.aufgabe7; public class WechselSpieler extends Spieler { /* (non-Javadoc) - * @see de.fhswf.in.inf.java1.aufgabe7.Spieler#zweiterTipp(int) + * @see de.fhswf.in.inf.java1.aufgabe07.Spieler#zweiterTipp(int) */ @Override public int zweiterTipp(int leeresHuetchen) diff --git a/src/de/fhswf/in/inf/java1/aufgabe7/ZufallsSpieler.java b/src/de/fhswf/in/inf/java1/aufgabe07/ZufallsSpieler.java index f633d31..29a8aba 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe7/ZufallsSpieler.java +++ b/src/de/fhswf/in/inf/java1/aufgabe07/ZufallsSpieler.java @@ -1,52 +1,52 @@ -/**
- *
- */
-package de.fhswf.in.inf.java1.aufgabe7;
-
-/**
- * A player that switches strategy with a certain probability.
- *
- * @author $Author: $
- * @version $Revision: $, $Date: $ UTC
- */
-public class ZufallsSpieler extends WechselSpieler
-{
-
- private double wahrscheinlichkeit = 0;
-
- /**
- * Initializes a player which switches strategies.
- *
- * @param wahrscheinlichkeit
- * Probability of switching strategy.
- */
- public ZufallsSpieler(double wahrscheinlichkeit)
- {
- if (wahrscheinlichkeit < 0.0 | wahrscheinlichkeit > 1.0)
- {
- throw new IllegalArgumentException(
- "Only a probability between 0 and 100 is allowed.");
- }
-
- this.wahrscheinlichkeit = wahrscheinlichkeit;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see de.fhswf.in.inf.java1.aufgabe7.WechselSpieler#zweiterTipp(int)
- */
- @Override
- public final int zweiterTipp(int leeresHuetchen)
- {
- if (Spiel.RAND.nextDouble() < wahrscheinlichkeit)
- {
- return getErsterTipp();
- }
- else
- {
- return super.zweiterTipp(leeresHuetchen);
- }
- }
-
-}
+/** + * + */ +package de.fhswf.in.inf.java1.aufgabe07; + +/** + * A player that switches strategy with a certain probability. + * + * @author $Author: $ + * @version $Revision: $, $Date: $ UTC + */ +public class ZufallsSpieler extends WechselSpieler +{ + + private double wahrscheinlichkeit = 0; + + /** + * Initializes a player which switches strategies. + * + * @param wahrscheinlichkeit + * Probability of switching strategy. + */ + public ZufallsSpieler(double wahrscheinlichkeit) + { + if (wahrscheinlichkeit < 0.0 | wahrscheinlichkeit > 1.0) + { + throw new IllegalArgumentException( + "Only a probability between 0 and 100 is allowed."); + } + + this.wahrscheinlichkeit = wahrscheinlichkeit; + } + + /* + * (non-Javadoc) + * + * @see de.fhswf.in.inf.java1.aufgabe07.WechselSpieler#zweiterTipp(int) + */ + @Override + public final int zweiterTipp(int leeresHuetchen) + { + if (Spiel.RAND.nextDouble() < wahrscheinlichkeit) + { + return getErsterTipp(); + } + else + { + return super.zweiterTipp(leeresHuetchen); + } + } + +} diff --git a/src/de/fhswf/in/inf/java1/aufgabe8/FloydAndBentley.java b/src/de/fhswf/in/inf/java1/aufgabe08/FloydAndBentley.java index 5416fe5..8ba0a7a 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe8/FloydAndBentley.java +++ b/src/de/fhswf/in/inf/java1/aufgabe08/FloydAndBentley.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe8; +package de.fhswf.in.inf.java1.aufgabe08; import java.util.ArrayList; import java.util.List; diff --git a/src/de/fhswf/in/inf/java1/aufgabe8/Lottery6OutOf49.java b/src/de/fhswf/in/inf/java1/aufgabe08/Lottery6OutOf49.java index 3342ebd..b7c43f1 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe8/Lottery6OutOf49.java +++ b/src/de/fhswf/in/inf/java1/aufgabe08/Lottery6OutOf49.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe8; +package de.fhswf.in.inf.java1.aufgabe08; import java.util.ArrayList; import java.util.Collections; diff --git a/src/de/fhswf/in/inf/java1/aufgabe8/LottoZiehungMain.java b/src/de/fhswf/in/inf/java1/aufgabe08/LottoZiehungMain.java index f4cb322..32cb841 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe8/LottoZiehungMain.java +++ b/src/de/fhswf/in/inf/java1/aufgabe08/LottoZiehungMain.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe8; +package de.fhswf.in.inf.java1.aufgabe08; import java.util.ArrayList; import java.util.List; diff --git a/src/de/fhswf/in/inf/java1/aufgabe9/WordCount.java b/src/de/fhswf/in/inf/java1/aufgabe09/WordCount.java index a6d90ef..ff806d1 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe9/WordCount.java +++ b/src/de/fhswf/in/inf/java1/aufgabe09/WordCount.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe9; +package de.fhswf.in.inf.java1.aufgabe09; import java.io.BufferedReader; import java.io.File; diff --git a/src/de/fhswf/in/inf/java1/aufgabe9/WordCountTest.java b/src/de/fhswf/in/inf/java1/aufgabe09/WordCountTest.java index a1364c9..c9d2e4d 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe9/WordCountTest.java +++ b/src/de/fhswf/in/inf/java1/aufgabe09/WordCountTest.java @@ -1,7 +1,7 @@ /** * */ -package de.fhswf.in.inf.java1.aufgabe9; +package de.fhswf.in.inf.java1.aufgabe09; import java.io.File; |
