1 files changed, 48 insertions, 54 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
index f9e9baea..fa73c861 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
@@ -9,77 +9,71 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ComplexTypeReference
 class RelationRefinementGenerator {
        PatternGenerator base;
        public new(PatternGenerator base) {
                this.base = base
        }
-        
-        def CharSequence generateRefineReference(LogicProblem p) {
+        def CharSequence generateRefineReference(LogicProblem p) '''
-                return '''
+                «FOR relationRefinement : this.getRelationRefinements(p)»
-                «FOR relationRefinement: this.getRelationRefinements(p)»
+                        pattern «relationRefinementQueryName(relationRefinement.key,relationRefinement.value)»(
-                pattern «relationRefinementQueryName(relationRefinement.key,relationRefinement.value)»(
+                                problem:LogicProblem, interpretation:PartialInterpretation,
-                        problem:LogicProblem, interpretation:PartialInterpretation,
+                                relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value !== null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,
-                        relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value != null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,
+                                from: DefinedElement, to: DefinedElement)
-                        from: DefinedElement, to: DefinedElement)
+                        {
-                {
+                                find interpretation(problem,interpretation);
-                        find interpretation(problem,interpretation);
+                                PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-                        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
+                                PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"«relationRefinement.key.name»");
-                        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"«relationRefinement.key.name»");
+                                «IF relationRefinement.value !== null»
-                        «IF relationRefinement.value != null»
+                                        PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);
-                                PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);
+                                        PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"«relationRefinement.value.name»");
-                                PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"«relationRefinement.value.name»");
+                                «ENDIF»
-                        «ENDIF»
+                                find mustExist(problem, interpretation, from);
-                        find mustExist(problem, interpretation, from);
+                                find mustExist(problem, interpretation, to);
-                        find mustExist(problem, interpretation, to);
+                                «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(0), Modality::MUST,"from")»
-                        «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(0), Modality::MUST,"from")»
+                                «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(1), Modality::MUST,"to")»
-                        «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(1), Modality::MUST,"to")»
+                                «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MAY)»
-                        «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MAY)»
+                                neg «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MUST)»
-                        neg «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MUST)»
+                        }
-                }
                «ENDFOR»
-                '''
+        '''
-        }
-        
        def String relationRefinementQueryName(RelationDeclaration relation, Relation inverseRelation) {
-                '''«IF inverseRelation != null
+                '''«IF inverseRelation !== null»refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelation.name)»«ELSE»refineRelation_«base.canonizeName(relation.name)»«ENDIF»'''
-                »refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelation.name)»«
-                        ELSE
-                »refineRelation_«base.canonizeName(relation.name)»«ENDIF»'''
        }
-        
        def referRefinementQuery(RelationDeclaration relation, Relation inverseRelation, String relInterpretationName,
-                String inverseInterpretationName, String sourceName, String targetName)
+                String inverseInterpretationName, String sourceName,
-        '''find «this.relationRefinementQueryName(relation,inverseRelation)»(problem, interpretation, «relInterpretationName», «IF inverseRelation != null»inverseInterpretationName, «ENDIF»«sourceName», «targetName»);'''
+                String targetName) '''find «this.relationRefinementQueryName(relation,inverseRelation)»(problem, interpretation, «relInterpretationName», «IF inverseRelation !== null»inverseInterpretationName, «ENDIF»«sourceName», «targetName»);'''
-        
        def getRefineRelationQueries(LogicProblem p) {
 //              val containmentRelations = p.containmentHierarchies.map[containmentRelations].flatten.toSet
 //              p.relations.filter(RelationDeclaration).filter[!containmentRelations.contains(it)].toInvertedMap['''refineRelation_«base.canonizeName(it.name)»''']
                /*
-                val res = new LinkedHashMap
+                 * val res = new LinkedHashMap
-                for(relation: getRelationRefinements(p)) {
+                 * for(relation: getRelationRefinements(p)) {
-                        if(inverseRelations.containsKey(relation)) {
+                 *      if(inverseRelations.containsKey(relation)) {
-                                val name = '''refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelations.get(relation).name)»'''
+                 *              val name = '''refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelations.get(relation).name)»'''
-                                res.put(relation -> inverseRelations.get(relation),name)
+                 *              res.put(relation -> inverseRelations.get(relation),name)
-                        } else {
+                 *      } else {
-                                val name = '''refineRelation_«base.canonizeName(relation.name)»'''
+                 *              val name = '''refineRelation_«base.canonizeName(relation.name)»'''
-                                res.put(relation -> null,name)
+                 *              res.put(relation -> null,name)
-                        }
+                 *      }
-                }
+                 * }
-                return res*/
+                 return res*/
-                
+                getRelationRefinements(p).toInvertedMap[relationRefinementQueryName(it.key, it.value)]
-                getRelationRefinements(p).toInvertedMap[relationRefinementQueryName(it.key,it.value)]
        }
