diff --git a/src/Main.java b/src/Main.java index f94701304eef904fb3ead60718b3fa150fdde1bb..7ed6efa2fdff8744ba0862b8612072db8942dbe0 100644 --- a/src/Main.java +++ b/src/Main.java @@ -43,7 +43,7 @@ public class Main { Scanner readFile = new Scanner(System.in); System.out.println("Entrez le nom du fichier à tester, il doit se situer dans le dossier src."); //String nameFile = readFile.nextLine(); - String nameFile = "network1.txt"; + String nameFile = "inputNonAdmissible.txt"; //String nameFile = "inputNonAdmissible.txt"; File f = new File("src/" + nameFile); Scanner sc = new Scanner(f); diff --git a/src/Simplex.java b/src/Simplex.java index aa2a7e561193d4c32d1f94e9585f6ba0eb602778..7d0dc310453c1e137f6f45cdfc67ce936e33b9de 100644 --- a/src/Simplex.java +++ b/src/Simplex.java @@ -118,7 +118,7 @@ public class Simplex { } int getFirstNeg(Matrix mat) { - for (int j = 0; j < mat.getY(); j++) { + for (int j = 0; j < mat.getY() - 1; j++) { if (signe(mat.getData(mat.getX() - 1, j))) return j; } return -1; @@ -146,9 +146,7 @@ public class Simplex { for (int j = 0; j < mat.getY(); j++) if (signe(mat.getData(mat.getX() - 1, j))) { has_neg = true; - if (has_neg) { - break; - } + break; } if (has_neg) pivot(mat);