Hotfix: Removes symptoms of null cnstrs in GLPK + CPLEX solver

TODO: Fix root cause, see https://github.com/Echtzeitsysteme/gips/projects/1#card-83776340
Echtzeitsysteme · Aug 22, 2022 · 0e12046 · 0e12046
1 parent 81b24c9
commit 0e12046
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/org.emoflon.gips.core/src/org/emoflon/gips/core/ilp/CplexSolver.java b/org.emoflon.gips.core/src/org/emoflon/gips/core/ilp/CplexSolver.java
@@ -197,6 +197,9 @@ private void setUpCnstrs() {
 				// Iterate over each "sub" constraint (if any)
 				while (cnstrIt.hasNext()) {
 					final ILPConstraint cnstr = cnstrIt.next();
+					if (cnstr == null) {
+						continue;
+					}
 					final IloLinearNumExpr linearNumExpr = cplex.linearNumExpr();
 					for (final ILPTerm act : cnstr.lhsTerms()) {
 						linearNumExpr.addTerm(act.weight(), vars.get(act.variable().getName()));

diff --git a/org.emoflon.gips.core/src/org/emoflon/gips/core/ilp/GlpkSolver.java b/org.emoflon.gips.core/src/org/emoflon/gips/core/ilp/GlpkSolver.java
@@ -260,6 +260,9 @@ private void setUpCnstrs() {
 			int localCnstrCounter = 0;
 			while (cnstrIt.hasNext()) {
 				final ILPConstraint cnstr = cnstrIt.next();
+				if (cnstr == null) {
+					continue;
+				}
 				final int size = cnstr.lhsTerms().size();
 				final SWIGTYPE_p_int vars = GLPK.new_intArray(size + 1);
 				final SWIGTYPE_p_double coeffs = GLPK.new_doubleArray(size + 1);