From f1e279bde3f85dc404d96fd2022213c786261882 Mon Sep 17 00:00:00 2001
From: "juliano.souzaluz" <juliano.souza-luz@etu.hesge.ch>
Date: Mon, 16 Jan 2023 14:07:27 +0100
Subject: [PATCH] push epsilon
---
src/Main.java | 2 +-
src/Simplex.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Main.java b/src/Main.java
index 7ed6efa..f947013 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 = "inputNonAdmissible.txt";
+ String nameFile = "network1.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 7d0dc31..ed62bd0 100644
--- a/src/Simplex.java
+++ b/src/Simplex.java
@@ -104,7 +104,7 @@ public class Simplex {
if (solutionOptimale > 0 + EPSILON) {
System.out.println("Il n'y a pas de solutions admissibles pour ce problème.");
}
- if (solutionOptimale == 0) {
+ if (Math.abs(solutionOptimale) < EPSILON || solutionOptimale == 0) {
// Il y a une solution optimale
// Il faut enlever les variables auxilaires
Matrix res = new Matrix(matEcart.getX(), matEcart.getY());
--
GitLab