1 files changed, 21 insertions, 4 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 0bdb202e..2376fb38 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
@@ -14,7 +14,7 @@ import org.eclipse.xtend.lib.annotations.Accessors
 

 class ScopePropagator {

         @Accessors(PROTECTED_GETTER) val PartialInterpretation partialInterpretation

-        val ModelGenerationStatistics statistics

+        @Accessors(PROTECTED_GETTER) val ModelGenerationStatistics statistics

         val Map<PartialTypeInterpratation, Scope> type2Scope

         @Accessors(PROTECTED_GETTER) val Map<Scope, Set<Scope>> superScopes

         @Accessors(PROTECTED_GETTER) val Map<Scope, Set<Scope>> subScopes

@@ -59,12 +59,21 @@ class ScopePropagator {
                                 }

                         }

                 } while (changed)

+                

+                copyScopeBoundsToHeuristic()

         }

 

         def propagateAllScopeConstraints() {

                 statistics.incrementScopePropagationCount()

                 doPropagateAllScopeConstraints()

         }

+        

+        protected def copyScopeBoundsToHeuristic() {

+                partialInterpretation.minNewElementsHeuristic = partialInterpretation.minNewElements

+                for (scope : partialInterpretation.scopes) {

+                        scope.minNewElementsHeuristic = scope.minNewElements

+                }

+        }

 

         protected def void doPropagateAllScopeConstraints() {

                 // Nothing to propagate.

@@ -73,12 +82,17 @@ class ScopePropagator {
         def propagateAdditionToType(PartialTypeInterpratation t) {

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

                 val targetScope = type2Scope.get(t)

-                targetScope.removeOne

-                val sups = superScopes.get(targetScope)

-                sups.forEach[removeOne]

+                if (targetScope !== null) {

+                        targetScope.removeOne

+                        val sups = superScopes.get(targetScope)

+                        sups.forEach[removeOne]

+                }

                 if (this.partialInterpretation.minNewElements > 0) {

                         this.partialInterpretation.minNewElements = this.partialInterpretation.minNewElements - 1

                 }

+                if (this.partialInterpretation.minNewElementsHeuristic > 0) {

+                        this.partialInterpretation.minNewElementsHeuristic = this.partialInterpretation.minNewElementsHeuristic - 1

+                }

                 if (this.partialInterpretation.maxNewElements > 0) {

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

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

@@ -105,5 +119,8 @@ class ScopePropagator {
                 if (scope.minNewElements > 0) {

                         scope.minNewElements = scope.minNewElements - 1

                 }

+                if (scope.minNewElementsHeuristic > 0) {

+                        scope.minNewElementsHeuristic = scope.minNewElementsHeuristic - 1

+                }

         }

 }