diff options
author | 2018-06-13 13:27:33 +0200 | |
---|---|---|
committer | 2018-06-13 13:27:33 +0200 | |
commit | 354f378b6b8ed4d50fc4f378fe48217f9881505c (patch) | |
tree | 35676794eb6870ca67b006b452d58b43cf3abb44 /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend | |
parent | type multiplicity is refined to 0 (diff) | |
download | VIATRA-Generator-354f378b6b8ed4d50fc4f378fe48217f9881505c.tar.gz VIATRA-Generator-354f378b6b8ed4d50fc4f378fe48217f9881505c.tar.zst VIATRA-Generator-354f378b6b8ed4d50fc4f378fe48217f9881505c.zip |
Updated partial model representation handling
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/PartialInterpretation2Logic.xtend')
1 files changed, 3 insertions, 3 deletions
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 3a85536b..e4ad4295 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 | |||
@@ -10,9 +10,9 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition | |||
10 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem | 10 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem |
11 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.Partial2logicannotationsFactory | 11 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.Partial2logicannotationsFactory |
12 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink | 12 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink |
13 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation | ||
13 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation | 14 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation |
14 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation | 15 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation |
15 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation | ||
16 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RelationLink | 16 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RelationLink |
17 | import java.util.ArrayList | 17 | import java.util.ArrayList |
18 | import java.util.HashMap | 18 | import java.util.HashMap |
@@ -46,7 +46,7 @@ class PartialInterpretation2Logic { | |||
46 | addExistingElementToProblem(p,i,trace) | 46 | addExistingElementToProblem(p,i,trace) |
47 | 47 | ||
48 | // Types | 48 | // Types |
49 | for(partialTypeDeclaration : i.partialtypeinterpratation) { | 49 | for(partialTypeDeclaration : i.partialtypeinterpratation.filter(PartialComplexTypeInterpretation)) { |
50 | splitTypeIntoTwo(p,partialTypeDeclaration,trace) | 50 | splitTypeIntoTwo(p,partialTypeDeclaration,trace) |
51 | } | 51 | } |
52 | connectSplittings(p,trace) | 52 | connectSplittings(p,trace) |
@@ -69,7 +69,7 @@ class PartialInterpretation2Logic { | |||
69 | p.elements += i.newElements | 69 | p.elements += i.newElements |
70 | } | 70 | } |
71 | 71 | ||
72 | private def splitTypeIntoTwo(LogicProblem p, PartialTypeInterpratation partialTypeDeclaration,PartialInterpretation2Logic_Trace trace) { | 72 | private def splitTypeIntoTwo(LogicProblem p, PartialComplexTypeInterpretation partialTypeDeclaration,PartialInterpretation2Logic_Trace trace) { |
73 | if(!partialTypeDeclaration.elements.empty) { | 73 | if(!partialTypeDeclaration.elements.empty) { |
74 | val declaration = partialTypeDeclaration.interpretationOf | 74 | val declaration = partialTypeDeclaration.interpretationOf |
75 | 75 | ||