diff options
author | Kristóf Marussy <marussy@mit.bme.hu> | 2020-06-28 20:33:48 +0200 |
---|---|---|
committer | Kristóf Marussy <marussy@mit.bme.hu> | 2020-06-28 20:33:48 +0200 |
commit | 07ae9155ce0ab9407566b075356f9b7220ee8380 (patch) | |
tree | 5c088de7741b575e6fb5b517bb694428f80c661c /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules | |
parent | Fix scope + numerical propagation WIP (diff) | |
download | VIATRA-Generator-07ae9155ce0ab9407566b075356f9b7220ee8380.tar.gz VIATRA-Generator-07ae9155ce0ab9407566b075356f9b7220ee8380.tar.zst VIATRA-Generator-07ae9155ce0ab9407566b075356f9b7220ee8380.zip |
Fix scope + numerical solver interaction
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/GoalConstraintProvider.xtend | 5 |
1 files changed, 3 insertions, 2 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 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 { | |||
14 | if (constraint.constrainsUnfinished) { | 14 | if (constraint.constrainsUnfinished) { |
15 | val queries = entry.value | 15 | val queries = entry.value |
16 | val targetRelationName = constraint.relation.name | 16 | val targetRelationName = constraint.relation.name |
17 | val query = queries.unfinishedMultiplicityQuery | 17 | val query = queries.existingMultiplicityQuery |
18 | val containment = constraint.containment | 18 | val containment = constraint.containment |
19 | res += new MultiplicityGoalConstraintCalculator(targetRelationName, query, containment, 1) | 19 | val lowerBound = constraint.lowerBound |
20 | res += new MultiplicityGoalConstraintCalculator(targetRelationName, query, containment, 1, lowerBound) | ||
20 | } | 21 | } |
21 | } | 22 | } |
22 | return res | 23 | return res |