updated solution;

Mintas · Mar 3, 2016 · 4901dc0 · 4901dc0
1 parent 27a9ce6
commit 4901dc0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Main.java b/src/Main.java
@@ -24,7 +24,6 @@ private static void printSolution(JackSparrowHelper jackSparrowHelper) {
 
         System.out.println(abr.calculateAveragePrice() + "  REAL AVG: " + getAvg(abr));
         System.out.println("amount: " + getGallons(abr));
-        //abr.getPurchases().forEach(p -> System.out.println(p.getTotalPrice()));
         System.out.println("TOTAL is: " + abr.getPurchases().stream().mapToDouble(Purchase::getTotalPrice).sum());
     }
 

diff --git a/src/knapsack/GreedyBoundedKnapsackSolver.java b/src/knapsack/GreedyBoundedKnapsackSolver.java
@@ -48,14 +48,19 @@ private Purchase decidePurchase(int needGallons, List<Commodity> commodities, bo
 
     private Purchase bestForCommodity(Commodity cmdty, int needGallons, boolean min) {
         int canTake = min(cmdty.getAmountLeft(), needGallons);
+        int canTakeByServings = getCanTakeByServings(cmdty, canTake, min);
+        if (canTakeByServings == 0) return null;
+
+        cmdty.decreaseAmount(canTakeByServings);
+        return new Purchase(cmdty.getSource(), canTakeByServings, cmdty.getAvgPrice());
+    }
+
+    private int getCanTakeByServings(Commodity cmdty, int canTake, boolean min) {
         int canTakeByServings = (canTake / cmdty.getServingSize()) * cmdty.getServingSize();
 
         if ((min && canTake < cmdty.getMinSize())) {
             canTakeByServings = cmdty.getAmountLeft()>=cmdty.getMinSize() ? cmdty.getMinSize() : canTakeByServings;
         }
-        if (canTakeByServings == 0) return null;
-
-        cmdty.decreaseAmount(canTakeByServings);
-        return new Purchase(cmdty.getSource(), canTakeByServings, cmdty.getAvgPrice());
+        return canTakeByServings;
     }
 }