1 files changed, 3 insertions, 3 deletions
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend
index 397fb84b..3379ba20 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend
@@ -123,8 +123,8 @@ class Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes implements Logic2AlloyL
                // 7. Each type is in the intersection of the supertypes
                for(type : types.filter[it.supertypes.size>=2]) {
                        trace.specification.factDeclarations += createALSFactDeclaration => [
-                                it.name = support.toIDMultiple("abstract",type.name)
+                                it.name = support.toIDMultiple("supertypeIsInIntersection",type.name)
-                                it.term = createALSEquals => [
+                                it.term = createALSSubset => [
                                        it.leftOperand = createALSReference => [ it.referred = type.lookup(typeTrace.type2ALSType) ]
                                        it.rightOperand = support.unfoldIntersection(type.supertypes.map[e|
                                                createALSReference => [it.referred = e.lookup(typeTrace.type2ALSType)]])
@@ -135,7 +135,7 @@ class Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes implements Logic2AlloyL
                // 8. Each abstract type is equal to the union of the subtypes
                for(type : types.filter[isIsAbstract]) {
                        trace.specification.factDeclarations += createALSFactDeclaration => [
-                                it.name = support.toIDMultiple("abstract",type.name)
+                                it.name = support.toIDMultiple("abstractIsUnion",type.name)
                                it.term = createALSEquals => [
                                        it.leftOperand = createALSReference => [ it.referred = type.lookup(typeTrace.type2ALSType) ]
                                        it.rightOperand = support.unfoldPlus(type.subtypes.map[e|

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend index 397fb84b..3379ba20 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend
@@ -123,8 +123,8 @@ class Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes implements Logic2AlloyL
123	// 7. Each type is in the intersection of the supertypes	123	// 7. Each type is in the intersection of the supertypes
124	for(type : types.filter[it.supertypes.size>=2]) {	124	for(type : types.filter[it.supertypes.size>=2]) {
125	trace.specification.factDeclarations += createALSFactDeclaration => [	125	trace.specification.factDeclarations += createALSFactDeclaration => [
126	it.name = support.toIDMultiple("abstract",type.name)	126	it.name = support.toIDMultiple("supertypeIsInIntersection",type.name)
127	it.term = createALSEquals => [	127	it.term = createALSSubset => [
128	it.leftOperand = createALSReference => [ it.referred = type.lookup(typeTrace.type2ALSType) ]	128	it.leftOperand = createALSReference => [ it.referred = type.lookup(typeTrace.type2ALSType) ]
129	it.rightOperand = support.unfoldIntersection(type.supertypes.map[e\|	129	it.rightOperand = support.unfoldIntersection(type.supertypes.map[e\|
130	createALSReference => [it.referred = e.lookup(typeTrace.type2ALSType)]])	130	createALSReference => [it.referred = e.lookup(typeTrace.type2ALSType)]])
@@ -135,7 +135,7 @@ class Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes implements Logic2AlloyL
135	// 8. Each abstract type is equal to the union of the subtypes	135	// 8. Each abstract type is equal to the union of the subtypes
136	for(type : types.filter[isIsAbstract]) {	136	for(type : types.filter[isIsAbstract]) {
137	trace.specification.factDeclarations += createALSFactDeclaration => [	137	trace.specification.factDeclarations += createALSFactDeclaration => [
138	it.name = support.toIDMultiple("abstract",type.name)	138	it.name = support.toIDMultiple("abstractIsUnion",type.name)
139	it.term = createALSEquals => [	139	it.term = createALSEquals => [
140	it.leftOperand = createALSReference => [ it.referred = type.lookup(typeTrace.type2ALSType) ]	140	it.leftOperand = createALSReference => [ it.referred = type.lookup(typeTrace.type2ALSType) ]
141	it.rightOperand = support.unfoldPlus(type.subtypes.map[e\|	141	it.rightOperand = support.unfoldPlus(type.subtypes.map[e\|