From 67753d94764cf01b72c7f7197ab9daacfbb47c5a Mon Sep 17 00:00:00 2001
From: aristidecod <sie.ouattara@etu.univ-amu.fr>
Date: Thu, 23 Jan 2025 13:25:11 +0100
Subject: [PATCH] on stoke recupere la liste des objets du sac optimal
---
out/production/aroTP2/App.class | Bin 1386 -> 583 bytes
src/App.java | 4 +---
src/Backpack.java | 8 ++++----
src/Loot.java | 2 +-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/out/production/aroTP2/App.class b/out/production/aroTP2/App.class
index ddc92ab5174f71e7f1974260537408a5c4b0286f..cd72d5fdbb17825ce855a1b9f61572d83d12126b 100644
GIT binary patch
delta 218
zcmaFGb)1Fk)W2Q(7#J9w7}O_n`SNfV7bWW#Cnkra7MDy+2x4Yu5Sy&aw4708@>M21
zF$P5jQ3fUk5MW|pWME}rV_;+upWMJARxiQ80Om0;urNq6Ffi~iFfuSOurf$7NHZ`n
za5Bg+$TBc7h%+!S_%Sen%@Eqnz#h4sfm4WU8v~Dz_BIBAjSLJ7Obj5C_!yYM=J7JH
wGYB$pfK3#G=wgs#kY`|E;ALQCP+(AGU}R8YU|?Y3V_;-ZW?*Dc1skCT06gp&DgXcg
literal 1386
zcmX^0Z`VEs1_nEZa4rTW24;2!79Ivx1~x_pfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-
z5<5l)W)00Sb_Nbc20qWc;*!L?<kX<l#FW$`E(Uf6W)22!Mh1@JqGbKz#AFkY5HAk{
z9|J!l14~hAVhSUJoQ4m=?BJ53%)E4KO&_Pk<m`gP<ZNp$20;cPb_QV{1`&`uIA9Wt
z46McZIc2Gw3}Ou8><kh-43Z2|DDDidEG|jSWn^H^FD+qY5QW&1nXeyEl$lo&TvC*p
zm<u*thKE6xL5`7uCq1>qDYdvHEHS4v73?cdAqEBp1s(=P1|>!Y@!Z7hROkG><iwKj
z%#sY}e6U|jiWwP1H9R#Trh~%=>IW_c6$Vvy1~ncAbp{Pa24S!#QLSfWU@rhUCMOSM
z2&NI5VIbdY@i1sJ=rA(yL){mgpHo_rnV-kVz@niU9mU0<$Dq&7V8Fv*$Y2BufYOr8
z9DT>4qQuH#Mh1?Oe2AME8N@WAqp-LY<WCcjKTR1K)Ud_}*!9TXV`ngDWMFnIC}3n@
zan4UkWn|#@$;?ajE6q(xEec6Y%1LEp5c0`SPRt2QEXoA&p@J+W8JWe546Htm1qIfO
z3@o{cnR#G`Ve>yD15092dNCt|a5SbgBLhbgG?_3ma3PWmBLkOfMRIBZD3FTT8C+q3
z4|YCWhLM3QIKQ+gIn^x_<W>&Hf&x8|FBusGobvNaic5+T3w%>cGV)W3`Pmq}xEQ<{
zeApR$L80Ww$e;pJ3ds+dd1d+8srry0h9nTT#N?9vqDn@F8OVVNRR}TEBQY-}C$(6`
zCqF;Cw7?qEcSs^A8bc}zQn4sU4j)JkwMLF;s1eSIIXS_ZC8^dN3;~P`BDtxVIXS7N
zMGD2xG^Jq0$jHFsnU|MZ<eZaOT%20W&JfJVpo-yJY@T3e2xVlD!>^Q)feqqg21N!l
z1||j&U}9hd6*3Hr3>FLw4EhX=42%p646It)85lP*FfcGNSTZm$uz>|x7_1l=7<j;J
zRt9SZ8wLgjP6k^BI|e4O=5humu%X7g8Q3GYGjIxVZDZi^(cZ=&u!%ubdmDrFE(Uo9
zhHVVW5U%D92Hjl@#$XYIRbmXRU<-K}*ck*FI2aTdI2nu>xWHD6L5ydxXK-L(VBlp?
zV{l|}Vqj!&W?*1oVPIr%VPIx(13TKC!GnQ;frEjO!IOcJ!Ji?Jfq{XGfsrAIA%r1}
GK@tG;l3F1E
diff --git a/src/App.java b/src/App.java
index 9fbf355..7757906 100644
--- a/src/App.java
+++ b/src/App.java
@@ -3,9 +3,7 @@ import java.util.List;
public class App {
public static void main(String[] args) throws Exception {
- Backpack backpack= new InstanceReader().read("src/sac4");
+ Backpack backpack= new InstanceReader().read("src/sacTest");
backpack.solve();
- System.out.println("meilleur solution :" + backpack.getBestValue());
- System.out.println("meilleur solution :" + Arrays.toString(backpack.getBestSolution()));
}
}
diff --git a/src/Backpack.java b/src/Backpack.java
index 7f57281..b287831 100644
--- a/src/Backpack.java
+++ b/src/Backpack.java
@@ -1,3 +1,4 @@
+import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@@ -7,8 +8,8 @@ public class Backpack {
private int bestValue = 0;
private int currentWeight = 0;
private int currentValue = 0;
- private boolean[] currentSolution;
- private boolean[] bestSolution;
+ private final boolean[] currentSolution;
+ private final boolean[] bestSolution;
public Backpack(int capacity, List<Loot> loots) {
this.capacity = capacity;
@@ -21,8 +22,7 @@ public class Backpack {
this.sortByRatio();
explore_from(0);
System.out.println("La valeur optimale est : " + bestValue);
- System.out.println("Objets inclus dans la solution optimale : " + bestSolution);
-
+ System.out.println("Objets inclus dans la solution optimale : " + Arrays.toString(bestSolution));
}
public String toString(){
diff --git a/src/Loot.java b/src/Loot.java
index e0996e4..ff7a6d5 100644
--- a/src/Loot.java
+++ b/src/Loot.java
@@ -1,5 +1,5 @@
public class Loot {
- private int weight, value;
+ private final int weight,value;
private final float ratio;
public Loot(int weight, int value) {
--
GitLab