diff options
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic')
2 files changed, 3 insertions, 2 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend index 9a737ab9..f4fc1fce 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend | |||
@@ -54,7 +54,7 @@ class InstanceModel2PartialInterpretation { | |||
54 | val object = objects.get(objectIndex) | 54 | val object = objects.get(objectIndex) |
55 | val element = createDefinedElement => [ | 55 | val element = createDefinedElement => [ |
56 | it.name = if(withID) | 56 | it.name = if(withID) |
57 | { '''PartialObject«objectIndex»''' } else | 57 | { '''o «objectIndex»''' } else |
58 | { null } | 58 | { null } |
59 | ] | 59 | ] |
60 | 60 | ||
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend index e4ad4295..5d8d9313 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend | |||
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil | |||
23 | import org.eclipse.xtend.lib.annotations.Data | 23 | import org.eclipse.xtend.lib.annotations.Data |
24 | 24 | ||
25 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* | 25 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* |
26 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement | ||
26 | 27 | ||
27 | @Data class PartialInterpretation2Logic_Trace { | 28 | @Data class PartialInterpretation2Logic_Trace { |
28 | Map<DefinedElement,DefinedElement> new2Old = new HashMap | 29 | Map<DefinedElement,DefinedElement> new2Old = new HashMap |
@@ -66,7 +67,7 @@ class PartialInterpretation2Logic { | |||
66 | // newElement.name = '''o «newElementIndex++»''' | 67 | // newElement.name = '''o «newElementIndex++»''' |
67 | // p.elements += newElement | 68 | // p.elements += newElement |
68 | // } | 69 | // } |
69 | p.elements += i.newElements | 70 | p.elements += i.newElements.filter[!it instanceof PrimitiveElement] |
70 | } | 71 | } |
71 | 72 | ||
72 | private def splitTypeIntoTwo(LogicProblem p, PartialComplexTypeInterpretation partialTypeDeclaration,PartialInterpretation2Logic_Trace trace) { | 73 | private def splitTypeIntoTwo(LogicProblem p, PartialComplexTypeInterpretation partialTypeDeclaration,PartialInterpretation2Logic_Trace trace) { |