diff --git a/src/Bins.java b/src/Bins.java index abdf468..8bf02c9 100644 --- a/src/Bins.java +++ b/src/Bins.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.PriorityQueue; import java.util.Scanner; +import java.util.function.Function; +import java.util.stream.Collectors; /** @@ -80,6 +82,11 @@ private void runAlgorithm (List data, String description) { Collection disks = allocateDisks(copy); printResults(disks, description); } + + // added in + public static void fitDisksAndPrint(List list, Function,List> func){ + func.apply(list).forEach(i->System.out.println(i)); + } /** * The main program. @@ -90,6 +97,11 @@ public static void main (String args[]) { List data = b.readData(input); System.out.println("total size = " + b.getTotal(data) / 1000000.0 + "GB"); + //Added + fitDisksAndPrint(data, l->l.stream() + .sorted() + .collect(Collectors.toList())); + b.runAlgorithm(data, WORST_FIT); b.runAlgorithm(data, WORST_FIT_DECREASING); }