From 6535d5505d6ac2298b288093104223f654227bd2 Mon Sep 17 00:00:00 2001
From: "thibault.capt" <thibault.capt@etu.hesge.ch>
Date: Mon, 16 Jan 2023 13:56:29 +0100
Subject: [PATCH] Changes by julianosl
---
src/Main.java | 2 +-
src/Simplex.java | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/Main.java b/src/Main.java
index f947013..7ed6efa 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 aa2a7e5..7d0dc31 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);
--
GitLab