3 files changed, 40 insertions, 22 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 86a59aa1..034420d6 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
@@ -7,26 +7,39 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
 import org.eclipse.viatra.query.runtime.emf.EMFScope

 

 class MultiplicityGoalConstraintCalculator {

-        val String targetRelationName;

-        val IQuerySpecification<?> querySpecification;

-        var ViatraQueryMatcher<?> matcher;

+        val String targetRelationName

+        val IQuerySpecification<?> querySpecification

+        var ViatraQueryMatcher<?> matcher

+        val int minValue

+        val boolean containment

+        val int cost

                 

-        new(String targetRelationName, IQuerySpecification<?> querySpecification) {

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

                 this.targetRelationName = targetRelationName

                 this.querySpecification = querySpecification

                 this.matcher = null

+                this.minValue = minValue

+                this.containment = containment

+                this.cost = cost

         }

         

         new(MultiplicityGoalConstraintCalculator other) {

                 this.targetRelationName = other.targetRelationName

                 this.querySpecification = other.querySpecification

                 this.matcher = null

+                this.minValue = other.minValue

+                this.containment = other.containment

+                this.cost = other.cost

         }

         

         def getName() {

                 targetRelationName

         }

         

+        def isContainment() {

+                return containment

+        }

+

         def init(Notifier notifier) {

                 val engine = ViatraQueryEngine.on(new EMFScope(notifier))

                 matcher = querySpecification.getMatcher(engine)

@@ -36,11 +49,17 @@ class MultiplicityGoalConstraintCalculator {
                 var res = 0

                 val allMatches = this.matcher.allMatches

                 for(match : allMatches) {

-                        //println(targetRelationName+ " missing multiplicity: "+match.get(3))

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

-                        res += missingMultiplicity

+                        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)

+//                      }

                 }

-                //println(targetRelationName+ " all missing multiplicities: "+res)

-                return res

+//              if(res>0)

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

+                return 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 51dba244..120fb18a 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
@@ -187,16 +187,7 @@ class PolyhedronScopePropagator extends TypeHierarchyScopePropagator {
                 if (bounds.upperBound !== null && bounds.upperBound < 0) {
                         throw new IllegalArgumentException("Negative upper bound: " + bounds)
                 }
-        }
-
-        private def setScopesInvalid() {
-                partialInterpretation.minNewElements = Integer.MAX_VALUE
-                partialInterpretation.maxNewElements = 0
-                for (scope : partialInterpretation.scopes) {
-                        scope.minNewElements = Integer.MAX_VALUE
-                        scope.maxNewElements = 0
-                }
-        }
+        } 
 
         private static def <T extends IPatternMatch> getCalculatedMultiplicity(ViatraQueryMatcher<T> matcher,
                 PartialInterpretation p) {
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.