fixed files form Math #28

program-repair · Mar 7, 2017 · d02b406 · d02b406
1 parent 8c0c9dd
commit d02b406
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/projects/Math/28/org/apache/commons/math3/optimization/linear/SimplexSolver.java b/projects/Math/28/org/apache/commons/math3/optimization/linear/SimplexSolver.java
@@ -116,6 +116,7 @@ private Integer getPivotRow(SimplexTableau tableau, final int col) {
             // there's a degeneracy as indicated by a tie in the minimum ratio test
 
             // 1. check if there's an artificial variable that can be forced out of the basis
+            if (tableau.getNumArtificialVariables() > 0) {
                 for (Integer row : minRatioPositions) {
                     for (int i = 0; i < tableau.getNumArtificialVariables(); i++) {
                         int column = i + tableau.getArtificialVariableOffset();
@@ -125,6 +126,7 @@ private Integer getPivotRow(SimplexTableau tableau, final int col) {
                         }
                     }
                 }
+            }
 
             // 2. apply Bland's rule to prevent cycling:
             //    take the row for which the corresponding basic variable has the smallest index
@@ -135,6 +137,7 @@ private Integer getPivotRow(SimplexTableau tableau, final int col) {
             // Additional heuristic: if we did not get a solution after half of maxIterations
             //                       revert to the simple case of just returning the top-most row
             // This heuristic is based on empirical data gathered while investigating MATH-828.
+            if (getIterations() < getMaxIterations() / 2) {
                 Integer minRow = null;
                 int minIndex = tableau.getWidth();
                 for (Integer row : minRatioPositions) {
@@ -149,6 +152,7 @@ private Integer getPivotRow(SimplexTableau tableau, final int col) {
                     }
                 }
                 return minRow;
+            }
         }
         return minRatioPositions.get(0);
     }