Merge branch 'hotfix/ilp-cnstrs-null'

Echtzeitsysteme · Jul 1, 2022 · b36a8f9 · b36a8f9
2 parents 3aff05c + 1e78c03
commit b36a8f9
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/org.emoflon.gips.core/src/org/emoflon/gips/core/ilp/GurobiSolver.java b/org.emoflon.gips.core/src/org/emoflon/gips/core/ilp/GurobiSolver.java
@@ -250,6 +250,11 @@ private int addIlpIntegerConstraintsToGrb(final Collection<ILPConstraint> constr
 		final Iterator<ILPConstraint> cnstrsIt = constraints.iterator();
 		while (cnstrsIt.hasNext()) {
 			final ILPConstraint curr = cnstrsIt.next();
+
+			if (curr == null) {
+				continue;
+			}
+
 			final GRBLinExpr grbLinExpr = new GRBLinExpr();
 
 			// Check if constraints of form "<empty> == const" exist and throw an exception
@@ -298,6 +303,11 @@ private int addIlpConstraintsToGrb(final Collection<ILPConstraint> constraints,
 		final Iterator<ILPConstraint> cnstrsIt = constraints.iterator();
 		while (cnstrsIt.hasNext()) {
 			final ILPConstraint curr = cnstrsIt.next();
+
+			if (curr == null) {
+				continue;
+			}
+
 			final GRBLinExpr grbLinExpr = new GRBLinExpr();
 
 			// Check if constraints of form "<empty> == const" exist and throw an exception