diff --git a/out/production/aroTP2/App.class b/out/production/aroTP2/App.class index f385ca79a766fbfe129b15dfa2d50392d0a867a1..8d3c8e862e7d1d8ac1daac52964bbb7ec3329713 100644 Binary files a/out/production/aroTP2/App.class and b/out/production/aroTP2/App.class differ diff --git a/out/production/aroTP2/Loot.class b/out/production/aroTP2/Loot.class index 07f1b7ef8b118f561e0965b6f117e4420a682f7c..4ffba3f58d9594f16f64fe6527d3748ef90eb0fc 100644 Binary files a/out/production/aroTP2/Loot.class and b/out/production/aroTP2/Loot.class differ diff --git a/src/App.java b/src/App.java index 7aa8157fa22c2a9c95db42062d190c2550098d8d..a70ffd2bd6aee3fa0e1b931a9341f905b1d113ed 100644 --- a/src/App.java +++ b/src/App.java @@ -2,8 +2,9 @@ import java.util.List; public class App { public static void main(String[] args) throws Exception { - Backpack backpack= new InstanceReader().read("src/sac0"); + Backpack backpack= new InstanceReader().read("src/sacTest"); backpack.sortByRatio(); - System.out.println(backpack); + backpack.solutionFractionnelle(); + System.out.println("solution fractionnelle :" + backpack.getSfValuee()); } } diff --git a/src/Backpack.java b/src/Backpack.java index 10ba315ebebdb4b81946f0390e38cc9ab56a2d60..b8552f0f0bf5768429ce28456da51acb4081337e 100644 --- a/src/Backpack.java +++ b/src/Backpack.java @@ -29,7 +29,7 @@ public class Backpack { for(Loot loot : loots){ if(loot.getWeight() > this.capacity){ sfValuee += (loot.getValue() * loot.getWeight()) / (capacity - sfWeight); - sfWeight += capacity; + sfWeight += capacity - sfWeight; } else { sfValuee += loot.getWeight(); diff --git a/src/sacTest b/src/sacTest new file mode 100644 index 0000000000000000000000000000000000000000..25c99fbdaa22162309a1678f39c96731d7aedfa9 --- /dev/null +++ b/src/sacTest @@ -0,0 +1,4 @@ +15 +5 40 +8 48 +4 36 \ No newline at end of file