1 files changed, 3 insertions, 3 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 2e03d6ed..c9f6abce 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
@@ -11,7 +11,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
 import java.util.HashMap
 class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
-        public new(PatternGenerator base) {
+        new(PatternGenerator base) {
                super(base)
        }
        override requiresTypeAnalysis() { false }
@@ -25,7 +25,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
                        inverseRelations.put(it.inverseB,it.inverseA)
                ]
                return '''
-                private pattern hasElementInContainment(problem:LogicProblem, interpretation:PartialInterpretation)
+                pattern «hasElementInContainmentName»(problem:LogicProblem, interpretation:PartialInterpretation)
                «FOR type :containment.typesOrderedInHierarchy SEPARATOR "or"»{
                        find interpretation(problem,interpretation);
                        «base.typeIndexer.referInstanceOf(type,Modality.MUST,"root")»
@@ -77,7 +77,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
                                        typeInterpretation:PartialComplexTypeInterpretation)
                                {
                                        find interpretation(problem,interpretation);
-                                        neg find hasElementInContainment(problem,interpretation);
+                                        neg find  «hasElementInContainmentName»(problem,interpretation);
                                        PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
                                        PartialComplexTypeInterpretation.interpretationOf.name(type,"«type.name»");
                                        «base.typeIndexer.referInstanceOf(type,Modality.MAY,"newObject")»

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 2e03d6ed..c9f6abce 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
@@ -11,7 +11,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
11	import java.util.HashMap	11	import java.util.HashMap
12		12
13	class GenericTypeRefinementGenerator extends TypeRefinementGenerator {	13	class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
14	public new(PatternGenerator base) {	14	new(PatternGenerator base) {
15	super(base)	15	super(base)
16	}	16	}
17	override requiresTypeAnalysis() { false }	17	override requiresTypeAnalysis() { false }
@@ -25,7 +25,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
25	inverseRelations.put(it.inverseB,it.inverseA)	25	inverseRelations.put(it.inverseB,it.inverseA)
26	]	26	]
27	return '''	27	return '''
28	private pattern hasElementInContainment(problem:LogicProblem, interpretation:PartialInterpretation)	28	pattern «hasElementInContainmentName»(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.MUST,"root")»	31	«base.typeIndexer.referInstanceOf(type,Modality.MUST,"root")»
@@ -77,7 +77,7 @@ class GenericTypeRefinementGenerator extends TypeRefinementGenerator {
77	typeInterpretation:PartialComplexTypeInterpretation)	77	typeInterpretation:PartialComplexTypeInterpretation)
78	{	78	{
79	find interpretation(problem,interpretation);	79	find interpretation(problem,interpretation);
80	neg find hasElementInContainment(problem,interpretation);	80	neg find «hasElementInContainmentName»(problem,interpretation);
81	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);	81	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
82	PartialComplexTypeInterpretation.interpretationOf.name(type,"«type.name»");	82	PartialComplexTypeInterpretation.interpretationOf.name(type,"«type.name»");
83	«base.typeIndexer.referInstanceOf(type,Modality.MAY,"newObject")»	83	«base.typeIndexer.referInstanceOf(type,Modality.MAY,"newObject")»