From 8d48fa47b4ac453e0813d3af904f79ee902a03e0 Mon Sep 17 00:00:00 2001
From: aristidecod <sie.ouattara@etu.univ-amu.fr>
Date: Tue, 21 Jan 2025 22:31:40 +0100
Subject: [PATCH] test de la fonction solutionFractionnelle avec un exemple

---
 out/production/aroTP2/App.class  | Bin 728 -> 1265 bytes
 out/production/aroTP2/Loot.class | Bin 1009 -> 1160 bytes
 src/App.java                     |   5 +++--
 src/Backpack.java                |   2 +-
 src/sacTest                      |   4 ++++
 5 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 src/sacTest

diff --git a/out/production/aroTP2/App.class b/out/production/aroTP2/App.class
index f385ca79a766fbfe129b15dfa2d50392d0a867a1..8d3c8e862e7d1d8ac1daac52964bbb7ec3329713 100644
GIT binary patch
delta 851
zcmcb?`jM0C)W2Q(7#J9w7<?yk`SNfV7bWW#Cnkra7MDy+h|uR^5M&VJVGw6vV`LC5
z&d(_=$;{7lD@sfT(RrykIjNisk_=Mp4AMLdG7Pd4j~dqtGRX5VC@?58GH|D-mISAT
zCFYc-rZO@xYiN23F)%PF^Dw9|s4_B$=O$*SI_KvlCzga~mSi~R=M|SE=9LsPGKgw;
zYWid)mL=-vB<7{-2bUCO=A~P6F{m?Wurp}#FlaGoGcpK+6=de?2NY%Il?0a*r6%Sw
zGO!m+mSq&>fojnVV`tEvY{$5q(R%VTM!kAQ1_7u1{F365qQnB<)RK(+lwuAB2Sx@-
zn9mf_kiDj0#mLXb;Kaq?%;3V#;0kiL8zX}X*kZ8DGV{vvvs0lCgm}d*F}WnasFIOk
zh6a)sAPVdCA(nb1=B4DM7OVK==VzA|SR<)}x*JIZq7$kyq_Q9ti}GkB_5Mj&smUeQ
z$l(Vy!a1=%Cnq?wB-NUcfyXm1FSW=yC$YFVwV0j3laWCc!&lhc%Ff`;$RLMbDI)_L
z#A6JK3_1)<3?RV7z{tSLP|wD|$e_o-z@X2-$iT?Jz`&}toq=&90|NsSgFXWT14x>I
zftkU8fq{VsqJY7W!H9u@fs?_Q!GwVctT~f`32dtBZU*+q?F^hkT-z9Ue6+VQ2xxC(
z5Z%Nep}mbkZWn_R1H(23HH6_}46I2YD;anh*cb#E*cn6_I2cqIIKj4wK}=*YWiVr4
zVBlqtU@&K}U|?jhWME)mVPIsiVqj*l0lU+d!H$7}frEjO!I6QH!JfgLfq{XGfsw(3
K!HdC%K@tF+ZO<P7

delta 285
zcmey!d4rYf)W2Q(7#J9w7>p-!`Eqg;7bWW#Cng(AOpf5?WDsKzXJ?S$VUT2yn)u3?
zTZTcFok5O=L7qWjaucIIkAG5DYI2FSW*9qz(&W92%NY$Or!wi)Gbl1BGB7cK022cv
z11kd?10#bn0|SFT10w??0|NuA)^-NQjSLJ7ObjXv3}9&n24)6T1_lNmhyn&R26YAo
z22KVI22BPgu;xexCa|HByBXLcw=-}GacyJZ@zLJKAh3x+RC^nPG|WI(1_mJp7LYXz
zybNp%f(+~o5)2$*)5RbrFlaGoGcYjlGVn0yFz7NcGUzcdFt9K%f*oiGc9#(V`-LMR

diff --git a/out/production/aroTP2/Loot.class b/out/production/aroTP2/Loot.class
index 07f1b7ef8b118f561e0965b6f117e4420a682f7c..4ffba3f58d9594f16f64fe6527d3748ef90eb0fc 100644
GIT binary patch
delta 268
zcmey!-oeRr>ff$?3=9lT3}zd-3>l?4(^E^rQ!~>uN*EcKH8edL8935YOTrR!N>e9W
zGU`cbGBU6-DljTA^0P5$b1~>J=(02D@i2%n=ud8Byv$<6$e=oTEu$(kJA=vO1}0xd
z*2(9X{?s!vC^0BAFfvFoFfiydFfuSQFfg!cZDC+v!@$76#304Mz`zC;6k(8NU|`?@
zvsoEr7-Sh37#JB;uxjQ-*DQfWGc$uK1A`I+6N4IqIs*d(2LmI676T)L27>_u0|OTW
NBZDD>F@q_CBmk%5AUyy8

delta 124
zcmeC+{K(FA>ff$?3=9lT48|L|3>ha!FzQIDF*2|+DljTA^0P5$a4~2yXt6VB^Du}p
z=uDo+c$r0?kwJCx0wy^w6`%b4?9u{u2E)m7nS2?UC%<O;qt48r#K6G7#GuTe!oa}5
d!NAC%&cMi^%Am`@z`(`8$e_nyz+l862>?uh6-@vD

diff --git a/src/App.java b/src/App.java
index 7aa8157..a70ffd2 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 10ba315..b8552f0 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 0000000..25c99fb
--- /dev/null
+++ b/src/sacTest
@@ -0,0 +1,4 @@
+15
+5 40
+8 48
+4 36
\ No newline at end of file
-- 
GitLab