1 files changed, 28 insertions, 9 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

         }

 }