removed every occurence of check expressions

1 files changed, 11 insertions, 4 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 6435806d..05ce4f6e 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,13 +10,15 @@ 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, boolean containment, int cost) {

+        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

         }

@@ -25,6 +27,7 @@ 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

         }

@@ -47,13 +50,17 @@ class MultiplicityGoalConstraintCalculator {
                 val allMatches = this.matcher.allMatches

                 for(match : allMatches) {

                         

-                        val missingMultiplicity = match.get(4) 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)

+//              if(res>0)

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

                 return res*cost

         }

 }
\ No newline at end of file