1 files changed, 47 insertions, 36 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeRefinementGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeRefinementGenerator.xtend
index 7e3fad91..4ef336ae 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeRefinementGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeRefinementGenerator.xtend
@@ -25,69 +25,76 @@ class ObjectCreationPrecondition {
 abstract class TypeRefinementGenerator {
        val protected PatternGenerator base;
-        public new(PatternGenerator base) {
+        new(PatternGenerator base) {
                this.base = base
        }
-        
-        public def boolean requiresTypeAnalysis()
+        def boolean requiresTypeAnalysis()
-        public def CharSequence generateRefineObjectQueries(LogicProblem p, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult)
-        public def CharSequence generateRefineTypeQueries(LogicProblem p, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult)
+        def CharSequence generateRefineObjectQueries(LogicProblem p, PartialInterpretation emptySolution,
-        public def Map<? extends Type, String> getRefineTypeQueryNames(LogicProblem p, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult)
+                TypeAnalysisResult typeAnalysisResult)
-        
-        public def getRefineObjectQueryNames(LogicProblem p, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult) {
+        def CharSequence generateRefineTypeQueries(LogicProblem p, PartialInterpretation emptySolution,
-                val Map<ObjectCreationPrecondition,String> objectCreationQueries = new LinkedHashMap
+                TypeAnalysisResult typeAnalysisResult)
+        def Map<? extends Type, String> getRefineTypeQueryNames(LogicProblem p, PartialInterpretation emptySolution,
+                TypeAnalysisResult typeAnalysisResult)
+        def getRefineObjectQueryNames(LogicProblem p, PartialInterpretation emptySolution,
+                TypeAnalysisResult typeAnalysisResult) {
+                val Map<ObjectCreationPrecondition, String> objectCreationQueries = new LinkedHashMap
                val containment = p.containmentHierarchies.head
                val inverseRelations = new HashMap
-                p.annotations.filter(InverseRelationAssertion).forEach[
+                p.annotations.filter(InverseRelationAssertion).forEach [
-                        inverseRelations.put(it.inverseA,it.inverseB)
+                        inverseRelations.put(it.inverseA, it.inverseB)
-                        inverseRelations.put(it.inverseB,it.inverseA)
+                        inverseRelations.put(it.inverseB, it.inverseA)
                ]
-                for(type: p.types.filter(TypeDeclaration).filter[!it.isAbstract]) {
+                for (type : p.types.filter(TypeDeclaration).filter[!it.isAbstract]) {
-                        if(containment.typeInContainment(type)) {
+                        if (containment.typeInContainment(type)) {
-                                for(containmentRelation : containment.containmentRelations.filter[canBeContainedByRelation(it,type)]) {
+                                for (containmentRelation : containment.containmentRelations.
-                                        if(inverseRelations.containsKey(containmentRelation)) {
+                                        filter[canBeContainedByRelation(it, type)]) {
+                                        if (inverseRelations.containsKey(containmentRelation)) {
                                                objectCreationQueries.put(
-                                                        new ObjectCreationPrecondition(containmentRelation,inverseRelations.get(containmentRelation),type),
+                                                        new ObjectCreationPrecondition(containmentRelation,
-                                                        this.patternName(containmentRelation,inverseRelations.get(containmentRelation),type))
+                                                                inverseRelations.get(containmentRelation), type),
+                                                        this.patternName(containmentRelation, inverseRelations.get(containmentRelation), type))
                                        } else {
-                                                objectCreationQueries.put(
+                                                objectCreationQueries.put(new ObjectCreationPrecondition(containmentRelation, null, type),
-                                                        new ObjectCreationPrecondition(containmentRelation,null,type),
+                                                        patternName(containmentRelation, null, type))
-                                                        patternName(containmentRelation,null,type))
                                        }
                                }
-                                objectCreationQueries.put(
+                                objectCreationQueries.put(new ObjectCreationPrecondition(null, null, type),
-                                        new ObjectCreationPrecondition(null,null,type),
+                                        patternName(null, null, type))
-                                        patternName(null,null,type))
                        } else {
-                                objectCreationQueries.put(
+                                objectCreationQueries.put(new ObjectCreationPrecondition(null, null, type),
-                                        new ObjectCreationPrecondition(null,null,type),
+                                        this.patternName(null, null, type))
-                                        this.patternName(null,null,type))
                        }
                }
                return objectCreationQueries
        }
-        
        protected def canBeContainedByRelation(Relation r, Type t) {
-                if(r.parameters.size==2) {
+                if (r.parameters.size == 2) {
                        val param = r.parameters.get(1)
-                        if(param instanceof ComplexTypeReference) {
+                        if (param instanceof ComplexTypeReference) {
                                val allSuperTypes = t.transitiveClosureStar[it.supertypes]
-                                for(superType : allSuperTypes) {
+                                for (superType : allSuperTypes) {
                                        if(param.referred == superType) return true
                                }
                        }
                }
                return false
        }
-        
        private def typeInContainment(ContainmentHierarchy hierarchy, Type type) {
                val allSuperTypes = type.transitiveClosureStar[it.supertypes]
                return allSuperTypes.exists[hierarchy.typesOrderedInHierarchy.contains(it)]
        }
-        
        protected def String patternName(Relation containmentRelation, Relation inverseContainment, Type newType) {
-                if(containmentRelation != null) {
+                if (containmentRelation !== null) {
-                        if(inverseContainment != null) {
+                        if (inverseContainment !== null) {
                                '''createObject_«base.canonizeName(newType.name)»_by_«base.canonizeName(containmentRelation.name)»_with_«base.canonizeName(inverseContainment.name)»'''
                        } else {
                                '''createObject_«base.canonizeName(newType.name)»_by_«base.canonizeName(containmentRelation.name)»'''
@@ -96,4 +103,8 @@ abstract class TypeRefinementGenerator {
                        '''createObject_«base.canonizeName(newType.name)»'''
                }
        }
-}
-\ No newline at end of file
+        def hasElementInContainmentName() {
+                "hasElementInContainment"
+        }
+}

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeRefinementGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeRefinementGenerator.xtend index 7e3fad91..4ef336ae 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeRefinementGenerator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeRefinementGenerator.xtend
@@ -25,69 +25,76 @@ class ObjectCreationPrecondition {
25		25
26	abstract class TypeRefinementGenerator {	26	abstract class TypeRefinementGenerator {
27	val protected PatternGenerator base;	27	val protected PatternGenerator base;
28	public new(PatternGenerator base) {	28
		29	new(PatternGenerator base) {
29	this.base = base	30	this.base = base
30	}	31	}
31		32
32	public def boolean requiresTypeAnalysis()	33	def boolean requiresTypeAnalysis()
33	public def CharSequence generateRefineObjectQueries(LogicProblem p, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult)	34
34	public def CharSequence generateRefineTypeQueries(LogicProblem p, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult)	35	def CharSequence generateRefineObjectQueries(LogicProblem p, PartialInterpretation emptySolution,
35	public def Map<? extends Type, String> getRefineTypeQueryNames(LogicProblem p, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult)	36	TypeAnalysisResult typeAnalysisResult)
36		37
37	public def getRefineObjectQueryNames(LogicProblem p, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult) {	38	def CharSequence generateRefineTypeQueries(LogicProblem p, PartialInterpretation emptySolution,
38	val Map<ObjectCreationPrecondition,String> objectCreationQueries = new LinkedHashMap	39	TypeAnalysisResult typeAnalysisResult)
		40
		41	def Map<? extends Type, String> getRefineTypeQueryNames(LogicProblem p, PartialInterpretation emptySolution,
		42	TypeAnalysisResult typeAnalysisResult)
		43
		44	def getRefineObjectQueryNames(LogicProblem p, PartialInterpretation emptySolution,
		45	TypeAnalysisResult typeAnalysisResult) {
		46	val Map<ObjectCreationPrecondition, String> objectCreationQueries = new LinkedHashMap
39	val containment = p.containmentHierarchies.head	47	val containment = p.containmentHierarchies.head
40	val inverseRelations = new HashMap	48	val inverseRelations = new HashMap
41	p.annotations.filter(InverseRelationAssertion).forEach[	49	p.annotations.filter(InverseRelationAssertion).forEach [
42	inverseRelations.put(it.inverseA,it.inverseB)	50	inverseRelations.put(it.inverseA, it.inverseB)
43	inverseRelations.put(it.inverseB,it.inverseA)	51	inverseRelations.put(it.inverseB, it.inverseA)
44	]	52	]
45	for(type: p.types.filter(TypeDeclaration).filter[!it.isAbstract]) {	53	for (type : p.types.filter(TypeDeclaration).filter[!it.isAbstract]) {
46	if(containment.typeInContainment(type)) {	54	if (containment.typeInContainment(type)) {
47	for(containmentRelation : containment.containmentRelations.filter[canBeContainedByRelation(it,type)]) {	55	for (containmentRelation : containment.containmentRelations.
48	if(inverseRelations.containsKey(containmentRelation)) {	56	filter[canBeContainedByRelation(it, type)]) {
		57	if (inverseRelations.containsKey(containmentRelation)) {
49	objectCreationQueries.put(	58	objectCreationQueries.put(
50	new ObjectCreationPrecondition(containmentRelation,inverseRelations.get(containmentRelation),type),	59	new ObjectCreationPrecondition(containmentRelation,
51	this.patternName(containmentRelation,inverseRelations.get(containmentRelation),type))	60	inverseRelations.get(containmentRelation), type),
		61	this.patternName(containmentRelation, inverseRelations.get(containmentRelation), type))
52	} else {	62	} else {
53	objectCreationQueries.put(	63	objectCreationQueries.put(new ObjectCreationPrecondition(containmentRelation, null, type),
54	new ObjectCreationPrecondition(containmentRelation,null,type),	64	patternName(containmentRelation, null, type))
55	patternName(containmentRelation,null,type))
56	}	65	}
57	}	66	}
58	objectCreationQueries.put(	67	objectCreationQueries.put(new ObjectCreationPrecondition(null, null, type),
59	new ObjectCreationPrecondition(null,null,type),	68	patternName(null, null, type))
60	patternName(null,null,type))
61	} else {	69	} else {
62	objectCreationQueries.put(	70	objectCreationQueries.put(new ObjectCreationPrecondition(null, null, type),
63	new ObjectCreationPrecondition(null,null,type),	71	this.patternName(null, null, type))
64	this.patternName(null,null,type))
65	}	72	}
66	}	73	}
67	return objectCreationQueries	74	return objectCreationQueries
68	}	75	}
69		76
70	protected def canBeContainedByRelation(Relation r, Type t) {	77	protected def canBeContainedByRelation(Relation r, Type t) {
71	if(r.parameters.size==2) {	78	if (r.parameters.size == 2) {
72	val param = r.parameters.get(1)	79	val param = r.parameters.get(1)
73	if(param instanceof ComplexTypeReference) {	80	if (param instanceof ComplexTypeReference) {
74	val allSuperTypes = t.transitiveClosureStar[it.supertypes]	81	val allSuperTypes = t.transitiveClosureStar[it.supertypes]
75	for(superType : allSuperTypes) {	82	for (superType : allSuperTypes) {
76	if(param.referred == superType) return true	83	if(param.referred == superType) return true
77	}	84	}
78	}	85	}
79	}	86	}
80	return false	87	return false
81	}	88	}
82		89
83	private def typeInContainment(ContainmentHierarchy hierarchy, Type type) {	90	private def typeInContainment(ContainmentHierarchy hierarchy, Type type) {
84	val allSuperTypes = type.transitiveClosureStar[it.supertypes]	91	val allSuperTypes = type.transitiveClosureStar[it.supertypes]
85	return allSuperTypes.exists[hierarchy.typesOrderedInHierarchy.contains(it)]	92	return allSuperTypes.exists[hierarchy.typesOrderedInHierarchy.contains(it)]
86	}	93	}
87		94
88	protected def String patternName(Relation containmentRelation, Relation inverseContainment, Type newType) {	95	protected def String patternName(Relation containmentRelation, Relation inverseContainment, Type newType) {
89	if(containmentRelation != null) {	96	if (containmentRelation !== null) {
90	if(inverseContainment != null) {	97	if (inverseContainment !== null) {
91	'''createObject_«base.canonizeName(newType.name)»_by_«base.canonizeName(containmentRelation.name)»_with_«base.canonizeName(inverseContainment.name)»'''	98	'''createObject_«base.canonizeName(newType.name)»_by_«base.canonizeName(containmentRelation.name)»_with_«base.canonizeName(inverseContainment.name)»'''
92	} else {	99	} else {
93	'''createObject_«base.canonizeName(newType.name)»_by_«base.canonizeName(containmentRelation.name)»'''	100	'''createObject_«base.canonizeName(newType.name)»_by_«base.canonizeName(containmentRelation.name)»'''
@@ -96,4 +103,8 @@ abstract class TypeRefinementGenerator {
96	'''createObject_«base.canonizeName(newType.name)»'''	103	'''createObject_«base.canonizeName(newType.name)»'''
97	}	104	}
98	}	105	}
99	} \ No newline at end of file	106
		107	def hasElementInContainmentName() {
		108	"hasElementInContainment"
		109	}
		110	}