1 files changed, 11 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/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 2376fb38..8f3a5bb0 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
@@ -79,7 +79,7 @@ class ScopePropagator {
                 // Nothing to propagate.

         }

 

-        def propagateAdditionToType(PartialTypeInterpratation t) {

+        def decrementTypeScope(PartialTypeInterpratation t) {

 //              println('''Adding to «(t as PartialComplexTypeInterpretation).interpretationOf.name»''')

                 val targetScope = type2Scope.get(t)

                 if (targetScope !== null) {

@@ -96,15 +96,23 @@ class ScopePropagator {
                 if (this.partialInterpretation.maxNewElements > 0) {

                         this.partialInterpretation.maxNewElements = this.partialInterpretation.maxNewElements - 1

                 } else if (this.partialInterpretation.maxNewElements === 0) {

-                        throw new IllegalArgumentException('''Inconsistent object creation: lower node limit is 0!''')

+                        setScopesInvalid()

                 }

-                propagateAllScopeConstraints

 

 //              println('''Target Scope: «targetScope.minNewElements» - «targetScope.maxNewElements»''')

 //              println(''' «this.partialInterpretation.minNewElements» - «this.partialInterpretation.maxNewElements»''')

 //              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

+                for (scope : partialInterpretation.scopes) {

+                        scope.minNewElements = Integer.MAX_VALUE

+                        scope.maxNewElements = 0

+                }

+        }

 

         def void propagateAdditionToRelation(Relation r) {

                 // Nothing to propagate.