diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-14 12:55:47 +0200 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-14 12:55:47 +0200 |
commit | a993b72eb3e038897767c79d054467a6986d2085 (patch) | |
tree | 6ebd0c0e4d074bc7a97651e780c228014dccf42d /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage | |
parent | derived feature -> partial relation bugfix (diff) | |
download | VIATRA-Generator-a993b72eb3e038897767c79d054467a6986d2085.tar.gz VIATRA-Generator-a993b72eb3e038897767c79d054467a6986d2085.tar.zst VIATRA-Generator-a993b72eb3e038897767c79d054467a6986d2085.zip |
Moved partial model management is moved to one project (+1 PM edge fix)
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage')
1 files changed, 7 insertions, 0 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend index 45fd2c6d..ad9d882b 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend | |||
@@ -27,6 +27,8 @@ import org.eclipse.viatra.query.runtime.emf.EMFScope | |||
27 | import org.eclipse.xtend.lib.annotations.Data | 27 | import org.eclipse.xtend.lib.annotations.Data |
28 | 28 | ||
29 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* | 29 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* |
30 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion | ||
31 | import org.eclipse.emf.ecore.util.EcoreUtil | ||
30 | 32 | ||
31 | @Data class Problem2PartialInterpretationTrace { | 33 | @Data class Problem2PartialInterpretationTrace { |
32 | Map<TypeDeclaration, PartialTypeInterpratation> type2Interpretation = new HashMap | 34 | Map<TypeDeclaration, PartialTypeInterpratation> type2Interpretation = new HashMap |
@@ -99,6 +101,11 @@ class PartialInterpretationInitialiser { | |||
99 | 101 | ||
100 | it.partialrelationinterpretation += problem.relations.filter(RelationDeclaration) | 102 | it.partialrelationinterpretation += problem.relations.filter(RelationDeclaration) |
101 | .map[initialisePartialRelationInterpretation(trace)] | 103 | .map[initialisePartialRelationInterpretation(trace)] |
104 | for(pMR2A : problem.annotations.filter(PartialModelRelation2Assertion)) { | ||
105 | val relation = pMR2A.targetRelation | ||
106 | val interpretation = relation.lookup(trace.relation2Interpretation) | ||
107 | interpretation.relationlinks+=pMR2A.links.map[EcoreUtil.copy(it)] | ||
108 | } | ||
102 | it.partialfunctioninterpretation += problem.functions.filter(FunctionDeclaration) | 109 | it.partialfunctioninterpretation += problem.functions.filter(FunctionDeclaration) |
103 | .map[initialisePartialFunctionInterpretation(trace)] | 110 | .map[initialisePartialFunctionInterpretation(trace)] |
104 | it.partialconstantinterpretation += problem.constants.filter(ConstantDeclaration) | 111 | it.partialconstantinterpretation += problem.constants.filter(ConstantDeclaration) |