diff --git a/src/Matrix.java b/src/Matrix.java index f893d1d1b83bf7772aded1b0c36b73d8f9fc203d..d5eef489cb1e93efd1fbeb65d4947cab159d4df7 100644 --- a/src/Matrix.java +++ b/src/Matrix.java @@ -67,13 +67,9 @@ public class Matrix { public void matrixPrint(String s, int precision) { System.out.println(s + ": "); for (int i = 0; i < x; i++) { - System.out.print("["); for (int j = 0; j < y; j++) { - System.out.printf(this.data[i][j] < 0.0 ? - String.format("%." + precision + "f ", this.data[i][j]) : - String.format(" %." + precision + "f ", this.data[i][j])); + System.out.format("%8.2f", this.data[i][j]); } - System.out.println("]"); } } diff --git a/src/Simplex.java b/src/Simplex.java index 95625d916576029e691d2630559046921ffc8611..aa2a7e561193d4c32d1f94e9585f6ba0eb602778 100644 --- a/src/Simplex.java +++ b/src/Simplex.java @@ -68,7 +68,6 @@ public class Simplex { } void tabAux(int line) { - // TODO : A REVOIR CETTE PARTIE double[] tabRes = new double[this.y + this.nbSousCondition + 1]; Arrays.fill(tabRes, 1.0); for (int j = 0; j < this.y; j++) { @@ -78,15 +77,11 @@ public class Simplex { } double tmpSum = 0; for (int i = 0; i < this.x; i++) { - //tabRes[j] -= Math.abs(this.matEcart.getData(i, j)); tmpSum += -1 * this.matEcart.getData(i, j); - //tabRes[j] -= this.matEcart.getData(i, j); } tabRes[j] = tmpSum; - System.out.print(tmpSum + " "); } System.out.println(); - // FIN DU TODO // -2 car => tabRes[(tabRes.length-1) - (this.nbSousCondition - 1)]; tabRes[tabRes.length - 1] = tabRes[tabRes.length - this.nbSousCondition - 2];