From 293e49d1256b8b17a4a8b15a8c49ce0b04e49a06 Mon Sep 17 00:00:00 2001
From: "thibault.capt" <thibault.capt@etu.hesge.ch>
Date: Mon, 16 Jan 2023 14:58:00 +0100
Subject: [PATCH] =?UTF-8?q?r=C3=A9gler=20probleme=20-=20sur=20une=20ligne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Main.java | 5 ++---
src/Simplex.java | 7 +++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/Main.java b/src/Main.java
index f947013..0c406da 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 161b42d..1386893 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) {
--
GitLab