1 files changed, 15 insertions, 7 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/GoalConstraintProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/GoalConstraintProvider.xtend
index b6fdbe06..238ade5b 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/GoalConstraintProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/GoalConstraintProvider.xtend
@@ -1,18 +1,26 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules

 

+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.MultiplicityGoalConstraintCalculator

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.GeneratedPatterns

 import java.util.ArrayList

 

 class GoalConstraintProvider {

-        def public getUnfinishedMultiplicityQueries(GeneratedPatterns patterns) {

-                val multiplicityQueries = patterns.unfinishedMulticiplicityQueries

-                val res = new ArrayList(multiplicityQueries.size)

-                for(multiplicityQuery : multiplicityQueries.entrySet) {

-                        val targetRelationName = multiplicityQuery.key.name

-                        val query = multiplicityQuery.value

-                        res += new MultiplicityGoalConstraintCalculator(targetRelationName,query);

+        

+        def getUnfinishedMultiplicityQueries(LogicProblem p, GeneratedPatterns patterns) {

+                val res = new ArrayList()

+                for (entry : patterns.multiplicityConstraintQueries.entrySet) {

+                        val constraint = entry.key

+                        if (constraint.constrainsUnfinished) {

+                                val queries = entry.value

+                                val targetRelationName = constraint.relation.name

+                                val query = queries.unfinishedMultiplicityQuery

+                                val minValue = constraint.lowerBound

+                                val containment = constraint.containment

+                                res += new MultiplicityGoalConstraintCalculator(targetRelationName, query, minValue, containment, 1)

+                        }

                 }

                 return res

         }

+

 }
\ No newline at end of file