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/patterns/PatternProvider.xtend | |
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/patterns/PatternProvider.xtend')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend index ac4a0855..2f7c9e2d 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend | |||
@@ -53,10 +53,8 @@ class ModalPatternQueries { | |||
53 | 53 | ||
54 | @Data | 54 | @Data |
55 | class UnifinishedMultiplicityQueries { | 55 | class UnifinishedMultiplicityQueries { |
56 | val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> unfinishedMultiplicityQuery | 56 | val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> existingMultiplicityQuery |
57 | val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> unrepairableMultiplicityQuery | 57 | val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> existingInverseMultiplicityQuery |
58 | val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> remainingInverseMultiplicityQuery | ||
59 | val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> remainingContentsQuery | ||
60 | } | 58 | } |
61 | 59 | ||
62 | class PatternProvider { | 60 | class PatternProvider { |
@@ -108,9 +106,8 @@ class PatternProvider { | |||
108 | 106 | ||
109 | val unfinishedMultiplicities = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(relationConstraints.multiplicityConstraints) | 107 | val unfinishedMultiplicities = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(relationConstraints.multiplicityConstraints) |
110 | val multiplicityConstraintQueries = unfinishedMultiplicities.mapValues [ | 108 | val multiplicityConstraintQueries = unfinishedMultiplicities.mapValues [ |
111 | new UnifinishedMultiplicityQueries(unfinishedMultiplicityQueryName?.lookup(queries), | 109 | new UnifinishedMultiplicityQueries(existingMultiplicityQueryName?.lookup(queries), |
112 | unrepairableMultiplicityQueryName?.lookup(queries), | 110 | existingInverseMultiplicityQueryName?.lookup(queries)) |
113 | remainingInverseMultiplicityQueryName?.lookup(queries), remainingContentsQueryName?.lookup(queries)) | ||
114 | ] | 111 | ] |
115 | val hasElementInContainmentQuery = patternGenerator.typeRefinementGenerator.hasElementInContainmentName.lookup( | 112 | val hasElementInContainmentQuery = patternGenerator.typeRefinementGenerator.hasElementInContainmentName.lookup( |
116 | queries) | 113 | queries) |