1 files changed, 5 insertions, 5 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeRefinementGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeRefinementGenerator.xtend
index 1aa3b955..2e03d6ed 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeRefinementGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeRefinementGenerator.xtend
@@ -28,7 +28,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
                private pattern hasElementInContainment(problem:LogicProblem, interpretation:PartialInterpretation)
                «FOR type :containment.typesOrderedInHierarchy SEPARATOR "or"»{
                        find interpretation(problem,interpretation);
-                        «base.typeIndexer.referInstanceOf(type,Modality.MAY,"root")»
+                        «base.typeIndexer.referInstanceOf(type,Modality.MUST,"root")»
                        find mustExist(problem, interpretation, root);
                }«ENDFOR»
                «FOR type:newObjectTypes»
@@ -37,7 +37,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
                                        «IF inverseRelations.containsKey(containmentRelation)»
                                                pattern «this.patternName(containmentRelation,inverseRelations.get(containmentRelation),type)»(
                                                        problem:LogicProblem, interpretation:PartialInterpretation,
-                                                        relationInterpretation:PartialRelationInterpretation, inverseInterpretation:PartialRelationInterpretation ,typeInterpretation:PartialTypeInterpratation,
+                                                        relationInterpretation:PartialRelationInterpretation, inverseInterpretation:PartialRelationInterpretation ,typeInterpretation:PartialComplexTypeInterpretation,
                                                        container:DefinedElement)
                                                {
                                                        find interpretation(problem,interpretation);
@@ -56,7 +56,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
                                        «ELSE»
                                                pattern «this.patternName(containmentRelation,null,type)»(
                                                        problem:LogicProblem, interpretation:PartialInterpretation,
-                                                        relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialTypeInterpratation,
+                                                        relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
                                                        container:DefinedElement)
                                                {
                                                        find interpretation(problem,interpretation);
@@ -74,7 +74,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
                                «ENDFOR»
                                pattern «patternName(null,null,type)»(
                                        problem:LogicProblem, interpretation:PartialInterpretation,
-                                        typeInterpretation:PartialTypeInterpratation)
+                                        typeInterpretation:PartialComplexTypeInterpretation)
                                {
                                        find interpretation(problem,interpretation);
                                        neg find hasElementInContainment(problem,interpretation);
@@ -87,7 +87,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
                        «ELSE»
                                pattern createObject_«this.patternName(null,null,type)»(
                                        problem:LogicProblem, interpretation:PartialInterpretation,
-                                        typeInterpretation:PartialTypeInterpratation)
+                                        typeInterpretation:PartialComplexTypeInterpretation)
                                {
                                        find interpretation(problem,interpretation);
                                        PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeRefinementGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeRefinementGenerator.xtend index 1aa3b955..2e03d6ed 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeRefinementGenerator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/GenericTypeRefinementGenerator.xtend
@@ -28,7 +28,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
28	private pattern hasElementInContainment(problem:LogicProblem, interpretation:PartialInterpretation)	28	private pattern hasElementInContainment(problem:LogicProblem, interpretation:PartialInterpretation)
29	«FOR type :containment.typesOrderedInHierarchy SEPARATOR "or"»{	29	«FOR type :containment.typesOrderedInHierarchy SEPARATOR "or"»{
30	find interpretation(problem,interpretation);	30	find interpretation(problem,interpretation);
31	«base.typeIndexer.referInstanceOf(type,Modality.MAY,"root")»	31	«base.typeIndexer.referInstanceOf(type,Modality.MUST,"root")»
32	find mustExist(problem, interpretation, root);	32	find mustExist(problem, interpretation, root);
33	}«ENDFOR»	33	}«ENDFOR»
34	«FOR type:newObjectTypes»	34	«FOR type:newObjectTypes»
@@ -37,7 +37,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
37	«IF inverseRelations.containsKey(containmentRelation)»	37	«IF inverseRelations.containsKey(containmentRelation)»
38	pattern «this.patternName(containmentRelation,inverseRelations.get(containmentRelation),type)»(	38	pattern «this.patternName(containmentRelation,inverseRelations.get(containmentRelation),type)»(
39	problem:LogicProblem, interpretation:PartialInterpretation,	39	problem:LogicProblem, interpretation:PartialInterpretation,
40	relationInterpretation:PartialRelationInterpretation, inverseInterpretation:PartialRelationInterpretation ,typeInterpretation:PartialTypeInterpratation,	40	relationInterpretation:PartialRelationInterpretation, inverseInterpretation:PartialRelationInterpretation ,typeInterpretation:PartialComplexTypeInterpretation,
41	container:DefinedElement)	41	container:DefinedElement)
42	{	42	{
43	find interpretation(problem,interpretation);	43	find interpretation(problem,interpretation);
@@ -56,7 +56,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
56	«ELSE»	56	«ELSE»
57	pattern «this.patternName(containmentRelation,null,type)»(	57	pattern «this.patternName(containmentRelation,null,type)»(
58	problem:LogicProblem, interpretation:PartialInterpretation,	58	problem:LogicProblem, interpretation:PartialInterpretation,
59	relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialTypeInterpratation,	59	relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
60	container:DefinedElement)	60	container:DefinedElement)
61	{	61	{
62	find interpretation(problem,interpretation);	62	find interpretation(problem,interpretation);
@@ -74,7 +74,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
74	«ENDFOR»	74	«ENDFOR»
75	pattern «patternName(null,null,type)»(	75	pattern «patternName(null,null,type)»(
76	problem:LogicProblem, interpretation:PartialInterpretation,	76	problem:LogicProblem, interpretation:PartialInterpretation,
77	typeInterpretation:PartialTypeInterpratation)	77	typeInterpretation:PartialComplexTypeInterpretation)
78	{	78	{
79	find interpretation(problem,interpretation);	79	find interpretation(problem,interpretation);
80	neg find hasElementInContainment(problem,interpretation);	80	neg find hasElementInContainment(problem,interpretation);
@@ -87,7 +87,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
87	«ELSE»	87	«ELSE»
88	pattern createObject_«this.patternName(null,null,type)»(	88	pattern createObject_«this.patternName(null,null,type)»(
89	problem:LogicProblem, interpretation:PartialInterpretation,	89	problem:LogicProblem, interpretation:PartialInterpretation,
90	typeInterpretation:PartialTypeInterpratation)	90	typeInterpretation:PartialComplexTypeInterpretation)
91	{	91	{
92	find interpretation(problem,interpretation);	92	find interpretation(problem,interpretation);
93	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);	93	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);