diff options
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend')
-rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend | 11 |
1 files changed, 8 insertions, 3 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 74e03f71..2f7febd0 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 | |||
@@ -1,5 +1,6 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.viatra2logic | 1 | package hu.bme.mit.inf.dslreasoner.viatra2logic |
2 | 2 | ||
3 | import com.google.inject.Injector | ||
3 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic | 4 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic |
4 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace | 5 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace |
5 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder | 6 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder |
@@ -50,7 +51,7 @@ class Viatra2LogicConfiguration { | |||
50 | public var normalize = true | 51 | public var normalize = true |
51 | } | 52 | } |
52 | 53 | ||
53 | class Viatra2Logic { | 54 | class Viatra2Logic { |
54 | val extension LogicProblemBuilder builder = new LogicProblemBuilder | 55 | val extension LogicProblemBuilder builder = new LogicProblemBuilder |
55 | val extension Viatra2LogicAnnotationsFactory factory = Viatra2LogicAnnotationsFactory.eINSTANCE | 56 | val extension Viatra2LogicAnnotationsFactory factory = Viatra2LogicAnnotationsFactory.eINSTANCE |
56 | val normalizer = new PBodyNormalizer(EMFQueryMetaContext.DEFAULT) | 57 | val normalizer = new PBodyNormalizer(EMFQueryMetaContext.DEFAULT) |
@@ -59,12 +60,16 @@ class Viatra2Logic { | |||
59 | val Ecore2Logic ecore2Logic | 60 | val Ecore2Logic ecore2Logic |
60 | Constraint2Logic constraint2Logic | 61 | Constraint2Logic constraint2Logic |
61 | 62 | ||
62 | new(Ecore2Logic ecore2Logic) { | 63 | new(Ecore2Logic ecore2Logic, Injector injector) { |
63 | this.ecore2Logic = ecore2Logic | 64 | this.ecore2Logic = ecore2Logic |
64 | this.typeInferer = new Viatra2LogicTypeInferer(ecore2Logic) | 65 | this.typeInferer = new Viatra2LogicTypeInferer(ecore2Logic, injector) |
65 | this.constraint2Logic = new Constraint2Logic(ecore2Logic) | 66 | this.constraint2Logic = new Constraint2Logic(ecore2Logic) |
66 | } | 67 | } |
67 | 68 | ||
69 | new(Ecore2Logic ecore2Logic) { | ||
70 | this(ecore2Logic, null) | ||
71 | } | ||
72 | |||
68 | def TracedOutput<LogicProblem,Viatra2LogicTrace> transformQueries( | 73 | def TracedOutput<LogicProblem,Viatra2LogicTrace> transformQueries( |
69 | ViatraQuerySetDescriptor queries, | 74 | ViatraQuerySetDescriptor queries, |
70 | TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace, | 75 | TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace, |