Fix scope + numerical solver interaction

1 files changed, 10 insertions, 12 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 b28cd584..392ab3ee 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
@@ -3,29 +3,31 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality
 import org.eclipse.emf.common.notify.Notifier

 import org.eclipse.viatra.query.runtime.api.IQuerySpecification

 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine

-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

+        var MultiplicityCalculator<?> calculator

         val boolean containment

+        val int lowerBound

         val int cost

                 

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

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

                 this.targetRelationName = targetRelationName

                 this.querySpecification = querySpecification

-                this.matcher = null

+                this.calculator = null

                 this.containment = containment

+                this.lowerBound = lowerBound

                 this.cost = cost

         }

         

         new(MultiplicityGoalConstraintCalculator other) {

                 this.targetRelationName = other.targetRelationName

                 this.querySpecification = other.querySpecification

-                this.matcher = null

+                this.calculator = null

                 this.containment = other.containment

+                this.lowerBound = other.lowerBound

                 this.cost = other.cost

         }

         

@@ -39,16 +41,12 @@ class MultiplicityGoalConstraintCalculator {
 

         def init(Notifier notifier) {

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

-                matcher = querySpecification.getMatcher(engine)

+                val matcher = querySpecification.getMatcher(engine)

+                calculator = RemainingMultiplicityCalculator.of(matcher, lowerBound)

         }

         

         def calculateValue() {

-                var res = 0

-                val allMatches = this.matcher.allMatches

-                for(match : allMatches) {

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

-                        res += missingMultiplicity

-                }

+                val res = calculator.multiplicity

 //              if(res>0)

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

                 return res*cost