Fix scope + numerical propagation WIP

3 files changed, 13 insertions, 24 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 034420d6..b28cd584 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
@@ -10,15 +10,13 @@ class MultiplicityGoalConstraintCalculator {
         val String targetRelationName

         val IQuerySpecification<?> querySpecification

         var ViatraQueryMatcher<?> matcher

-        val int minValue

         val boolean containment

         val int cost

                 

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

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

                 this.targetRelationName = targetRelationName

                 this.querySpecification = querySpecification

                 this.matcher = null

-                this.minValue = minValue

                 this.containment = containment

                 this.cost = cost

         }

@@ -27,7 +25,6 @@ class MultiplicityGoalConstraintCalculator {
                 this.targetRelationName = other.targetRelationName

                 this.querySpecification = other.querySpecification

                 this.matcher = null

-                this.minValue = other.minValue

                 this.containment = other.containment

                 this.cost = other.cost

         }

@@ -49,14 +46,8 @@ class MultiplicityGoalConstraintCalculator {
                 var res = 0

                 val allMatches = this.matcher.allMatches

                 for(match : allMatches) {

-                        val existingMultiplicity = match.get(4) as Integer

-                        if(existingMultiplicity < this.minValue) {

-                                val missingMultiplicity = this.minValue-existingMultiplicity

-                                res += missingMultiplicity

-                        }

-//                      if(missingMultiplicity!=0) {

-//                              println(targetRelationName+ " missing multiplicity: "+missingMultiplicity)

-//                      }

+                        val missingMultiplicity = match.get(2) as Integer

+                        res += missingMultiplicity

                 }

 //              if(res>0)

 //              println(targetRelationName+ " all missing multiplicities: "+res + "*"+cost+"="+res*cost)

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
index 120fb18a..9b4dff0f 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
@@ -88,6 +88,7 @@ class PolyhedronScopePropagator extends TypeHierarchyScopePropagator {
                                 val result = operator.saturate()
                                 if (result == PolyhedronSaturationResult.EMPTY) {
                                         cache.put(signature, PolyhedronSignature.EMPTY)
+//                                      println("INVALID")
                                         setScopesInvalid()
                                 } else {
                                         val resultSignature = polyhedron.createSignature
@@ -110,11 +111,8 @@ class PolyhedronScopePropagator extends TypeHierarchyScopePropagator {
                 }
         }
 
-        override propagateAdditionToRelation(Relation r) {
-                super.propagateAdditionToRelation(r)
-                if (relevantRelations.contains(r)) {
-                        propagateAllScopeConstraints()
-                }
+        override isPropagationNeededAfterAdditionToRelation(Relation r) {
+                relevantRelations.contains(r) || super.isPropagationNeededAfterAdditionToRelation(r)
         }
 
         def resetBounds() {
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 8f3a5bb0..8350c7f4 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
@@ -114,21 +114,21 @@ class ScopePropagator {
                 }

         }

 

-        def void propagateAdditionToRelation(Relation r) {

-                // Nothing to propagate.

+        def isPropagationNeededAfterAdditionToRelation(Relation r) {

+                false

         }

 

         private def removeOne(Scope scope) {

-                if (scope.maxNewElements === 0) {

-                        throw new IllegalArgumentException('''Inconsistent object creation: «scope.targetTypeInterpretation»''')

-                } else if (scope.maxNewElements > 0) {

-                        scope.maxNewElements = scope.maxNewElements - 1

-                }

                 if (scope.minNewElements > 0) {

                         scope.minNewElements = scope.minNewElements - 1

                 }

                 if (scope.minNewElementsHeuristic > 0) {

                         scope.minNewElementsHeuristic = scope.minNewElementsHeuristic - 1

                 }

+                if (scope.maxNewElements > 0) {

+                        scope.maxNewElements = scope.maxNewElements - 1

+                } else if (scope.maxNewElements === 0) {

+                        setScopesInvalid()

+                }

         }

 }