-        
        def getRelationRefinements(LogicProblem p) {
                val inverses = base.getInverseRelations(p)
                val containments = base.getContainments(p)
                val list = new LinkedList
-                for(relation : p.relations.filter(RelationDeclaration)) {
+                for (relation : p.relations.filter(RelationDeclaration)) {
-                        if(!containments.contains(relation)) {
+                        if (!containments.contains(relation)) {
-                                if(inverses.containsKey(relation)) {
+                                if (inverses.containsKey(relation)) {
                                        val inverse = inverses.get(relation)
-                                        if(!containments.contains(inverse)) {
+                                        if (!containments.contains(inverse)) {
-                                                if(base.isRepresentative(relation,inverse)) {
+                                                if (base.isRepresentative(relation, inverse)) {
                                                        list += (relation -> inverse)
                                                }
                                        }
@@ -90,4 +84,4 @@ class RelationRefinementGenerator {
                }
                return list
        }
-}
-\ No newline at end of file
+}

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend index f9e9baea..fa73c861 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
@@ -9,77 +9,71 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ComplexTypeReference
9		9
10	class RelationRefinementGenerator {	10	class RelationRefinementGenerator {
11	PatternGenerator base;	11	PatternGenerator base;
		12
12	public new(PatternGenerator base) {	13	public new(PatternGenerator base) {
13	this.base = base	14	this.base = base
14	}	15	}
15		16
16	def CharSequence generateRefineReference(LogicProblem p) {	17	def CharSequence generateRefineReference(LogicProblem p) '''
17	return '''	18	«FOR relationRefinement : this.getRelationRefinements(p)»
18	«FOR relationRefinement: this.getRelationRefinements(p)»	19	pattern «relationRefinementQueryName(relationRefinement.key,relationRefinement.value)»(
19	pattern «relationRefinementQueryName(relationRefinement.key,relationRefinement.value)»(	20	problem:LogicProblem, interpretation:PartialInterpretation,
20	problem:LogicProblem, interpretation:PartialInterpretation,	21	relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value !== null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,
21	relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value != null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,	22	from: DefinedElement, to: DefinedElement)
22	from: DefinedElement, to: DefinedElement)	23	{
23	{	24	find interpretation(problem,interpretation);
24	find interpretation(problem,interpretation);	25	PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
25	PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);	26	PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"«relationRefinement.key.name»");
26	PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"«relationRefinement.key.name»");	27	«IF relationRefinement.value !== null»
27	«IF relationRefinement.value != null»	28	PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);
28	PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);	29	PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"«relationRefinement.value.name»");
29	PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"«relationRefinement.value.name»");	30	«ENDIF»
30	«ENDIF»	31	find mustExist(problem, interpretation, from);
31	find mustExist(problem, interpretation, from);	32	find mustExist(problem, interpretation, to);
32	find mustExist(problem, interpretation, to);	33	«base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(0), Modality::MUST,"from")»
33	«base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(0), Modality::MUST,"from")»	34	«base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(1), Modality::MUST,"to")»
34	«base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(1), Modality::MUST,"to")»	35	«base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MAY)»
35	«base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MAY)»	36	neg «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MUST)»
36	neg «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MUST)»	37	}
37	}
38	«ENDFOR»	38	«ENDFOR»
39	'''	39	'''
40	}	40
41
42	def String relationRefinementQueryName(RelationDeclaration relation, Relation inverseRelation) {	41	def String relationRefinementQueryName(RelationDeclaration relation, Relation inverseRelation) {
43	'''«IF inverseRelation != null	42	'''«IF inverseRelation !== null»refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelation.name)»«ELSE»refineRelation_«base.canonizeName(relation.name)»«ENDIF»'''
44	»refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelation.name)»«
45	ELSE
46	»refineRelation_«base.canonizeName(relation.name)»«ENDIF»'''
47	}	43	}
48		44
49	def referRefinementQuery(RelationDeclaration relation, Relation inverseRelation, String relInterpretationName,	45	def referRefinementQuery(RelationDeclaration relation, Relation inverseRelation, String relInterpretationName,
50	String inverseInterpretationName, String sourceName, String targetName)	46	String inverseInterpretationName, String sourceName,
51	'''find «this.relationRefinementQueryName(relation,inverseRelation)»(problem, interpretation, «relInterpretationName», «IF inverseRelation != null»inverseInterpretationName, «ENDIF»«sourceName», «targetName»);'''	47	String targetName) '''find «this.relationRefinementQueryName(relation,inverseRelation)»(problem, interpretation, «relInterpretationName», «IF inverseRelation !== null»inverseInterpretationName, «ENDIF»«sourceName», «targetName»);'''
52		48
53	def getRefineRelationQueries(LogicProblem p) {	49	def getRefineRelationQueries(LogicProblem p) {
54	// val containmentRelations = p.containmentHierarchies.map[containmentRelations].flatten.toSet	50	// val containmentRelations = p.containmentHierarchies.map[containmentRelations].flatten.toSet
55	// p.relations.filter(RelationDeclaration).filter[!containmentRelations.contains(it)].toInvertedMap['''refineRelation_«base.canonizeName(it.name)»''']	51	// p.relations.filter(RelationDeclaration).filter[!containmentRelations.contains(it)].toInvertedMap['''refineRelation_«base.canonizeName(it.name)»''']
56	/*	52	/*
57	val res = new LinkedHashMap	53	* val res = new LinkedHashMap
58	for(relation: getRelationRefinements(p)) {	54	* for(relation: getRelationRefinements(p)) {
59	if(inverseRelations.containsKey(relation)) {	55	* if(inverseRelations.containsKey(relation)) {
60	val name = '''refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelations.get(relation).name)»'''	56	* val name = '''refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelations.get(relation).name)»'''
61	res.put(relation -> inverseRelations.get(relation),name)	57	* res.put(relation -> inverseRelations.get(relation),name)
62	} else {	58	* } else {
63	val name = '''refineRelation_«base.canonizeName(relation.name)»'''	59	* val name = '''refineRelation_«base.canonizeName(relation.name)»'''
64	res.put(relation -> null,name)	60	* res.put(relation -> null,name)
65	}	61	* }
66	}	62	* }
67	return res*/	63	return res*/
68		64	getRelationRefinements(p).toInvertedMap[relationRefinementQueryName(it.key, it.value)]
69	getRelationRefinements(p).toInvertedMap[relationRefinementQueryName(it.key,it.value)]
70	}	65	}
71
72		66
73	def getRelationRefinements(LogicProblem p) {	67	def getRelationRefinements(LogicProblem p) {
74	val inverses = base.getInverseRelations(p)	68	val inverses = base.getInverseRelations(p)
75	val containments = base.getContainments(p)	69	val containments = base.getContainments(p)
76	val list = new LinkedList	70	val list = new LinkedList
77	for(relation : p.relations.filter(RelationDeclaration)) {	71	for (relation : p.relations.filter(RelationDeclaration)) {
78	if(!containments.contains(relation)) {	72	if (!containments.contains(relation)) {
79	if(inverses.containsKey(relation)) {	73	if (inverses.containsKey(relation)) {
80	val inverse = inverses.get(relation)	74	val inverse = inverses.get(relation)
81	if(!containments.contains(inverse)) {	75	if (!containments.contains(inverse)) {
82	if(base.isRepresentative(relation,inverse)) {	76	if (base.isRepresentative(relation, inverse)) {
83	list += (relation -> inverse)	77	list += (relation -> inverse)
84	}	78	}
85	}	79	}
@@ -90,4 +84,4 @@ class RelationRefinementGenerator {
90	}	84	}
91	return list	85	return list
92	}	86	}
93	} \ No newline at end of file	87	}