1 files changed, 16 insertions, 3 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/MultiplicityGoalConstraintCalculator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/MultiplicityGoalConstraintCalculator.xtend
index e05160d0..e1358fb6 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/MultiplicityGoalConstraintCalculator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/MultiplicityGoalConstraintCalculator.xtend
@@ -10,23 +10,33 @@ class MultiplicityGoalConstraintCalculator {
         val String targetRelationName;

         val IQuerySpecification<?> querySpecification;

         var ViatraQueryMatcher<?> matcher;

+        val boolean containment

+        val int cost

                 

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

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

                 this.targetRelationName = targetRelationName

                 this.querySpecification = querySpecification

                 this.matcher = null

+                this.containment = containment

+                this.cost = cost

         }

         

         public new(MultiplicityGoalConstraintCalculator other) {

                 this.targetRelationName = other.targetRelationName

                 this.querySpecification = other.querySpecification

                 this.matcher = null

+                this.containment = other.containment

+                this.cost = other.cost

         }

         

         def public getName() {

                 targetRelationName

         }

         

+        def isContainment() {

+                return containment

+        }

+        

         def public init(Notifier notifier) {

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

                 matcher = querySpecification.getMatcher(engine)

@@ -36,11 +46,14 @@ class MultiplicityGoalConstraintCalculator {
                 var res = 0

                 val allMatches = this.matcher.allMatches

                 for(match : allMatches) {

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

+                        

                         val missingMultiplicity = match.get(4) as Integer

                         res += missingMultiplicity

+                        if(missingMultiplicity!=0) {

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

+                        }

                 }

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

-                return res

+                return res*cost

         }

 }
\ No newline at end of file