optional activation

Author: apete

pom.xml

@@ -51,7 +51,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.java>11</version.java>
-        <version.org.junit.jupiter>5.12.2</version.org.junit.jupiter>
+        <version.org.junit.jupiter>5.13.0</version.org.junit.jupiter>
         <version.org.openjdk.jmh>1.37</version.org.openjdk.jmh>
     </properties>
     <dependencies>

src/main/java/org/ojalgo/optimisation/convex/ActiveSetSolver.java

@@ -345,7 +345,7 @@ protected boolean initialise(final Result kickStarter) {
         }
 
         if (state.isFeasible()) {
-            this.resetActivator();
+            this.resetActivator(!options.convex().isExtendedPrecision());
         } else {
             this.getSolutionX().fillAll(ZERO);
         }
@@ -400,8 +400,8 @@ protected boolean needsAnotherIteration() {
     }
 
     /**
-     * Find the minimum (largest negative) lagrange multiplier - for the active inequalities - to
-     * potentially deactivate.
+     * Find the minimum (largest negative) lagrange multiplier - for the active inequalities - to potentially
+     * deactivate.
      */
     protected int suggestConstraintToExclude() {
 
@@ -468,8 +468,7 @@ protected int suggestConstraintToExclude() {
 
     /**
      * Find minimum (largest negative) slack - for the inactive inequalities - to potentially activate.
-     * Negative slack means the constraint is violated. Need to make sure it is enforced by activating
-     * it.
+     * Negative slack means the constraint is violated. Need to make sure it is enforced by activating it.
      */
     protected int suggestConstraintToInclude() {
         return this.getConstraintToInclude();
@@ -652,35 +651,38 @@ void handleIterationResults(final boolean solved, final R064Store iterX, final i
 
     }
 
-    void resetActivator() {
+    void resetActivator(final boolean activate) {
 
         myActivator.excludeAll();
         myExcluded = null;
         myIncluded = null;
 
-        int nbInes = this.countInequalityConstraints();
-        int nbEqus = this.countEqualityConstraints();
-        int nbVars = this.countVariables();
+        if (activate) {
 
-        int maxToInclude = nbVars - nbEqus;
+            int nbInes = this.countInequalityConstraints();
+            int nbEqus = this.countEqualityConstraints();
+            int nbVars = this.countVariables();
 
-        if (this.isLogDebug() && maxToInclude < 0) {
-            this.log("Redundant contraints!");
-        }
+            int maxToInclude = nbVars - nbEqus;
 
-        if (nbInes > 0 && maxToInclude > 0) {
+            if (this.isLogDebug() && maxToInclude < 0) {
+                this.log("Redundant contraints!");
+            }
 
-            MatrixStore<Double> ineqSlack = this.getSlackI();
+            if (nbInes > 0 && maxToInclude > 0) {
 
-            for (int i = 0; i < nbInes; i++) {
+                MatrixStore<Double> ineqSlack = this.getSlackI();
 
-                double slack = ineqSlack.doubleValue(i);
+                for (int i = 0; i < nbInes; i++) {
 
-                if (slack >= ZERO && ACC.isZero(slack) && this.countIncluded() < maxToInclude) {
-                    if (this.isLogDebug()) {
-                        this.log("Will inlcude ineq {} with slack={}", i, slack);
+                    double slack = ineqSlack.doubleValue(i);
+
+                    if (slack >= ZERO && ACC.isZero(slack) && this.countIncluded() < maxToInclude) {
+                        if (this.isLogDebug()) {
+                            this.log("Will inlcude ineq {} with slack={}", i, slack);
+                        }
+                        this.include(i);
                     }
-                    this.include(i);
                 }
             }
         }

src/main/java/org/ojalgo/optimisation/convex/IterativeASS.java

@@ -304,9 +304,9 @@ void addConstraint(final int constrIndex, final SparseArray<Double> constrBody,
     }
 
     @Override
-    void resetActivator() {
+    void resetActivator(boolean activate) {
 
-        super.resetActivator();
+        super.resetActivator(activate);
 
         int nbEqus = this.countEqualityConstraints();
         int nbVars = this.countVariables();