diff options
author | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-08-16 17:13:22 +0200 |
---|---|---|
committer | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-08-16 17:13:22 +0200 |
commit | d1b2d628bf515f0a1772eaff7366f9c29c1b02ce (patch) | |
tree | 7bf46a1f850b3980b1d38c71a4cb3f791e81084d /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver | |
parent | Added separate symbolic objects to all primitive objects (diff) | |
download | VIATRA-Generator-d1b2d628bf515f0a1772eaff7366f9c29c1b02ce.tar.gz VIATRA-Generator-d1b2d628bf515f0a1772eaff7366f9c29c1b02ce.tar.zst VIATRA-Generator-d1b2d628bf515f0a1772eaff7366f9c29c1b02ce.zip |
Mapping of primitive types in patterns
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver')
2 files changed, 6 insertions, 9 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2Logic.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2Logic.xtend index 216ae348..d2b59754 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2Logic.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2Logic.xtend | |||
@@ -13,10 +13,9 @@ class InstanceModel2Logic { | |||
13 | 13 | ||
14 | public def transform( | 14 | public def transform( |
15 | TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult, | 15 | TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult, |
16 | List<EObject> objects, | 16 | List<EObject> objects) |
17 | TypeScopes typeScopes) | ||
18 | { | 17 | { |
19 | val res1 = this.instanceModel2PartialInterpretation.transform(metamodelTranslationResult,objects,true,typeScopes) | 18 | val res1 = instanceModel2PartialInterpretation.transform(metamodelTranslationResult,objects,true) |
20 | this.partialInterpretation2Logic.transformPartialIntepretation2Logic(metamodelTranslationResult.output,res1) | 19 | this.partialInterpretation2Logic.transformPartialIntepretation2Logic(metamodelTranslationResult.output,res1) |
21 | return metamodelTranslationResult//.output | 20 | return metamodelTranslationResult//.output |
22 | } | 21 | } |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend index 4c6cf769..080ad963 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend | |||
@@ -30,22 +30,20 @@ class InstanceModel2PartialInterpretation { | |||
30 | public def transform( | 30 | public def transform( |
31 | TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult, | 31 | TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult, |
32 | Resource resource, | 32 | Resource resource, |
33 | boolean withID, | 33 | boolean withID) |
34 | TypeScopes typeScopes) | ||
35 | { | 34 | { |
36 | val objects = resource.allContents.toList | 35 | val objects = resource.allContents.toList |
37 | return transform(metamodelTranslationResult,objects,withID,typeScopes) | 36 | return transform(metamodelTranslationResult,objects,withID) |
38 | } | 37 | } |
39 | 38 | ||
40 | public def transform( | 39 | public def transform( |
41 | TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult, | 40 | TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult, |
42 | List<EObject> objects, | 41 | List<EObject> objects, |
43 | boolean withID, | 42 | boolean withID) |
44 | TypeScopes typeScopes) | ||
45 | { | 43 | { |
46 | val problem = metamodelTranslationResult.output | 44 | val problem = metamodelTranslationResult.output |
47 | val ecore2LogicTrace = metamodelTranslationResult.trace | 45 | val ecore2LogicTrace = metamodelTranslationResult.trace |
48 | val tracedOutput = partialInterpretationInitialiser.initialisePartialInterpretation(problem, typeScopes) | 46 | val tracedOutput = partialInterpretationInitialiser.initialisePartialInterpretation(problem, new TypeScopes) |
49 | val partialInterpretation = tracedOutput.output | 47 | val partialInterpretation = tracedOutput.output |
50 | val partialInterpretationTrace = tracedOutput.trace | 48 | val partialInterpretationTrace = tracedOutput.trace |
51 | 49 | ||