2 files changed, 14 insertions, 3 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend
index 392ab3ee..273e0ac3 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend
@@ -14,6 +14,9 @@ class MultiplicityGoalConstraintCalculator {
         val int cost

                 

         new(String targetRelationName, IQuerySpecification<?> querySpecification, boolean containment, int lowerBound, int cost) {

+                if (lowerBound <= 0) {

+                        throw new IllegalArgumentException("Invalid lower bound: " + lowerBound)

+                }

                 this.targetRelationName = targetRelationName

                 this.querySpecification = querySpecification

                 this.calculator = null

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
index 132ca8e8..3e95b2cc 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
@@ -60,15 +60,23 @@ class ScopePropagator {
                                 }

                         }

                 } while (changed)

-                

+

                 copyScopeBoundsToHeuristic()

         }

 

         def propagateAllScopeConstraints() {

+                if (!valid) {

+                        return

+                }

                 statistics.incrementScopePropagationCount()

                 doPropagateAllScopeConstraints()

         }

-        

+

+        def isValid() {

+                partialInterpretation.maxNewElements == -1 ||

+                        partialInterpretation.minNewElements <= partialInterpretation.maxNewElements

+        }

+

         protected def copyScopeBoundsToHeuristic() {

                 partialInterpretation.minNewElementsHeuristic = partialInterpretation.minNewElements

                 for (scope : partialInterpretation.scopes) {

@@ -109,7 +117,7 @@ class ScopePropagator {
 //              this.partialInterpretation.scopes.forEach[println(''' «(it.targetTypeInterpretation as PartialComplexTypeInterpretation).interpretationOf.name»: «it.minNewElements»-«it.maxNewElements»''')]

 //              println('''All constraints are propagated upon increasing «(t as PartialComplexTypeInterpretation).interpretationOf.name»''')

         }

-        

+

         protected def setScopesInvalid() {

                 partialInterpretation.minNewElements = Integer.MAX_VALUE

                 partialInterpretation.maxNewElements = 0