diff --git a/src/Main.java b/src/Main.java index f94701304eef904fb3ead60718b3fa150fdde1bb..0c406da51d9f15fd9f0d4c633107376a1aafb6ee 100644 --- a/src/Main.java +++ b/src/Main.java @@ -84,9 +84,8 @@ public class Main { spx.printSimplex(spx.getMatEcart(), "Tableau initial", 0); // true = phase 1 membres de droite pas admissible | false = phase 2 membres de droite admissible - int phase = spx.which_phase(); - if (phase != -1) { - spx.tabAux(phase); + if (spx.which_phase()) { + spx.tabAux(0); // TODO changer ça } else { spx.pivot(spx.getMatEcart()); spx.printSimplex(spx.getMatEcart(), "Résultat", 3); diff --git a/src/Simplex.java b/src/Simplex.java index 161b42de4ec49ea1c70d9b505a8e0a32ac781c54..1386893722af36dc5f3a0e685a84814cebebbe04 100644 --- a/src/Simplex.java +++ b/src/Simplex.java @@ -59,12 +59,11 @@ public class Simplex { * * @return true = phase 1 | false = phase 2 */ - int which_phase() { - int res = -1; + boolean which_phase() { for (int i = 0; i < this.x; i++) { - if (signe(this.matEcart.getData(i, this.y - 1))) res = i; + if (signe(this.matEcart.getData(i, this.y - 1))) return true; } - return res; + return false; } void tabAux(int line) {