From 07ae9155ce0ab9407566b075356f9b7220ee8380 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 28 Jun 2020 20:33:48 +0200 Subject: Fix scope + numerical solver interaction --- .../viatrasolver/logic2viatra/rules/GoalConstraintProvider.xtend | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules') 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 d2ee80dc..7dc21410 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 @@ -14,9 +14,10 @@ class GoalConstraintProvider { if (constraint.constrainsUnfinished) { val queries = entry.value val targetRelationName = constraint.relation.name - val query = queries.unfinishedMultiplicityQuery + val query = queries.existingMultiplicityQuery val containment = constraint.containment - res += new MultiplicityGoalConstraintCalculator(targetRelationName, query, containment, 1) + val lowerBound = constraint.lowerBound + res += new MultiplicityGoalConstraintCalculator(targetRelationName, query, containment, 1, lowerBound) } } return res -- cgit v1.2.3-54-g00ecf