From 9704369032e012afa8ba9423d2290010eea5f649 Mon Sep 17 00:00:00 2001 From: Tom Wu Date: Thu, 3 Mar 2016 16:43:27 -0500 Subject: [PATCH] added method fitDisksAndPrint --- src/Bins.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Bins.java b/src/Bins.java index b313a3d..a0db8b0 100644 --- a/src/Bins.java +++ b/src/Bins.java @@ -1,10 +1,11 @@ -import java.io.File; -import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.PriorityQueue; import java.util.Scanner; +import java.util.stream.Collectors; + /** * Runs a number of algorithms that try to fit files onto disks. @@ -26,6 +27,14 @@ public List readData (Scanner input) { return results; } + public void fitDisksAndPrint (List in) { + List out = in.stream() + .sorted(Comparator.comparingInt(Integer::intValue)) + .collect(Collectors.toList()); + in = out; + + } + /** * The main program. */ @@ -45,7 +54,8 @@ public static void main (String args[]) { pq.poll(); d.add(size); pq.add(d); - } else { + } + else { Disk d2 = new Disk(diskId); diskId++; d2.add(size); @@ -73,7 +83,8 @@ public static void main (String args[]) { pq.poll(); d.add(size); pq.add(d); - } else { + } + else { Disk d2 = new Disk(diskId); diskId++; d2.add(size);