cgu4 dcb31

README.md

@@ -1,8 +1,11 @@
 # example_bins
 First example code for refactoring
 
+Adding using vim to test**
+=======
 This line was added on GitHub
 
 THis line was added before Eclipse
 
 This line was added with Eclipse
+

src/Bins.java

@@ -1,4 +1,5 @@
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Scanner;
 
@@ -9,9 +10,9 @@
 public class Bins {
     public static final String DATA_FILE = "example.txt";
     // all possible algorithms to compare --- add new instances here!
-    private static WorstFitAlgorithm algortihmsToCompare[] = { 
-        new WorstFitAlgorithm(),
-        new WorstFitDecreasingAlgorithm()
+    private static ITransformList algortihmsToCompare[] = { 
+    	(List<Integer> l) -> Collections.sort(l, Collections.reverseOrder()),
+    	(List<Integer> l) -> l=l
     };
 
 
@@ -49,9 +50,10 @@ public static void main (String args[]) {
         Scanner input = new Scanner(Bins.class.getClassLoader().getResourceAsStream(DATA_FILE));
         List<Integer> data = b.readData(input);
         System.out.println("total size = " + b.getTotal(data) / 1000000.0 + "GB");
-
-        for (WorstFitAlgorithm al : algortihmsToCompare) {
-            al.fitDisksAndPrint(data);
+        WorstFitAlgorithm wf = new WorstFitAlgorithm();
+
+        for (ITransformList al : algortihmsToCompare) {
+            wf.fitDisksAndPrint(data, al);
         }
     }
-}
+}

src/ITransformList.java

@@ -0,0 +1,8 @@
+import java.util.List;
+
+@FunctionalInterface
+public interface ITransformList {
+
+	public void fitDisksAndPrintLambda(List<Integer> l);
+
+}

src/WorstFitAlgorithm.java

@@ -31,8 +31,9 @@ public WorstFitAlgorithm (String description) {
      *
      * @param data collection of files to be allocated to disks
      */
-    public void fitDisksAndPrint (List<Integer> data) {
+    public void fitDisksAndPrint (List<Integer> data, ITransformList lambda) {
         List<Integer> copy = new ArrayList<>(data);
+        lambda.fitDisksAndPrintLambda(data);
         organizeData(copy);
         Collection<Disk> disks = addFiles(copy);
         printResults(disks, myDescription);
@@ -74,4 +75,5 @@ private void printResults (Collection<Disk> disks, String description) {
             System.out.println(d);
         }
     }
+
 }