From 21ebd1b18fc450a9fe84bef0af2f85396d05bea9 Mon Sep 17 00:00:00 2001
From: Oszkar Semerath <semerath@mit.bme.hu>
Date: Mon, 11 May 2020 00:17:10 +0200
Subject: automated containment and attribute addition for subclasses

---
 .../rules/RefinementRuleProvider.xtend             | 65 ++++++++++++----------
 1 file changed, 37 insertions(+), 28 deletions(-)

(limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra')

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
index db0e17b9..f2efc87a 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
@@ -176,6 +176,10 @@ class RefinementRuleProvider {
 				val number = lowermultiplicities.head.lower
 				if(number > 0) {
 					val sourceTypeInterpretation = getTypeInterpretation(i, relation, 0) as PartialComplexTypeInterpretation
+					val subtypeInterpretations = i.partialtypeinterpratation.filter(PartialComplexTypeInterpretation).filter[
+						it === sourceTypeInterpretation ||
+						it.supertypeInterpretation.contains(sourceTypeInterpretation)
+					]
 					
 					if(containmentReferences.contains(relation)) {
 						val targetTypeInterpretation = getTypeInterpretation(i, relation, 1)
@@ -188,41 +192,46 @@ class RefinementRuleProvider {
 									inverseAnnotation.head.inverseA
 								}
 								val inverseRelationInterpretation = i.partialrelationinterpretation.filter[it.interpretationOf === onlyInverseAnnotation].head
-								for(var times=0; times<number; times++) {
-									recursiveObjectCreation.get(sourceTypeInterpretation.interpretationOf) += 
-										new ObjectCreationInterpretationData(
-											i,
-											targetTypeInterpretation,
-											relationInterpretation,
-											inverseRelationInterpretation,
-											targetTypeInterpretation.getTypeConstructor
-										)
+								for(subTypeInterpretation : subtypeInterpretations) {
+									for(var times=0; times<number; times++) {
+										recursiveObjectCreation.get(subTypeInterpretation.interpretationOf) += 
+											new ObjectCreationInterpretationData(
+												i,
+												targetTypeInterpretation,
+												relationInterpretation,
+												inverseRelationInterpretation,
+												targetTypeInterpretation.getTypeConstructor
+											)
+									}
 								}
-								
 							} else {
-								for(var times=0; times<number; times++) {
-									recursiveObjectCreation.get(sourceTypeInterpretation.interpretationOf) += 
-										new ObjectCreationInterpretationData(
-											i,
-											targetTypeInterpretation,
-											relationInterpretation,
-											null,
-											targetTypeInterpretation.getTypeConstructor
-										)
+								for(subTypeInterpretation : subtypeInterpretations) {
+									for(var times=0; times<number; times++) {
+										recursiveObjectCreation.get(subTypeInterpretation.interpretationOf) += 
+											new ObjectCreationInterpretationData(
+												i,
+												targetTypeInterpretation,
+												relationInterpretation,
+												null,
+												targetTypeInterpretation.getTypeConstructor
+											)
+									}
 								}
 							}
 						}
 					} else if(relation.parameters.get(1) instanceof PrimitiveTypeReference) {
 						val targetTypeInterpretation = getTypeInterpretation(i, relation, 1)
-						for(var times=0; times<number; times++) {
-							recursiveObjectCreation.get(sourceTypeInterpretation.interpretationOf) += 
-								new ObjectCreationInterpretationData(
-									i,
-									targetTypeInterpretation,
-									relationInterpretation,
-									null,
-									targetTypeInterpretation.getTypeConstructor
-								)
+						for(subTypeInterpretation : subtypeInterpretations) {
+							for(var times=0; times<number; times++) {
+								recursiveObjectCreation.get(subTypeInterpretation.interpretationOf) += 
+									new ObjectCreationInterpretationData(
+										i,
+										targetTypeInterpretation,
+										relationInterpretation,
+										null,
+										targetTypeInterpretation.getTypeConstructor
+									)
+							}
 						}
 					}
 				}
-- 
cgit v1.2.3-54-g00ecf