Merge remote-tracking branch 'origin/master'

2 files changed, 25 insertions, 29 deletions

diff --git a/src/de/fhswf/in/inf/java1/aufgabe6/Aufgabe6.java b/src/de/fhswf/in/inf/java1/aufgabe6/Aufgabe6.java
index 6326774..0fbaf00 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe6/Aufgabe6.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe6/Aufgabe6.java
@@ -31,7 +31,7 @@ public final class Aufgabe6
     */
    public static void main(String[] args)
    {
-      final int testLength = 10000;
+      final int testLength = 10000000;
       Vector<Integer> test = new Vector<>(testLength);
       Integer testGet;
 
diff --git a/src/de/fhswf/in/inf/java1/aufgabe6/ListBenchmark.java b/src/de/fhswf/in/inf/java1/aufgabe6/ListBenchmark.java
index 40ae7ea..24e4ed4 100644
--- a/src/de/fhswf/in/inf/java1/aufgabe6/ListBenchmark.java
+++ b/src/de/fhswf/in/inf/java1/aufgabe6/ListBenchmark.java
@@ -34,37 +34,33 @@ public final class ListBenchmark
     */
    public static void startBenchmark()
    {
-      final int testListLength = 100000;
-      List<Integer> testList = new ArrayList<Integer>(testListLength);
+      final int times = 100000;
 
-      System.out.print("ArrayList am Anfang: ");
-      System.out.println(benchmarkAtBeginning(testList, testListLength)
-            + " ms");
-      System.out.print("ArrayList am Ende: ");
-      System.out.println(benchmarkAtEnding(testList, testListLength) + " ms");
-      System.out.print("ArrayList zufälliger Index: ");
-      System.out.println(benchmarkAtRandom(testList, testListLength) + " ms");
+      benchmarkGrouping("ArrayList", new ArrayList<Integer>(times), times);
+      benchmarkGrouping("Vector", new Vector<Integer>(times), times);
+      benchmarkGrouping("LinkedList", new LinkedList<Integer>(), times);
 
-      testList = new Vector<Integer>(testListLength);
-
-      System.out.print("Vector am Anfang: ");
-      System.out.println(benchmarkAtBeginning(testList, testListLength)
-            + " ms");
-      System.out.print("Vector am Ende: ");
-      System.out.println(benchmarkAtEnding(testList, testListLength) + " ms");
-      System.out.print("Vector zufälliger Index: ");
-      System.out.println(benchmarkAtRandom(testList, testListLength) + " ms");
-
-      testList = new LinkedList<Integer>();
-
-      System.out.print("LinkedList am Anfang: ");
-      System.out.println(benchmarkAtBeginning(testList, testListLength)
-            + " ms");
-      System.out.print("LinkedList am Ende: ");
-      System.out.println(benchmarkAtEnding(testList, testListLength) + " ms");
-      System.out.print("LinkedList zufälliger Index: ");
-      System.out.println(benchmarkAtRandom(testList, testListLength) + " ms");
+   }
 
+   /**
+    * Groups the 3 different benchmark versions together.
+    *
+    * @param variant
+    *           Name of the list type.
+    * @param list
+    *           The list which will be benchmarked.
+    * @param times
+    *           How often will be inserted.
+    */
+   private static void benchmarkGrouping(String variant, List<Integer> list,
+         int times)
+   {
+      System.out.print(variant + " am Anfang: ");
+      System.out.println(benchmarkAtBeginning(list, times) + " ms");
+      System.out.print(variant + " am Ende: ");
+      System.out.println(benchmarkAtEnding(list, times) + " ms");
+      System.out.print(variant + " zufälliger Index: ");
+      System.out.println(benchmarkAtRandom(list, times) + " ms");
    }
 
    /**