diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..fb50116 --- /dev/null +++ b/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Bins.java b/src/Bins.java index b313a3d..8d2dde5 100644 --- a/src/Bins.java +++ b/src/Bins.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.PriorityQueue; import java.util.Scanner; - +//Hello World! /** * Runs a number of algorithms that try to fit files onto disks. */ diff --git a/src/Disk.java b/src/Disk.java index e3a3f31..83c2d08 100644 --- a/src/Disk.java +++ b/src/Disk.java @@ -1,5 +1,10 @@ import java.util.ArrayList; +import java.util.Comparator; import java.util.List; +import java.util.AbstractMap.SimpleEntry; +import java.util.Map.Entry; +import java.util.function.Function; +import java.util.stream.Collectors; /** * Represents a collection of files; how many it can hold is limited by its capacity. @@ -57,6 +62,7 @@ public String toString () { for (int k = 0; k < myFiles.size(); k++) { result += " " + myFiles.get(k); } + fitDiskAndPrint(myFiles, (input) -> input.stream().sorted().collect(Collectors.toList())); return result; } @@ -103,4 +109,11 @@ public int compareTo (Disk other) { return -1; } } -} + + public static void fitDiskAndPrint(List list, Function, List> func){ + //list.stream().sorted().collect(Collectors.toList()); + + List transformed = func.apply(list); + transformed.forEach(System.out::println); + } +} \ No newline at end of file