diff options
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit')
-rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend index 91c6a61a..ae22af1c 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend | |||
@@ -41,7 +41,7 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* | |||
41 | @Data class ViatraQuerySetDescriptor { | 41 | @Data class ViatraQuerySetDescriptor { |
42 | val List<? extends IQuerySpecification<?>> patterns | 42 | val List<? extends IQuerySpecification<?>> patterns |
43 | val Set<? extends IQuerySpecification<?>> validationPatterns | 43 | val Set<? extends IQuerySpecification<?>> validationPatterns |
44 | val Map<PQuery,EStructuralFeature> derivedFeatures | 44 | val Map<IQuerySpecification<?>,EStructuralFeature> derivedFeatures |
45 | } | 45 | } |
46 | class Viatra2LogicTrace { | 46 | class Viatra2LogicTrace { |
47 | public val Map<PQuery, RelationDefinition> query2Relation = new HashMap | 47 | public val Map<PQuery, RelationDefinition> query2Relation = new HashMap |
@@ -155,7 +155,7 @@ class Viatra2Logic { | |||
155 | 155 | ||
156 | def transformQueryConstraints( | 156 | def transformQueryConstraints( |
157 | Set<? extends IQuerySpecification<?>> validationPatterns, | 157 | Set<? extends IQuerySpecification<?>> validationPatterns, |
158 | Map<PQuery,EStructuralFeature> derivedFeatures, | 158 | Map<IQuerySpecification<?>,EStructuralFeature> derivedFeatures, |
159 | TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace, | 159 | TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace, |
160 | Viatra2LogicTrace viatra2LogicTrace) | 160 | Viatra2LogicTrace viatra2LogicTrace) |
161 | { | 161 | { |
@@ -179,7 +179,7 @@ class Viatra2Logic { | |||
179 | ecore2LogicTrace.output.annotations.add(annotation) | 179 | ecore2LogicTrace.output.annotations.add(annotation) |
180 | } | 180 | } |
181 | for(derivedFeature : derivedFeatures.entrySet) { | 181 | for(derivedFeature : derivedFeatures.entrySet) { |
182 | val relationDefinition = derivedFeature.key.lookup(viatra2LogicTrace.query2Relation) | 182 | val relationDefinition = derivedFeature.key.internalQueryRepresentation.lookup(viatra2LogicTrace.query2Relation) |
183 | val feature = derivedFeature.value | 183 | val feature = derivedFeature.value |
184 | if(feature instanceof EAttribute) { | 184 | if(feature instanceof EAttribute) { |
185 | val declaration = ecore2Logic.relationOfAttribute(ecore2LogicTrace.trace,feature) | 185 | val declaration = ecore2Logic.relationOfAttribute(ecore2LogicTrace.trace,feature) |
@@ -190,7 +190,7 @@ class Viatra2Logic { | |||
190 | } else throw new IllegalArgumentException('''Unknown feature: «feature»''') | 190 | } else throw new IllegalArgumentException('''Unknown feature: «feature»''') |
191 | val annotation = createDefinedByDerivedFeature => [ | 191 | val annotation = createDefinedByDerivedFeature => [ |
192 | it.target = relationDefinition.defines | 192 | it.target = relationDefinition.defines |
193 | it.query = derivedFeature.key.lookup(viatra2LogicTrace.query2Annotation) | 193 | it.query = derivedFeature.key.internalQueryRepresentation.lookup(viatra2LogicTrace.query2Annotation) |
194 | ] | 194 | ] |
195 | ecore2LogicTrace.output.annotations+=annotation | 195 | ecore2LogicTrace.output.annotations+=annotation |
196 | } | 196 | } |