VAMPIRE: close #22, improve test structure for #39, .vql file trouble

68 files changed, 728 insertions, 2085 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
index d6392a0b..9edfdac5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
index c97efa0f..0979473a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
index 9ace526f..8069f168 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
@@ -3,6 +3,35 @@
     <!-- @generated yakindu_simplified -->

     <package class="hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage" genModel="model/yakindu_simplified.genmodel" uri="hu.bme.mit.inf.yakindumm"/>

   </extension>

+  <extension id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns" point="org.eclipse.viatra.query.runtime.queryspecification">

+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns" id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns">

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.entryInRegion"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.noEntryInRegion"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.multipleEntryInRegion"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.transition"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.incomingToEntry"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.noOutgoingTransitionFromEntry"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.multipleTransitionFromEntry"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.outgoingFromExit"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.outgoingFromFinal"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.noStateInRegion"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.StateInRegion"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.choiceHasNoOutgoing"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.choiceHasNoIncoming"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.synchHasNoOutgoing"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.synchHasNoIncoming"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.SynchronizedIncomingInSameRegion"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.notSynchronizingStates"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.hasMultipleOutgoingTrainsition"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.hasMultipleIncomingTrainsition"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.SynchronizedRegionsAreNotSiblings"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.child"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.SynchronizedRegionDoesNotHaveMultipleRegions"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.hasMultipleRegions"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.synchThree"/>

+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.twoSynch"/>

+    </group>

+  </extension>

   <extension id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated" point="org.eclipse.viatra.query.runtime.queryspecification">

     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated" id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated">

       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M0"/>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
index 024dcab9..10495630 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
index 7e128ad1..295d9ec2 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
index 0bf8ccc6..83b00f77 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
index 58a18bbb..f8a7a2f3 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
index 205afcc4..544f5811 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
index b388bd43..62aac4ca 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
index 3092be97..31d4543e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
index 8b23f34d..7b230b65 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
index 84682c47..a24c2795 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
index e3f67a0c..b35605ae 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
index bf354098..5e9cd3bd 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
index da62f4c1..0001d80f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
index 482b884e..b189414a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
index 81c1f803..b4eec95c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend
index 395b4305..8e0e0b11 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend
@@ -39,7 +39,15 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
                 for (l : relationsList) {

                         var pointingTo = (l.parameters.get(1) as ComplexTypeReference).referred as Type

                         containmentListCopy.remove(pointingTo)

-                        for (c : pointingTo.subtypes) {

+                        var List<Type> allSubtypes = newArrayList

+                        support.listSubtypes(pointingTo, allSubtypes)

+                        for (c : allSubtypes) {

+                                containmentListCopy.remove(c)

+                        }

+                }

+                

+                for (c : containmentListCopy) {

+                        if(c.isIsAbstract) {

                                 containmentListCopy.remove(c)

                         }

                 }

@@ -135,7 +143,7 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
 // STEP 2 CONT'D

                 for (e : type2cont.entrySet) {

                         val relFormula = createVLSFofFormula => [

-                                it.name = support.toIDMultiple("containment", e.key.constant.toString)

+                                it.name = support.toIDMultiple("containment_contained", e.key.constant.toString)

                                 it.fofRole = "axiom"

 

                                 it.fofFormula = createVLSUniversalQuantifier => [

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.xtend
index 0ae06bc3..2dec281d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.xtend
@@ -44,9 +44,20 @@ class Logic2VampireLanguageMapper_RelationMapper {
 
                 }
 
+                //deciding name of relation
+                val nameArray = r.name.split(" ")
+                var relNameVar = ""
+                if (nameArray.length == 3) {
+                        relNameVar = support.toIDMultiple(nameArray.get(0), nameArray.get(2))
+                }
+                else {
+                        relNameVar = r.name
+                }
+                val relName = relNameVar
+                
                 val comply = createVLSFofFormula=> [
-                        val nameArray = r.name.split(" ")
-                        it.name = support.toIDMultiple("compliance", nameArray.get(0), nameArray.get(2))
+                        
+                        it.name = support.toIDMultiple("compliance", relName)
                         it.fofRole = "axiom"
                         it.fofFormula = createVLSUniversalQuantifier => [
                                 for (v : relVar2VLS) {
@@ -54,7 +65,7 @@ class Logic2VampireLanguageMapper_RelationMapper {
                                 }
                                 it.operand = createVLSImplies => [
                                         val rel = createVLSFunction => [
-                                                it.constant = support.toIDMultiple("r", nameArray.get(0), nameArray.get(2))
+                                                it.constant = support.toIDMultiple("r", relName)
                                                 for (v : relVar2VLS) {
                                                         it.terms += support.duplicate(v)
                                                 }
@@ -71,89 +82,89 @@ class Logic2VampireLanguageMapper_RelationMapper {
 
         def dispatch public void transformRelation(RelationDefinition reldef, Logic2VampireLanguageMapperTrace trace) {
 
-                // 1. store all variables in support wrt their name
-                // 1.1 if variable has type, creating list of type declarations
-//              val VLSVariable variable = createVLSVariable => [it.name = "A"]
-                val Map<Variable, VLSVariable> relationVar2VLS = new HashMap
-                val Map<Variable, VLSFunction> relationVar2TypeDecComply = new HashMap
-                val Map<Variable, VLSFunction> relationVar2TypeDecRes = new HashMap
-                val typedefs = new ArrayList<VLSTerm>
-
-                for (variable : reldef.variables) {
-                        val v = createVLSVariable => [
-                                it.name = support.toIDMultiple("V", variable.name)
-                        ]
-                        relationVar2VLS.put(variable, v)
-
-                        val varTypeComply = createVLSFunction => [
-                                it.constant = support.toIDMultiple("t", (variable.range as ComplexTypeReference).referred.name)
-                                it.terms += support.duplicate(v)
-                        ]
-                        relationVar2TypeDecComply.put(variable, varTypeComply)
-                        relationVar2TypeDecRes.put(variable, support.duplicate(varTypeComply))
-                }
-                val nameArray = reldef.name.split(" ")
-                val comply = createVLSFofFormula => [
-                        it.name = support.toIDMultiple("compliance", nameArray.get(nameArray.length - 2),
-                                nameArray.get(nameArray.length - 1))
-                        it.fofRole = "axiom"
-                        it.fofFormula = createVLSUniversalQuantifier => [
-                                for (variable : reldef.variables) {
-                                        it.variables += support.duplicate(variable.lookup(relationVar2VLS))
-
-                                }
-                                it.operand = createVLSImplies => [
-                                        it.left = createVLSFunction => [
-                                                it.constant = support.toIDMultiple("rel", reldef.name)
-                                                for (variable : reldef.variables) {
-                                                        val v = createVLSVariable => [
-                                                                it.name = variable.lookup(relationVar2VLS).name
-                                                        ]
-                                                        it.terms += v
-                                                }
-                                        ]
-                                        it.right = support.unfoldAnd(new ArrayList<VLSTerm>(relationVar2TypeDecComply.values))
-                                ]
-                        ]
-                ]
-
-                val res = createVLSFofFormula => [
-                        it.name = support.toIDMultiple("relation", nameArray.get(nameArray.length - 2),
-                                nameArray.get(nameArray.length - 1))
-                        it.fofRole = "axiom"
-                        it.fofFormula = createVLSUniversalQuantifier => [
-                                for (variable : reldef.variables) {
-                                        val v = createVLSVariable => [
-                                                it.name = variable.lookup(relationVar2VLS).name
-                                        ]
-                                        it.variables += v
-
-                                }
-                                it.operand = createVLSImplies => [
-                                        it.left = support.unfoldAnd(new ArrayList<VLSTerm>(relationVar2TypeDecRes.values))
-                                        it.right = createVLSEquivalent => [
-                                                it.left = createVLSFunction => [
-                                                        it.constant = support.toIDMultiple("rel", reldef.name)
-                                                        for (variable : reldef.variables) {
-                                                                val v = createVLSVariable => [
-                                                                        it.name = variable.lookup(relationVar2VLS).name
-                                                                ]
-                                                                it.terms += v
-
-                                                        }
-                                                ]
-                                                it.right = base.transformTerm(reldef.value, trace, relationVar2VLS)
-                                        ]
-
-                                ]
-
-                        ]
-
-                ]
-
-                // trace.relationDefinition2Predicate.put(r,res)
-                trace.specification.formulas += comply;
-                trace.specification.formulas += res;
+//              // 1. store all variables in support wrt their name
+//              // 1.1 if variable has type, creating list of type declarations
+////            val VLSVariable variable = createVLSVariable => [it.name = "A"]
+//              val Map<Variable, VLSVariable> relationVar2VLS = new HashMap
+//              val Map<Variable, VLSFunction> relationVar2TypeDecComply = new HashMap
+//              val Map<Variable, VLSFunction> relationVar2TypeDecRes = new HashMap
+//              val typedefs = new ArrayList<VLSTerm>
+//
+//              for (variable : reldef.variables) {
+//                      val v = createVLSVariable => [
+//                              it.name = support.toIDMultiple("V", variable.name)
+//                      ]
+//                      relationVar2VLS.put(variable, v)
+//
+//                      val varTypeComply = createVLSFunction => [
+//                              it.constant = support.toIDMultiple("t", (variable.range as ComplexTypeReference).referred.name)
+//                              it.terms += support.duplicate(v)
+//                      ]
+//                      relationVar2TypeDecComply.put(variable, varTypeComply)
+//                      relationVar2TypeDecRes.put(variable, support.duplicate(varTypeComply))
+//              }
+//              val nameArray = reldef.name.split(" ")
+//              val comply = createVLSFofFormula => [
+//                      it.name = support.toIDMultiple("compliance", nameArray.get(nameArray.length - 2),
+//                              nameArray.get(nameArray.length - 1))
+//                      it.fofRole = "axiom"
+//                      it.fofFormula = createVLSUniversalQuantifier => [
+//                              for (variable : reldef.variables) {
+//                                      it.variables += support.duplicate(variable.lookup(relationVar2VLS))
+//
+//                              }
+//                              it.operand = createVLSImplies => [
+//                                      it.left = createVLSFunction => [
+//                                              it.constant = support.toIDMultiple("rel", reldef.name)
+//                                              for (variable : reldef.variables) {
+//                                                      val v = createVLSVariable => [
+//                                                              it.name = variable.lookup(relationVar2VLS).name
+//                                                      ]
+//                                                      it.terms += v
+//                                              }
+//                                      ]
+//                                      it.right = support.unfoldAnd(new ArrayList<VLSTerm>(relationVar2TypeDecComply.values))
+//                              ]
+//                      ]
+//              ]
+//
+//              val res = createVLSFofFormula => [
+//                      it.name = support.toIDMultiple("relation", nameArray.get(nameArray.length - 2),
+//                              nameArray.get(nameArray.length - 1))
+//                      it.fofRole = "axiom"
+//                      it.fofFormula = createVLSUniversalQuantifier => [
+//                              for (variable : reldef.variables) {
+//                                      val v = createVLSVariable => [
+//                                              it.name = variable.lookup(relationVar2VLS).name
+//                                      ]
+//                                      it.variables += v
+//
+//                              }
+//                              it.operand = createVLSImplies => [
+//                                      it.left = support.unfoldAnd(new ArrayList<VLSTerm>(relationVar2TypeDecRes.values))
+//                                      it.right = createVLSEquivalent => [
+//                                              it.left = createVLSFunction => [
+//                                                      it.constant = support.toIDMultiple("rel", reldef.name)
+//                                                      for (variable : reldef.variables) {
+//                                                              val v = createVLSVariable => [
+//                                                                      it.name = variable.lookup(relationVar2VLS).name
+//                                                              ]
+//                                                              it.terms += v
+//
+//                                                      }
+//                                              ]
+//                                              it.right = base.transformTerm(reldef.value, trace, relationVar2VLS)
+//                                      ]
+//
+//                              ]
+//
+//                      ]
+//
+//              ]
+//
+//              // trace.relationDefinition2Predicate.put(r,res)
+//              trace.specification.formulas += comply;
+//              trace.specification.formulas += res;
 
         }
 
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
index 0a8812e4..4a8d2827 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
@@ -29,6 +29,7 @@ class Logic2VampireLanguageMapper_ScopeMapper {
 //              TODO HANDLE ERROR RELATED TO SUM(MIN TYPES)+1(for root) > MAX OBJECTS

 //              TODO HANDLE 

                 // 1. make a list of constants equaling the min number of specified objects

+                //These numbers do not include enums or initial model elements

                 val GLOBAL_MIN = config.typeScopes.minNewElements

                 val GLOBAL_MAX = config.typeScopes.maxNewElements

 

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
index 195b89bb..680213ab 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend
@@ -273,15 +273,11 @@ class Logic2VampireLanguageMapper_Support {
                 }
         }
 
-        def protected List<Type> listSubtypes(Type t) {
-                var List<Type> allSubtypes = newArrayList
-                if (!t.subtypes.isEmpty) {
-                        for (subt : t.subtypes) {
-                                allSubtypes.add(subt)
-                                allSubtypes = listSubtypes(subt)
-                        }
+        def protected void listSubtypes(Type t, List<Type> allSubtypes) {
+                for (subt : t.subtypes) {
+                        allSubtypes.add(subt)
+                        listSubtypes(subt, allSubtypes)
                 }
-                return allSubtypes
         }
 
         def protected withAddition(Map<Variable, VLSVariable> map1, Map<Variable, VLSVariable> map2) {
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
index 3bc945df..2f3af593 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
@@ -44,14 +44,19 @@ class Logic2VampireLanguageMapper_TypeMapper {
 
                         // Create a VLSFunction for each Enum Element
                         val List<VLSFunction> orElems = newArrayList
+
                         for (e : type.elements) {
+                                val nameArray = e.name.split(" ")
+                                var relNameVar = ""
+                                if (nameArray.length == 3) {
+                                        relNameVar = support.toIDMultiple(nameArray.get(0), nameArray.get(2))
+                                } else {
+                                        relNameVar = e.name
+                                }
+                                val relName = relNameVar
+                                
                                 val enumElemPred = createVLSFunction => [
-                                        val splitName = e.name.split(" ")
-                                        if (splitName.length > 2) {
-                                                it.constant = support.toIDMultiple("e", splitName.get(0), splitName.get(2))
-                                        } else {
-                                                it.constant = support.toIDMultiple("e", splitName.get(0))
-                                        }
+                                        it.constant = support.toIDMultiple("e", relName)
                                         it.terms += support.duplicate(variable)
                                 ]
                                 trace.element2Predicate.put(e, enumElemPred)
@@ -80,7 +85,7 @@ class Logic2VampireLanguageMapper_TypeMapper {
 
                         // Implement Enum Inheritence Hierarchy
                         val res = createVLSFofFormula => [
-                                it.name = support.toIDMultiple("typeDef", type.name.split(" ").get(0))
+                                it.name = support.toIDMultiple("typeDef", type.lookup(trace.type2Predicate).constant.toString)
                                 it.fofRole = "axiom"
                                 it.fofFormula = createVLSUniversalQuantifier => [
                                         it.variables += support.duplicate(variable)
@@ -105,9 +110,9 @@ class Logic2VampireLanguageMapper_TypeMapper {
                                 val cst = support.toConstant(cstTerm)
                                 trace.uniqueInstances.add(cst)
 
-                                val index = i
+                                val index = i-globalCounter
                                 val enumScope = createVLSFofFormula => [
-                                        it.name = support.toIDMultiple("enumScope", type.name.split(" ").get(0),
+                                        it.name = support.toIDMultiple("enumScope", type.lookup(trace.type2Predicate).constant.toString,
                                                 type.elements.get(index).name.split(" ").get(0))
                                         it.fofRole = "axiom"
                                         it.fofFormula = createVLSUniversalQuantifier => [
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
index 43e1e477..1ea7e30a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
index 4e6f6ca0..ee06cb39 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
index 707a6089..648d9600 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
index 3171324f..a02821a5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
index 301df7fa..b01f92a6 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
index 5e53ea26..7634af4b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
index b378ed09..4906adfc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
index 605ac88c..e2c945e3 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
index 0c289e29..f465506c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
index cb72fd90..e046604a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
index cfe1e8cd..aff62dca 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
index c2079147..7212cce7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
index 3c70bc14..d23bacad 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
index 9ef20b23..be78cace 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
index 4cdc7e6a..9deab87f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
@@ -64,12 +64,19 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
         Type _referred = ((ComplexTypeReference) _get).getReferred();

         Type pointingTo = ((Type) _referred);

         containmentListCopy.remove(pointingTo);

-        EList<Type> _subtypes = pointingTo.getSubtypes();

-        for (final Type c : _subtypes) {

+        List<Type> allSubtypes = CollectionLiterals.<Type>newArrayList();

+        this.support.listSubtypes(pointingTo, allSubtypes);

+        for (final Type c : allSubtypes) {

           containmentListCopy.remove(c);

         }

       }

     }

+    for (final Type c : containmentListCopy) {

+      boolean _isIsAbstract = c.isIsAbstract();

+      if (_isIsAbstract) {

+        containmentListCopy.remove(c);

+      }

+    }

     final String topName = CollectionsUtil.<Type, VLSFunction>lookup(containmentListCopy.get(0), trace.type2Predicate).getConstant().toString();

     final VLSFunction topTerm = this.support.duplicate(CollectionsUtil.<Type, VLSFunction>lookup(containmentListCopy.get(0), trace.type2Predicate));

     VLSFofFormula _createVLSFofFormula = this.factory.createVLSFofFormula();

@@ -132,7 +139,7 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
         final VLSFunction toFunc = CollectionsUtil.<Type, VLSFunction>lookup(toType, trace.type2Predicate);

         this.addToMap(type2cont, toFunc, rel);

         EList<Type> _subtypes = toType.getSubtypes();

-        for (final Type c : _subtypes) {

+        for (final Type c_1 : _subtypes) {

           this.addToMap(type2cont, toFunc, rel);

         }

         VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula();

@@ -184,7 +191,7 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
       {

         VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula();

         final Procedure1<VLSFofFormula> _function_4 = (VLSFofFormula it) -> {

-          it.setName(this.support.toIDMultiple("containment", e.getKey().getConstant().toString()));

+          it.setName(this.support.toIDMultiple("containment_contained", e.getKey().getConstant().toString()));

           it.setFofRole("axiom");

           VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

           final Procedure1<VLSUniversalQuantifier> _function_5 = (VLSUniversalQuantifier it_1) -> {

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.java
index d5745333..c6565f6a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.java
@@ -3,7 +3,6 @@ package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder;
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapperTrace;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support;

-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;

@@ -17,14 +16,10 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration;
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference;

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;

 import hu.bme.mit.inf.dslreasoner.util.CollectionsUtil;

 import java.util.ArrayList;

 import java.util.Arrays;

-import java.util.Collection;

-import java.util.HashMap;

 import java.util.List;

-import java.util.Map;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.xtext.xbase.lib.Conversions;

 import org.eclipse.xtext.xbase.lib.ExclusiveRange;

@@ -64,10 +59,19 @@ public class Logic2VampireLanguageMapper_RelationMapper {
         relVar2TypeDecComply.add(varTypeComply);

       }

     }

+    final String[] nameArray = r.getName().split(" ");

+    String relNameVar = "";

+    int _length_1 = nameArray.length;

+    boolean _equals = (_length_1 == 3);

+    if (_equals) {

+      relNameVar = this.support.toIDMultiple(nameArray[0], nameArray[2]);

+    } else {

+      relNameVar = r.getName();

+    }

+    final String relName = relNameVar;

     VLSFofFormula _createVLSFofFormula = this.factory.createVLSFofFormula();

     final Procedure1<VLSFofFormula> _function = (VLSFofFormula it) -> {

-      final String[] nameArray = r.getName().split(" ");

-      it.setName(this.support.toIDMultiple("compliance", nameArray[0], nameArray[2]));

+      it.setName(this.support.toIDMultiple("compliance", relName));

       it.setFofRole("axiom");

       VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

       final Procedure1<VLSUniversalQuantifier> _function_1 = (VLSUniversalQuantifier it_1) -> {

@@ -80,7 +84,7 @@ public class Logic2VampireLanguageMapper_RelationMapper {
         final Procedure1<VLSImplies> _function_2 = (VLSImplies it_2) -> {

           VLSFunction _createVLSFunction = this.factory.createVLSFunction();

           final Procedure1<VLSFunction> _function_3 = (VLSFunction it_3) -> {

-            it_3.setConstant(this.support.toIDMultiple("r", nameArray[0], nameArray[2]));

+            it_3.setConstant(this.support.toIDMultiple("r", relName));

             for (final VLSVariable v_1 : relVar2VLS) {

               EList<VLSTerm> _terms = it_3.getTerms();

               VLSVariable _duplicate_1 = this.support.duplicate(v_1);

@@ -104,145 +108,6 @@ public class Logic2VampireLanguageMapper_RelationMapper {
   }

   

   public void _transformRelation(final RelationDefinition reldef, final Logic2VampireLanguageMapperTrace trace) {

-    final Map<Variable, VLSVariable> relationVar2VLS = new HashMap<Variable, VLSVariable>();

-    final Map<Variable, VLSFunction> relationVar2TypeDecComply = new HashMap<Variable, VLSFunction>();

-    final Map<Variable, VLSFunction> relationVar2TypeDecRes = new HashMap<Variable, VLSFunction>();

-    final ArrayList<VLSTerm> typedefs = new ArrayList<VLSTerm>();

-    EList<Variable> _variables = reldef.getVariables();

-    for (final Variable variable : _variables) {

-      {

-        VLSVariable _createVLSVariable = this.factory.createVLSVariable();

-        final Procedure1<VLSVariable> _function = (VLSVariable it) -> {

-          it.setName(this.support.toIDMultiple("V", variable.getName()));

-        };

-        final VLSVariable v = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function);

-        relationVar2VLS.put(variable, v);

-        VLSFunction _createVLSFunction = this.factory.createVLSFunction();

-        final Procedure1<VLSFunction> _function_1 = (VLSFunction it) -> {

-          TypeReference _range = variable.getRange();

-          it.setConstant(this.support.toIDMultiple("t", ((ComplexTypeReference) _range).getReferred().getName()));

-          EList<VLSTerm> _terms = it.getTerms();

-          VLSVariable _duplicate = this.support.duplicate(v);

-          _terms.add(_duplicate);

-        };

-        final VLSFunction varTypeComply = ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function_1);

-        relationVar2TypeDecComply.put(variable, varTypeComply);

-        relationVar2TypeDecRes.put(variable, this.support.duplicate(varTypeComply));

-      }

-    }

-    final String[] nameArray = reldef.getName().split(" ");

-    VLSFofFormula _createVLSFofFormula = this.factory.createVLSFofFormula();

-    final Procedure1<VLSFofFormula> _function = (VLSFofFormula it) -> {

-      int _length = nameArray.length;

-      int _minus = (_length - 2);

-      int _length_1 = nameArray.length;

-      int _minus_1 = (_length_1 - 1);

-      it.setName(this.support.toIDMultiple("compliance", nameArray[_minus], 

-        nameArray[_minus_1]));

-      it.setFofRole("axiom");

-      VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

-      final Procedure1<VLSUniversalQuantifier> _function_1 = (VLSUniversalQuantifier it_1) -> {

-        EList<Variable> _variables_1 = reldef.getVariables();

-        for (final Variable variable_1 : _variables_1) {

-          EList<VLSVariable> _variables_2 = it_1.getVariables();

-          VLSVariable _duplicate = this.support.duplicate(CollectionsUtil.<Variable, VLSVariable>lookup(variable_1, relationVar2VLS));

-          _variables_2.add(_duplicate);

-        }

-        VLSImplies _createVLSImplies = this.factory.createVLSImplies();

-        final Procedure1<VLSImplies> _function_2 = (VLSImplies it_2) -> {

-          VLSFunction _createVLSFunction = this.factory.createVLSFunction();

-          final Procedure1<VLSFunction> _function_3 = (VLSFunction it_3) -> {

-            it_3.setConstant(this.support.toIDMultiple("rel", reldef.getName()));

-            EList<Variable> _variables_3 = reldef.getVariables();

-            for (final Variable variable_2 : _variables_3) {

-              {

-                VLSVariable _createVLSVariable = this.factory.createVLSVariable();

-                final Procedure1<VLSVariable> _function_4 = (VLSVariable it_4) -> {

-                  it_4.setName(CollectionsUtil.<Variable, VLSVariable>lookup(variable_2, relationVar2VLS).getName());

-                };

-                final VLSVariable v = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function_4);

-                EList<VLSTerm> _terms = it_3.getTerms();

-                _terms.add(v);

-              }

-            }

-          };

-          VLSFunction _doubleArrow = ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function_3);

-          it_2.setLeft(_doubleArrow);

-          Collection<VLSFunction> _values = relationVar2TypeDecComply.values();

-          ArrayList<VLSTerm> _arrayList = new ArrayList<VLSTerm>(_values);

-          it_2.setRight(this.support.unfoldAnd(_arrayList));

-        };

-        VLSImplies _doubleArrow = ObjectExtensions.<VLSImplies>operator_doubleArrow(_createVLSImplies, _function_2);

-        it_1.setOperand(_doubleArrow);

-      };

-      VLSUniversalQuantifier _doubleArrow = ObjectExtensions.<VLSUniversalQuantifier>operator_doubleArrow(_createVLSUniversalQuantifier, _function_1);

-      it.setFofFormula(_doubleArrow);

-    };

-    final VLSFofFormula comply = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula, _function);

-    VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula();

-    final Procedure1<VLSFofFormula> _function_1 = (VLSFofFormula it) -> {

-      int _length = nameArray.length;

-      int _minus = (_length - 2);

-      int _length_1 = nameArray.length;

-      int _minus_1 = (_length_1 - 1);

-      it.setName(this.support.toIDMultiple("relation", nameArray[_minus], 

-        nameArray[_minus_1]));

-      it.setFofRole("axiom");

-      VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

-      final Procedure1<VLSUniversalQuantifier> _function_2 = (VLSUniversalQuantifier it_1) -> {

-        EList<Variable> _variables_1 = reldef.getVariables();

-        for (final Variable variable_1 : _variables_1) {

-          {

-            VLSVariable _createVLSVariable = this.factory.createVLSVariable();

-            final Procedure1<VLSVariable> _function_3 = (VLSVariable it_2) -> {

-              it_2.setName(CollectionsUtil.<Variable, VLSVariable>lookup(variable_1, relationVar2VLS).getName());

-            };

-            final VLSVariable v = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function_3);

-            EList<VLSVariable> _variables_2 = it_1.getVariables();

-            _variables_2.add(v);

-          }

-        }

-        VLSImplies _createVLSImplies = this.factory.createVLSImplies();

-        final Procedure1<VLSImplies> _function_3 = (VLSImplies it_2) -> {

-          Collection<VLSFunction> _values = relationVar2TypeDecRes.values();

-          ArrayList<VLSTerm> _arrayList = new ArrayList<VLSTerm>(_values);

-          it_2.setLeft(this.support.unfoldAnd(_arrayList));

-          VLSEquivalent _createVLSEquivalent = this.factory.createVLSEquivalent();

-          final Procedure1<VLSEquivalent> _function_4 = (VLSEquivalent it_3) -> {

-            VLSFunction _createVLSFunction = this.factory.createVLSFunction();

-            final Procedure1<VLSFunction> _function_5 = (VLSFunction it_4) -> {

-              it_4.setConstant(this.support.toIDMultiple("rel", reldef.getName()));

-              EList<Variable> _variables_2 = reldef.getVariables();

-              for (final Variable variable_2 : _variables_2) {

-                {

-                  VLSVariable _createVLSVariable = this.factory.createVLSVariable();

-                  final Procedure1<VLSVariable> _function_6 = (VLSVariable it_5) -> {

-                    it_5.setName(CollectionsUtil.<Variable, VLSVariable>lookup(variable_2, relationVar2VLS).getName());

-                  };

-                  final VLSVariable v = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function_6);

-                  EList<VLSTerm> _terms = it_4.getTerms();

-                  _terms.add(v);

-                }

-              }

-            };

-            VLSFunction _doubleArrow = ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function_5);

-            it_3.setLeft(_doubleArrow);

-            it_3.setRight(this.base.transformTerm(reldef.getValue(), trace, relationVar2VLS));

-          };

-          VLSEquivalent _doubleArrow = ObjectExtensions.<VLSEquivalent>operator_doubleArrow(_createVLSEquivalent, _function_4);

-          it_2.setRight(_doubleArrow);

-        };

-        VLSImplies _doubleArrow = ObjectExtensions.<VLSImplies>operator_doubleArrow(_createVLSImplies, _function_3);

-        it_1.setOperand(_doubleArrow);

-      };

-      VLSUniversalQuantifier _doubleArrow = ObjectExtensions.<VLSUniversalQuantifier>operator_doubleArrow(_createVLSUniversalQuantifier, _function_2);

-      it.setFofFormula(_doubleArrow);

-    };

-    final VLSFofFormula res = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula_1, _function_1);

-    EList<VLSFofFormula> _formulas = trace.specification.getFormulas();

-    _formulas.add(comply);

-    EList<VLSFofFormula> _formulas_1 = trace.specification.getFormulas();

-    _formulas_1.add(res);

   }

   

   public void transformRelation(final Relation r, final Logic2VampireLanguageMapperTrace trace) {

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
index 89633ca1..f1d73bec 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
@@ -403,20 +403,14 @@ public class Logic2VampireLanguageMapper_Support {
     return _xifexpression;

   }

   

-  protected List<Type> listSubtypes(final Type t) {

-    List<Type> allSubtypes = CollectionLiterals.<Type>newArrayList();

-    boolean _isEmpty = t.getSubtypes().isEmpty();

-    boolean _not = (!_isEmpty);

-    if (_not) {

-      EList<Type> _subtypes = t.getSubtypes();

-      for (final Type subt : _subtypes) {

-        {

-          allSubtypes.add(subt);

-          allSubtypes = this.listSubtypes(subt);

-        }

+  protected void listSubtypes(final Type t, final List<Type> allSubtypes) {

+    EList<Type> _subtypes = t.getSubtypes();

+    for (final Type subt : _subtypes) {

+      {

+        allSubtypes.add(subt);

+        this.listSubtypes(subt, allSubtypes);

       }

     }

-    return allSubtypes;

   }

   

   protected HashMap<Variable, VLSVariable> withAddition(final Map<Variable, VLSVariable> map1, final Map<Variable, VLSVariable> map2) {

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
index 9b8f049d..b9c1d28d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
@@ -78,16 +78,19 @@ public class Logic2VampireLanguageMapper_TypeMapper {
           EList<DefinedElement> _elements = type_1.getElements();

           for (final DefinedElement e : _elements) {

             {

+              final String[] nameArray = e.getName().split(" ");

+              String relNameVar = "";

+              int _length = nameArray.length;

+              boolean _equals = (_length == 3);

+              if (_equals) {

+                relNameVar = this.support.toIDMultiple(nameArray[0], nameArray[2]);

+              } else {

+                relNameVar = e.getName();

+              }

+              final String relName = relNameVar;

               VLSFunction _createVLSFunction = this.factory.createVLSFunction();

               final Procedure1<VLSFunction> _function_1 = (VLSFunction it) -> {

-                final String[] splitName = e.getName().split(" ");

-                int _length = splitName.length;

-                boolean _greaterThan = (_length > 2);

-                if (_greaterThan) {

-                  it.setConstant(this.support.toIDMultiple("e", splitName[0], splitName[2]));

-                } else {

-                  it.setConstant(this.support.toIDMultiple("e", splitName[0]));

-                }

+                it.setConstant(this.support.toIDMultiple("e", relName));

                 EList<VLSTerm> _terms = it.getTerms();

                 VLSVariable _duplicate = this.support.duplicate(variable);

                 _terms.add(_duplicate);

@@ -123,7 +126,7 @@ public class Logic2VampireLanguageMapper_TypeMapper {
           }

           VLSFofFormula _createVLSFofFormula = this.factory.createVLSFofFormula();

           final Procedure1<VLSFofFormula> _function_1 = (VLSFofFormula it) -> {

-            it.setName(this.support.toIDMultiple("typeDef", type_1.getName().split(" ")[0]));

+            it.setName(this.support.toIDMultiple("typeDef", CollectionsUtil.<TypeDefinition, VLSFunction>lookup(type_1, trace.type2Predicate).getConstant().toString()));

             it.setFofRole("axiom");

             VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

             final Procedure1<VLSUniversalQuantifier> _function_2 = (VLSUniversalQuantifier it_1) -> {

@@ -160,10 +163,10 @@ public class Logic2VampireLanguageMapper_TypeMapper {
               final VLSFunctionAsTerm cstTerm = ObjectExtensions.<VLSFunctionAsTerm>operator_doubleArrow(_createVLSFunctionAsTerm, _function_2);

               final VLSConstant cst = this.support.toConstant(cstTerm);

               trace.uniqueInstances.add(cst);

-              final int index = i;

+              final int index = (i - globalCounter);

               VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula();

               final Procedure1<VLSFofFormula> _function_3 = (VLSFofFormula it) -> {

-                it.setName(this.support.toIDMultiple("enumScope", type_1.getName().split(" ")[0], 

+                it.setName(this.support.toIDMultiple("enumScope", CollectionsUtil.<TypeDefinition, VLSFunction>lookup(type_1, trace.type2Predicate).getConstant().toString(), 

                   type_1.getElements().get(index).getName().split(" ")[0]));

                 it.setFofRole("axiom");

                 VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/filesystem.aird b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/filesystem.aird
new file mode 100644
index 00000000..50f2ba11
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/filesystem.aird
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">

+  <viewpoint:DAnalysis uid="_EK7A4F8ZEem0RrbB8IXw7Q" selectedViews="_ENX38F8ZEem0RrbB8IXw7Q _ENnIgF8ZEem0RrbB8IXw7Q _ENpkwF8ZEem0RrbB8IXw7Q _EN3AIF8ZEem0RrbB8IXw7Q" version="14.1.0.201810161215">

+    <semanticResources>filesystem.ecore</semanticResources>

+    <semanticResources>filesystem.genmodel</semanticResources>

+    <ownedViews xmi:type="viewpoint:DView" uid="_ENX38F8ZEem0RrbB8IXw7Q">

+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>

+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ErMcYF8ZEem0RrbB8IXw7Q" name="filesystem class diagram" repPath="#_Eq7WoF8ZEem0RrbB8IXw7Q">

+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

+        <target xmi:type="ecore:EPackage" href="filesystem.ecore#/"/>

+      </ownedRepresentationDescriptors>

+    </ownedViews>

+    <ownedViews xmi:type="viewpoint:DView" uid="_ENnIgF8ZEem0RrbB8IXw7Q">

+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>

+    </ownedViews>

+    <ownedViews xmi:type="viewpoint:DView" uid="_ENpkwF8ZEem0RrbB8IXw7Q">

+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>

+    </ownedViews>

+    <ownedViews xmi:type="viewpoint:DView" uid="_EN3AIF8ZEem0RrbB8IXw7Q">

+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>

+    </ownedViews>

+  </viewpoint:DAnalysis>

+  <diagram:DSemanticDiagram uid="_Eq7WoF8ZEem0RrbB8IXw7Q" name="filesystem class diagram">

+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_ErHj4F8ZEem0RrbB8IXw7Q" source="DANNOTATION_CUSTOMIZATION_KEY">

+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_ErHj4V8ZEem0RrbB8IXw7Q">

+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_GPxNgF8ZEem0RrbB8IXw7Q" sourceArrow="FillDiamond" routingStyle="manhattan">

+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_GPxNgV8ZEem0RrbB8IXw7Q" showIcon="false" labelExpression="service:render">

+            <labelFormat>bold</labelFormat>

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          </centerLabelStyleDescription>

+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_GPxNgl8ZEem0RrbB8IXw7Q" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_GPyboF8ZEem0RrbB8IXw7Q" routingStyle="manhattan">

+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>

+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_GPyboV8ZEem0RrbB8IXw7Q" showIcon="false" labelExpression="service:render">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

+          </centerLabelStyleDescription>

+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_GPybol8ZEem0RrbB8IXw7Q" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_GPzpwF8ZEem0RrbB8IXw7Q" sourceArrow="FillDiamond" routingStyle="manhattan">

+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_GPzpwV8ZEem0RrbB8IXw7Q" showIcon="false" labelExpression="service:render">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          </centerLabelStyleDescription>

+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_GPzpwl8ZEem0RrbB8IXw7Q" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_GP3UIF8ZEem0RrbB8IXw7Q" sourceArrow="InputArrow" targetArrow="FillDiamond" routingStyle="manhattan">

+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_GP3UIV8ZEem0RrbB8IXw7Q" showIcon="false" labelExpression="service:renderEOpposite">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          </beginLabelStyleDescription>

+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_GP3UIl8ZEem0RrbB8IXw7Q" showIcon="false" labelExpression="service:render">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

+      </data>

+    </ownedAnnotationEntries>

+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_ErXbgF8ZEem0RrbB8IXw7Q" source="GMF_DIAGRAMS">

+      <data xmi:type="notation:Diagram" xmi:id="_ErXbgV8ZEem0RrbB8IXw7Q" type="Sirius" element="_Eq7WoF8ZEem0RrbB8IXw7Q" measurementUnit="Pixel">

+        <children xmi:type="notation:Node" xmi:id="_GP6XcF8ZEem0RrbB8IXw7Q" type="2003" element="_GPjyIF8ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GP6-gF8ZEem0RrbB8IXw7Q" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_GP7lkF8ZEem0RrbB8IXw7Q" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_GP7lkV8ZEem0RrbB8IXw7Q"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_GP7lkl8ZEem0RrbB8IXw7Q"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_GP6XcV8ZEem0RrbB8IXw7Q" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GP6Xcl8ZEem0RrbB8IXw7Q" x="756" y="180"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_GP7lk18ZEem0RrbB8IXw7Q" type="2003" element="_GPm1cF8ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GP8MoF8ZEem0RrbB8IXw7Q" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_GP8MoV8ZEem0RrbB8IXw7Q" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_GP8Mol8ZEem0RrbB8IXw7Q"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_GP8Mo18ZEem0RrbB8IXw7Q"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_GP7llF8ZEem0RrbB8IXw7Q" fontName="Segoe UI" fontHeight="8" italic="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GP7llV8ZEem0RrbB8IXw7Q" x="1260" y="420"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_GP8MpF8ZEem0RrbB8IXw7Q" type="2003" element="_GPncgV8ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GP8Mp18ZEem0RrbB8IXw7Q" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_GP8MqF8ZEem0RrbB8IXw7Q" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_GP8MqV8ZEem0RrbB8IXw7Q"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_GP8Mql8ZEem0RrbB8IXw7Q"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_GP8MpV8ZEem0RrbB8IXw7Q" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GP8Mpl8ZEem0RrbB8IXw7Q" x="768" y="648"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_GP8zsF8ZEem0RrbB8IXw7Q" type="2003" element="_GPoDkV8ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GP8zs18ZEem0RrbB8IXw7Q" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_GP8ztF8ZEem0RrbB8IXw7Q" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_GP8ztV8ZEem0RrbB8IXw7Q"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_GP8ztl8ZEem0RrbB8IXw7Q"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_GP8zsV8ZEem0RrbB8IXw7Q" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GP8zsl8ZEem0RrbB8IXw7Q" x="1272" y="660"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_GP8zt18ZEem0RrbB8IXw7Q" type="2003" element="_GPoqoF8ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GP9awF8ZEem0RrbB8IXw7Q" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_GP9awV8ZEem0RrbB8IXw7Q" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_GP9awl8ZEem0RrbB8IXw7Q"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_GP9aw18ZEem0RrbB8IXw7Q"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_GP8zuF8ZEem0RrbB8IXw7Q" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GP8zuV8ZEem0RrbB8IXw7Q" x="972" y="24"/>

+        </children>

+        <styles xmi:type="notation:DiagramStyle" xmi:id="_ErXbgl8ZEem0RrbB8IXw7Q"/>

+        <edges xmi:type="notation:Edge" xmi:id="_GP_3AF8ZEem0RrbB8IXw7Q" type="4001" element="_GPv_YF8ZEem0RrbB8IXw7Q" source="_GP6XcF8ZEem0RrbB8IXw7Q" target="_GP8MpF8ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GQBFIF8ZEem0RrbB8IXw7Q" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQBFIV8ZEem0RrbB8IXw7Q" x="-157" y="-35"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQCTQF8ZEem0RrbB8IXw7Q" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQCTQV8ZEem0RrbB8IXw7Q" x="-28"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQC6UF8ZEem0RrbB8IXw7Q" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQC6UV8ZEem0RrbB8IXw7Q" x="-205"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GP_3AV8ZEem0RrbB8IXw7Q" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_GP_3Al8ZEem0RrbB8IXw7Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GP_3A18ZEem0RrbB8IXw7Q" points="[-23, 98, -35, -468]$[-23, 468, -35, -98]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQFWkF8ZEem0RrbB8IXw7Q" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQFWkV8ZEem0RrbB8IXw7Q" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_GQFWkl8ZEem0RrbB8IXw7Q" type="4001" element="_GPx0kF8ZEem0RrbB8IXw7Q" source="_GP6XcF8ZEem0RrbB8IXw7Q" target="_GP7lk18ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GQF9oF8ZEem0RrbB8IXw7Q" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQF9oV8ZEem0RrbB8IXw7Q" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQF9ol8ZEem0RrbB8IXw7Q" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQF9o18ZEem0RrbB8IXw7Q" x="154" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQF9pF8ZEem0RrbB8IXw7Q" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQF9pV8ZEem0RrbB8IXw7Q" x="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GQFWk18ZEem0RrbB8IXw7Q" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_GQFWlF8ZEem0RrbB8IXw7Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GQFWlV8ZEem0RrbB8IXw7Q" points="[59, 70, -445, -268]$[469, 70, -35, -268]$[469, 240, -35, -98]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQGksF8ZEem0RrbB8IXw7Q" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQGksV8ZEem0RrbB8IXw7Q" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_GQGksl8ZEem0RrbB8IXw7Q" type="4001" element="_GPybqV8ZEem0RrbB8IXw7Q" source="_GP8zt18ZEem0RrbB8IXw7Q" target="_GP6XcF8ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GQGktl8ZEem0RrbB8IXw7Q" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQGkt18ZEem0RrbB8IXw7Q" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQHLwF8ZEem0RrbB8IXw7Q" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQHLwV8ZEem0RrbB8IXw7Q" x="51" y="146"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQHLwl8ZEem0RrbB8IXw7Q" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQHLw18ZEem0RrbB8IXw7Q" x="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GQGks18ZEem0RrbB8IXw7Q" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_GQGktF8ZEem0RrbB8IXw7Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GQGktV8ZEem0RrbB8IXw7Q" points="[-59, 59, 157, -195]$[-215, 59, 1, -195]$[-215, 156, 1, -98]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQHLxF8ZEem0RrbB8IXw7Q" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQHLxV8ZEem0RrbB8IXw7Q" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_GQHLxl8ZEem0RrbB8IXw7Q" type="4001" element="_GPzCtl8ZEem0RrbB8IXw7Q" source="_GP8zt18ZEem0RrbB8IXw7Q" target="_GP7lk18ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GQHLyl8ZEem0RrbB8IXw7Q" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQHLy18ZEem0RrbB8IXw7Q" x="-57" y="25"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQHLzF8ZEem0RrbB8IXw7Q" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQHLzV8ZEem0RrbB8IXw7Q" x="67" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQHy0F8ZEem0RrbB8IXw7Q" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQHy0V8ZEem0RrbB8IXw7Q" x="-186" y="-10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GQHLx18ZEem0RrbB8IXw7Q" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_GQHLyF8ZEem0RrbB8IXw7Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GQHLyV8ZEem0RrbB8IXw7Q" points="[59, 60, -229, -434]$[301, 60, 13, -434]$[301, 396, 13, -98]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQHy0l8ZEem0RrbB8IXw7Q" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQHy018ZEem0RrbB8IXw7Q" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_GQHy1F8ZEem0RrbB8IXw7Q" type="4001" element="_GPzpyV8ZEem0RrbB8IXw7Q" source="_GP8zsF8ZEem0RrbB8IXw7Q" target="_GP7lk18ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GQHy2F8ZEem0RrbB8IXw7Q" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQHy2V8ZEem0RrbB8IXw7Q" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQHy2l8ZEem0RrbB8IXw7Q" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQHy218ZEem0RrbB8IXw7Q" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQHy3F8ZEem0RrbB8IXw7Q" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQHy3V8ZEem0RrbB8IXw7Q" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GQHy1V8ZEem0RrbB8IXw7Q" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_GQHy1l8ZEem0RrbB8IXw7Q" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GQHy118ZEem0RrbB8IXw7Q" points="[0, 0, 162, 60]$[-162, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQIZ4F8ZEem0RrbB8IXw7Q" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQIZ4V8ZEem0RrbB8IXw7Q" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_GQIZ4l8ZEem0RrbB8IXw7Q" type="4001" element="_GP1e9l8ZEem0RrbB8IXw7Q" source="_GP8MpF8ZEem0RrbB8IXw7Q" target="_GP7lk18ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GQIZ5l8ZEem0RrbB8IXw7Q" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQIZ518ZEem0RrbB8IXw7Q" x="-113" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQIZ6F8ZEem0RrbB8IXw7Q" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQIZ6V8ZEem0RrbB8IXw7Q" x="50" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQIZ6l8ZEem0RrbB8IXw7Q" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQIZ618ZEem0RrbB8IXw7Q" x="-105" y="-47"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GQIZ418ZEem0RrbB8IXw7Q" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_GQIZ5F8ZEem0RrbB8IXw7Q" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GQIZ5V8ZEem0RrbB8IXw7Q" points="[0, 0, -492, 130]$[0, -48, -492, 82]$[491, -48, -1, 82]$[491, -130, -1, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQJA8F8ZEem0RrbB8IXw7Q" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQJA8V8ZEem0RrbB8IXw7Q" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_GQJA8l8ZEem0RrbB8IXw7Q" type="4001" element="_GP2tEF8ZEem0RrbB8IXw7Q" source="_GP7lk18ZEem0RrbB8IXw7Q" target="_GP8MpF8ZEem0RrbB8IXw7Q">

+          <children xmi:type="notation:Node" xmi:id="_GQJA9l8ZEem0RrbB8IXw7Q" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQJA918ZEem0RrbB8IXw7Q" x="-272" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQJA-F8ZEem0RrbB8IXw7Q" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQJA-V8ZEem0RrbB8IXw7Q" x="4" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_GQJA-l8ZEem0RrbB8IXw7Q" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GQJA-18ZEem0RrbB8IXw7Q" x="-92" y="-291"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GQJA818ZEem0RrbB8IXw7Q" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_GQJA9F8ZEem0RrbB8IXw7Q" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GQJA9V8ZEem0RrbB8IXw7Q" points="[-59, -38, 433, -168]$[-467, -38, 25, -168]$[-467, 130, 25, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQJA_F8ZEem0RrbB8IXw7Q" id="(0.5,1.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GQJA_V8ZEem0RrbB8IXw7Q" id="(0.5,0.0)"/>

+        </edges>

+      </data>

+    </ownedAnnotationEntries>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GPjyIF8ZEem0RrbB8IXw7Q" name="FileSystem" tooltipText="" outgoingEdges="_GPv_YF8ZEem0RrbB8IXw7Q _GPx0kF8ZEem0RrbB8IXw7Q" incomingEdges="_GPybqV8ZEem0RrbB8IXw7Q" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="filesystem.ecore#//FileSystem"/>

+      <semanticElements xmi:type="ecore:EClass" href="filesystem.ecore#//FileSystem"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GPlAQF8ZEem0RrbB8IXw7Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GPm1cF8ZEem0RrbB8IXw7Q" name="FSObject" tooltipText="" outgoingEdges="_GP2tEF8ZEem0RrbB8IXw7Q" incomingEdges="_GPx0kF8ZEem0RrbB8IXw7Q _GPzCtl8ZEem0RrbB8IXw7Q _GPzpyV8ZEem0RrbB8IXw7Q _GP1e9l8ZEem0RrbB8IXw7Q" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="filesystem.ecore#//FSObject"/>

+      <semanticElements xmi:type="ecore:EClass" href="filesystem.ecore#//FSObject"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GPm1cV8ZEem0RrbB8IXw7Q" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

+        <labelFormat>italic</labelFormat>

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GPncgV8ZEem0RrbB8IXw7Q" name="Dir" tooltipText="" outgoingEdges="_GP1e9l8ZEem0RrbB8IXw7Q" incomingEdges="_GPv_YF8ZEem0RrbB8IXw7Q _GP2tEF8ZEem0RrbB8IXw7Q" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="filesystem.ecore#//Dir"/>

+      <semanticElements xmi:type="ecore:EClass" href="filesystem.ecore#//Dir"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GPncgl8ZEem0RrbB8IXw7Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GPoDkV8ZEem0RrbB8IXw7Q" name="File" tooltipText="" outgoingEdges="_GPzpyV8ZEem0RrbB8IXw7Q" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="filesystem.ecore#//File"/>

+      <semanticElements xmi:type="ecore:EClass" href="filesystem.ecore#//File"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GPoDkl8ZEem0RrbB8IXw7Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GPoqoF8ZEem0RrbB8IXw7Q" name="Model" tooltipText="" outgoingEdges="_GPybqV8ZEem0RrbB8IXw7Q _GPzCtl8ZEem0RrbB8IXw7Q" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="filesystem.ecore#//Model"/>

+      <semanticElements xmi:type="ecore:EClass" href="filesystem.ecore#//Model"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GPoqoV8ZEem0RrbB8IXw7Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GPv_YF8ZEem0RrbB8IXw7Q" name="[1..1] root" sourceNode="_GPjyIF8ZEem0RrbB8IXw7Q" targetNode="_GPncgV8ZEem0RrbB8IXw7Q">

+      <target xmi:type="ecore:EReference" href="filesystem.ecore#//FileSystem/root"/>

+      <semanticElements xmi:type="ecore:EReference" href="filesystem.ecore#//FileSystem/root"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GPxNg18ZEem0RrbB8IXw7Q" description="_GPxNgF8ZEem0RrbB8IXw7Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_GPxNhV8ZEem0RrbB8IXw7Q" showIcon="false">

+          <customFeatures>labelSize</customFeatures>

+          <labelFormat>bold</labelFormat>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_GPxNhF8ZEem0RrbB8IXw7Q" showIcon="false" labelColor="39,76,114">

+          <customFeatures>labelSize</customFeatures>

+        </endLabelStyle>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GPx0kF8ZEem0RrbB8IXw7Q" name="[0..*] /live" sourceNode="_GPjyIF8ZEem0RrbB8IXw7Q" targetNode="_GPm1cF8ZEem0RrbB8IXw7Q">

+      <target xmi:type="ecore:EReference" href="filesystem.ecore#//FileSystem/live"/>

+      <semanticElements xmi:type="ecore:EReference" href="filesystem.ecore#//FileSystem/live"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GPybo18ZEem0RrbB8IXw7Q" description="_GPyboF8ZEem0RrbB8IXw7Q" routingStyle="manhattan" strokeColor="114,159,207">

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_GPybpV8ZEem0RrbB8IXw7Q" showIcon="false" labelColor="39,76,114">

+          <customFeatures>labelSize</customFeatures>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_GPybpF8ZEem0RrbB8IXw7Q" showIcon="false" labelColor="39,76,114">

+          <customFeatures>labelSize</customFeatures>

+        </endLabelStyle>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GPybqV8ZEem0RrbB8IXw7Q" name="[1..1] filesystems" sourceNode="_GPoqoF8ZEem0RrbB8IXw7Q" targetNode="_GPjyIF8ZEem0RrbB8IXw7Q">

+      <target xmi:type="ecore:EReference" href="filesystem.ecore#//Model/filesystems"/>

+      <semanticElements xmi:type="ecore:EReference" href="filesystem.ecore#//Model/filesystems"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GPzCsF8ZEem0RrbB8IXw7Q" description="_GPxNgF8ZEem0RrbB8IXw7Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_GPzCsl8ZEem0RrbB8IXw7Q" showIcon="false">

+          <customFeatures>labelSize</customFeatures>

+          <labelFormat>bold</labelFormat>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_GPzCsV8ZEem0RrbB8IXw7Q" showIcon="false" labelColor="39,76,114">

+          <customFeatures>labelSize</customFeatures>

+        </endLabelStyle>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GPzCtl8ZEem0RrbB8IXw7Q" name="[0..*] otherFSObjects" sourceNode="_GPoqoF8ZEem0RrbB8IXw7Q" targetNode="_GPm1cF8ZEem0RrbB8IXw7Q">

+      <target xmi:type="ecore:EReference" href="filesystem.ecore#//Model/otherFSObjects"/>

+      <semanticElements xmi:type="ecore:EReference" href="filesystem.ecore#//Model/otherFSObjects"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GPzpw18ZEem0RrbB8IXw7Q" description="_GPzpwF8ZEem0RrbB8IXw7Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_GPzpxV8ZEem0RrbB8IXw7Q" showIcon="false">

+          <customFeatures>labelSize</customFeatures>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_GPzpxF8ZEem0RrbB8IXw7Q" showIcon="false" labelColor="39,76,114">

+          <customFeatures>labelSize</customFeatures>

+        </endLabelStyle>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GPzpyV8ZEem0RrbB8IXw7Q" sourceNode="_GPoDkV8ZEem0RrbB8IXw7Q" targetNode="_GPm1cF8ZEem0RrbB8IXw7Q">

+      <target xmi:type="ecore:EClass" href="filesystem.ecore#//File"/>

+      <semanticElements xmi:type="ecore:EClass" href="filesystem.ecore#//File"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GP1e8F8ZEem0RrbB8IXw7Q" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_GP1e8V8ZEem0RrbB8IXw7Q" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_GP1e8l8ZEem0RrbB8IXw7Q" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GP1e9l8ZEem0RrbB8IXw7Q" sourceNode="_GPncgV8ZEem0RrbB8IXw7Q" targetNode="_GPm1cF8ZEem0RrbB8IXw7Q">

+      <target xmi:type="ecore:EClass" href="filesystem.ecore#//Dir"/>

+      <semanticElements xmi:type="ecore:EClass" href="filesystem.ecore#//Dir"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GP2GAF8ZEem0RrbB8IXw7Q" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_GP2GAV8ZEem0RrbB8IXw7Q" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_GP2GAl8ZEem0RrbB8IXw7Q" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GP2tEF8ZEem0RrbB8IXw7Q" sourceNode="_GPm1cF8ZEem0RrbB8IXw7Q" targetNode="_GPncgV8ZEem0RrbB8IXw7Q" beginLabel="[0..*] contents" endLabel="[0..1] parent">

+      <target xmi:type="ecore:EReference" href="filesystem.ecore#//FSObject/parent"/>

+      <semanticElements xmi:type="ecore:EReference" href="filesystem.ecore#//Dir/contents"/>

+      <semanticElements xmi:type="ecore:EReference" href="filesystem.ecore#//FSObject/parent"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GP3UI18ZEem0RrbB8IXw7Q" description="_GP3UIF8ZEem0RrbB8IXw7Q" sourceArrow="InputArrow" targetArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_GP3UJF8ZEem0RrbB8IXw7Q" showIcon="false"/>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_GP3UJV8ZEem0RrbB8IXw7Q" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>

+    </ownedDiagramElements>

+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_Eq_BAF8ZEem0RrbB8IXw7Q"/>

+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>

+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>

+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>

+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>

+    <target xmi:type="ecore:EPackage" href="filesystem.ecore#/"/>

+  </diagram:DSemanticDiagram>

+</xmi:XMI>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird
index ef3746fa..be45a301 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird
@@ -52,7 +52,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_nnMlybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_kj4VybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8" italic="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_kj4lybEemc87q3iJlCgw" x="360" y="324"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_kj4lybEemc87q3iJlCgw" x="1113" y="420"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_o1UFybEemc87q3iJlCgw" type="2003" element="_g-SKcFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_pcYFybEemc87q3iJlCgw" type="5007"/>

@@ -61,7 +61,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_pcY1ybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_o1UVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8" italic="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_o1UlybEemc87q3iJlCgw" x="648" y="156"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_o1UlybEemc87q3iJlCgw" x="984" y="204"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_pcZFybEemc87q3iJlCgw" type="2003" element="_g-T_oFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_pcZ1ybEemc87q3iJlCgw" type="5007"/>

@@ -70,7 +70,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_pcalybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_pcZVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_pcZlybEemc87q3iJlCgw" x="648" y="324"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_pcZlybEemc87q3iJlCgw" x="948" y="36"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_qDcFybEemc87q3iJlCgw" type="2003" element="_g-Wb4FybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_qDc1ybEemc87q3iJlCgw" type="5007"/>

@@ -79,7 +79,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_qDdlybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_qDcVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qDclybEemc87q3iJlCgw" x="648"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qDclybEemc87q3iJlCgw" x="1404" y="204"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_qqgFybEemc87q3iJlCgw" type="2003" element="_g-YREFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_qqg1ybEemc87q3iJlCgw" type="5007"/>

@@ -88,7 +88,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_qqhlybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_qqgVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qqglybEemc87q3iJlCgw" x="648" y="636"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qqglybEemc87q3iJlCgw" x="300" y="180"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_qqh1ybEemc87q3iJlCgw" type="2003" element="_g-aGQFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_rRkFybEemc87q3iJlCgw" type="5007"/>

@@ -97,7 +97,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_rRk1ybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_qqiFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qqiVybEemc87q3iJlCgw" x="180" y="480"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qqiVybEemc87q3iJlCgw" x="1032" y="600"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_rRlFybEemc87q3iJlCgw" type="2003" element="_g-b7cFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_r4oFybEemc87q3iJlCgw" type="5007"/>

@@ -106,7 +106,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_r4o1ybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_rRlVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_rRllybEemc87q3iJlCgw" y="480"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_rRllybEemc87q3iJlCgw" x="852" y="600"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_sfsFybEemc87q3iJlCgw" type="2003" element="_g-dJkVybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_sfs1ybEemc87q3iJlCgw" type="5007"/>

@@ -115,7 +115,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_sftlybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_sfsVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_sfslybEemc87q3iJlCgw" x="828" y="636"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_sfslybEemc87q3iJlCgw" x="504" y="492"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_tGwFybEemc87q3iJlCgw" type="2003" element="_g-fl0FybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_uU4FybEemc87q3iJlCgw" type="5007"/>

@@ -124,7 +124,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_u78lybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_tGwVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8" italic="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_tGwlybEemc87q3iJlCgw" x="828" y="324"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_tGwlybEemc87q3iJlCgw" x="672" y="348"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_u781ybEemc87q3iJlCgw" type="2003" element="_g-hbAVybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_vjAFybEemc87q3iJlCgw" type="5007"/>

@@ -133,7 +133,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_vjA1ybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_u79FybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8" italic="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_u79VybEemc87q3iJlCgw" x="720" y="480"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_u79VybEemc87q3iJlCgw" x="648" y="24"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_vjBFybEemc87q3iJlCgw" type="2003" element="_g-jQMFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_wKEFybEemc87q3iJlCgw" type="5007"/>

@@ -142,7 +142,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_wKE1ybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_vjBVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_vjBlybEemc87q3iJlCgw" x="360" y="480"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_vjBlybEemc87q3iJlCgw" x="1212" y="600"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_wKFFybEemc87q3iJlCgw" type="2003" element="_g-lscFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_wKF1ybEemc87q3iJlCgw" type="5007"/>

@@ -151,7 +151,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_wKGlybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_wKFVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_wKFlybEemc87q3iJlCgw" x="540" y="480"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_wKFlybEemc87q3iJlCgw" x="1392" y="600"/>

         </children>

         <children xmi:type="notation:Node" xmi:id="_g_wxIFybEemc87q3iJlCgw" type="2003" element="_g-m6kFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_wxI1ybEemc87q3iJlCgw" type="5007"/>

@@ -160,22 +160,22 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_g_wxJlybEemc87q3iJlCgw"/>

           </children>

           <styles xmi:type="notation:ShapeStyle" xmi:id="_g_wxIVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_wxIlybEemc87q3iJlCgw" x="936" y="480"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_wxIlybEemc87q3iJlCgw" x="756" y="480"/>

         </children>

         <styles xmi:type="notation:DiagramStyle" xmi:id="_gH58ElybEemc87q3iJlCgw"/>

         <edges xmi:type="notation:Edge" xmi:id="_g_z0cFybEemc87q3iJlCgw" type="4001" element="_g_JtIFybEemc87q3iJlCgw" source="_g_pcZFybEemc87q3iJlCgw" target="_g_o1UFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_g_4s8FybEemc87q3iJlCgw" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s8VybEemc87q3iJlCgw" x="19" y="47"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s8VybEemc87q3iJlCgw" x="-10"/>

           </children>

           <children xmi:type="notation:Node" xmi:id="_g_4s8lybEemc87q3iJlCgw" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s81ybEemc87q3iJlCgw" y="10"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s81ybEemc87q3iJlCgw" x="60"/>

           </children>

           <children xmi:type="notation:Node" xmi:id="_g_4s9FybEemc87q3iJlCgw" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s9VybEemc87q3iJlCgw" y="10"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s9VybEemc87q3iJlCgw" x="10"/>

           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_g_z0cVybEemc87q3iJlCgw" routing="Rectilinear"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_g_z0clybEemc87q3iJlCgw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g_z0c1ybEemc87q3iJlCgw" points="[25, 0, 25, 70]$[25, -70, 25, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g_z0c1ybEemc87q3iJlCgw" points="[25, 98, -11, -168]$[25, 168, -11, -98]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAETIFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAETIVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -191,7 +191,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAETI1ybEemc87q3iJlCgw" routing="Rectilinear"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAETJFybEemc87q3iJlCgw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAETJVybEemc87q3iJlCgw" points="[0, 0, 75, 60]$[-75, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAETJVybEemc87q3iJlCgw" points="[59, 72, -241, -38]$[241, 72, -59, -38]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAFhRFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAFhRVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -207,7 +207,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAFhR1ybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAFhSFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAFhSVybEemc87q3iJlCgw" points="[0, 0, 180, 60]$[-180, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAFhSVybEemc87q3iJlCgw" points="[0, 0, -312, 46]$[0, -12, -312, 34]$[275, -12, -37, 34]$[275, -46, -37, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAGIVlybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAGIV1ybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -223,7 +223,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAGIWVybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAGIWlybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAGIW1ybEemc87q3iJlCgw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAGIW1ybEemc87q3iJlCgw" points="[0, 0, 99, 82]$[0, -36, 99, 46]$[-100, -36, -1, 46]$[-100, -82, -1, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAHWcFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAHWcVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -239,7 +239,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAHWc1ybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAHWdFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAHWdVybEemc87q3iJlCgw" points="[0, 0, 180, 60]$[-180, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAHWdVybEemc87q3iJlCgw" points="[0, 0, 279, 82]$[0, -36, 279, 46]$[-280, -36, -1, 46]$[-280, -82, -1, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAH9hlybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAH9h1ybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -255,7 +255,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAIkkVybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAIkklybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAIkk1ybEemc87q3iJlCgw" points="[0, 0, 106, 60]$[-106, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAIkk1ybEemc87q3iJlCgw" points="[0, 0, 84, 34]$[0, -12, 84, 22]$[-99, -12, -15, 22]$[-99, -34, -15, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAJLoFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAJLoVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -271,7 +271,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAJLo1ybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAJLpFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAJLpVybEemc87q3iJlCgw" points="[0, 0, -180, 60]$[180, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAJLpVybEemc87q3iJlCgw" points="[0, 0, -81, 82]$[0, -36, -81, 46]$[80, -36, -1, 46]$[80, -82, -1, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAKZwFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAKZwVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -287,7 +287,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAKZw1ybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAKZxFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAKZxVybEemc87q3iJlCgw" points="[0, 0, -75, 60]$[75, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAKZxVybEemc87q3iJlCgw" points="[0, 98, -348, 156]$[0, 144, -348, 202]$[359, 144, 11, 202]$[359, -58, 11, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hALA0FybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hALA0VybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -303,7 +303,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hALA01ybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hALA1FybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hALA1VybEemc87q3iJlCgw" points="[0, 0, -360, 60]$[360, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hALA1VybEemc87q3iJlCgw" points="[0, 0, -261, 82]$[0, -36, -261, 46]$[260, -36, -1, 46]$[260, -82, -1, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hALn4FybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hALn4VybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -319,7 +319,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAMO8VybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAMO8lybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAMO81ybEemc87q3iJlCgw" points="[0, 0, 0, 220]$[0, -220, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAMO81ybEemc87q3iJlCgw" points="[0, 0, -168, 46]$[0, -24, -168, 22]$[153, -24, -15, 22]$[153, -46, -15, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAei0FybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAei0VybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -335,7 +335,7 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAfJ4VybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAfJ4lybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAfJ41ybEemc87q3iJlCgw" points="[0, 0, 105, 60]$[-105, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAfJ41ybEemc87q3iJlCgw" points="[0, 0, -144, 370]$[0, -168, -144, 202]$[155, -168, 11, 202]$[155, -370, 11, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAgYAFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAgYAVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -351,39 +351,39 @@
           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAgYA1ybEemc87q3iJlCgw" routing="Tree"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAgYBFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAgYBVybEemc87q3iJlCgw" points="[0, 0, -285, 60]$[285, -60, 0, 0]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAgYBVybEemc87q3iJlCgw" points="[0, 0, 129, 118]$[0, -84, 129, 34]$[-166, -84, -37, 34]$[-166, -118, -37, 0]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAg_FFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAg_FVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

         <edges xmi:type="notation:Edge" xmi:id="_hAhmIFybEemc87q3iJlCgw" type="4001" element="_g_frY1ybEemc87q3iJlCgw" source="_g_o1UFybEemc87q3iJlCgw" target="_g_qDcFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_hAhmJFybEemc87q3iJlCgw" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmJVybEemc87q3iJlCgw" x="1" y="-10"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmJVybEemc87q3iJlCgw" x="-6" y="-10"/>

           </children>

           <children xmi:type="notation:Node" xmi:id="_hAhmJlybEemc87q3iJlCgw" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmJ1ybEemc87q3iJlCgw" y="-10"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmJ1ybEemc87q3iJlCgw" x="-1" y="10"/>

           </children>

           <children xmi:type="notation:Node" xmi:id="_hAhmKFybEemc87q3iJlCgw" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmKVybEemc87q3iJlCgw" y="10"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmKVybEemc87q3iJlCgw" x="-31" y="18"/>

           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAhmIVybEemc87q3iJlCgw" routing="Rectilinear"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAhmIlybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAhmI1ybEemc87q3iJlCgw" points="[-59, 50, -59, 108]$[-143, 50, -143, 108]$[-143, -106, -143, -48]$[-59, -106, -59, -48]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAhmI1ybEemc87q3iJlCgw" points="[59, 72, -361, -26]$[361, 72, -59, -26]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAiNMFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAiNMVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

         <edges xmi:type="notation:Edge" xmi:id="_hAiNMlybEemc87q3iJlCgw" type="4001" element="_g_g5gFybEemc87q3iJlCgw" source="_g_o1UFybEemc87q3iJlCgw" target="_g_qDcFybEemc87q3iJlCgw">

           <children xmi:type="notation:Node" xmi:id="_hAiNNlybEemc87q3iJlCgw" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAiNN1ybEemc87q3iJlCgw" x="1" y="-10"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAiNN1ybEemc87q3iJlCgw" y="-10"/>

           </children>

           <children xmi:type="notation:Node" xmi:id="_hAi0QFybEemc87q3iJlCgw" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAi0QVybEemc87q3iJlCgw" y="10"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAi0QVybEemc87q3iJlCgw" x="-1" y="18"/>

           </children>

           <children xmi:type="notation:Node" xmi:id="_hAi0QlybEemc87q3iJlCgw" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAi0Q1ybEemc87q3iJlCgw" y="-10"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAi0Q1ybEemc87q3iJlCgw" x="-34" y="12"/>

           </children>

           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAiNM1ybEemc87q3iJlCgw" routing="Rectilinear"/>

           <styles xmi:type="notation:FontStyle" xmi:id="_hAiNNFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAiNNVybEemc87q3iJlCgw" points="[59, 50, 59, 108]$[130, 50, 130, 108]$[130, -106, 130, -48]$[59, -106, 59, -48]"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAiNNVybEemc87q3iJlCgw" points="[59, 12, -361, -86]$[361, 12, -59, -86]"/>

           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAi0RFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAi0RVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

         </edges>

@@ -392,6 +392,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-GkQFybEemc87q3iJlCgw" name="Pseudostate" tooltipText="" outgoingEdges="_g_fEUFybEemc87q3iJlCgw" incomingEdges="_g_V6ZlybEemc87q3iJlCgw _g_V6bVybEemc87q3iJlCgw _g_ay41ybEemc87q3iJlCgw _g_coEFybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Pseudostate"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Pseudostate"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-NR8FybEemc87q3iJlCgw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

         <labelFormat>italic</labelFormat>

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

@@ -401,6 +404,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-SKcFybEemc87q3iJlCgw" name="Vertex" tooltipText="" outgoingEdges="_g_frY1ybEemc87q3iJlCgw _g_g5gFybEemc87q3iJlCgw" incomingEdges="_g_JtIFybEemc87q3iJlCgw _g_S3EFybEemc87q3iJlCgw _g_fEUFybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Vertex"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Vertex"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-SxgFybEemc87q3iJlCgw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

         <labelFormat>italic</labelFormat>

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

@@ -410,6 +416,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-T_oFybEemc87q3iJlCgw" name="Region" tooltipText="" outgoingEdges="_g_JtIFybEemc87q3iJlCgw" incomingEdges="_g_MweVybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Region"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Region"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-VNwFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

@@ -418,6 +427,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-Wb4FybEemc87q3iJlCgw" name="Transition" tooltipText="" incomingEdges="_g_frY1ybEemc87q3iJlCgw _g_g5gFybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Transition"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Transition"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-XC8FybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

@@ -426,6 +438,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-YREFybEemc87q3iJlCgw" name="Statechart" tooltipText="" outgoingEdges="_g_cBAFybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Statechart"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Statechart"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-ZfMFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

@@ -434,6 +449,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-aGQFybEemc87q3iJlCgw" name="Entry" tooltipText="" outgoingEdges="_g_ay41ybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Entry"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Entry"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-atUFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

@@ -442,6 +460,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-b7cFybEemc87q3iJlCgw" name="Synchronization" tooltipText="" outgoingEdges="_g_coEFybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Synchronization"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Synchronization"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-cigFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

@@ -450,6 +471,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-dJkVybEemc87q3iJlCgw" name="State" tooltipText="" outgoingEdges="_g_dPI1ybEemc87q3iJlCgw _g_edQFybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//State"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//State"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-e-wFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

@@ -458,6 +482,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-fl0FybEemc87q3iJlCgw" name="RegularState" tooltipText="" outgoingEdges="_g_S3EFybEemc87q3iJlCgw" incomingEdges="_g_aL0FybEemc87q3iJlCgw _g_dPI1ybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//RegularState"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//RegularState"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-gz8FybEemc87q3iJlCgw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

         <labelFormat>italic</labelFormat>

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

@@ -467,6 +494,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-hbAVybEemc87q3iJlCgw" name="CompositeElement" tooltipText="" outgoingEdges="_g_MweVybEemc87q3iJlCgw" incomingEdges="_g_cBAFybEemc87q3iJlCgw _g_edQFybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//CompositeElement"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//CompositeElement"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-iCEFybEemc87q3iJlCgw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

         <labelFormat>italic</labelFormat>

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

@@ -476,6 +506,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-jQMFybEemc87q3iJlCgw" name="Choice" tooltipText="" outgoingEdges="_g_V6ZlybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Choice"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Choice"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-keUFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

@@ -484,6 +517,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-lscFybEemc87q3iJlCgw" name="Exit" tooltipText="" outgoingEdges="_g_V6bVybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//Exit"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Exit"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-mTgFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

@@ -492,6 +528,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-m6kFybEemc87q3iJlCgw" name="FinalState" tooltipText="" outgoingEdges="_g_aL0FybEemc87q3iJlCgw" width="12" height="10">

       <target xmi:type="ecore:EClass" href="yakindu.ecore#//FinalState"/>

       <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//FinalState"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-nhoFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

       </ownedStyle>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
index f9d517b9..c0c367a1 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
@@ -20,13 +20,6 @@
       <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.ecore.queries.nonSymmetricOpposite"/>

     </group>

   </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.FamPatterns" id="ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.FamPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.terminatorAndInformation"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.rootElements"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.parent"/>

-    </group>

-  </extension>

   <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.model" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

     <wellbehaving-derived-feature classifier-name="FunctionalElement" feature-name="model" package-nsUri="FamMetamodel"/>

   </extension>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/TerminatorAndInformation.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/TerminatorAndInformation.java
deleted file mode 100644
index 69a6b9f4..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/TerminatorAndInformation.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.fam.FAMTerminator;

-import ca.mcgill.ecse.dslreasoner.standalone.test.fam.InformationLink;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(message="terminatorAndInformation", severity="error", key={T})

- *         pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {

- *              FunctionalOutput.outgoingLinks(Out,I);

- *              FunctionalOutput.terminator(Out,T); 

- *         } or {

- *              InformationLink.to(I,In);

- *              FunctionalInput.terminator(In,T);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class TerminatorAndInformation extends BaseGeneratedEMFQuerySpecification<TerminatorAndInformation.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.terminatorAndInformation pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private FAMTerminator fT;

-    

-    private InformationLink fI;

-    

-    private static List<String> parameterNames = makeImmutableList("T", "I");

-    

-    private Match(final FAMTerminator pT, final InformationLink pI) {

-      this.fT = pT;

-      this.fI = pI;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("T".equals(parameterName)) return this.fT;

-      if ("I".equals(parameterName)) return this.fI;

-      return null;

-    }

-    

-    public FAMTerminator getT() {

-      return this.fT;

-    }

-    

-    public InformationLink getI() {

-      return this.fI;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("T".equals(parameterName) ) {

-          this.fT = (FAMTerminator) newValue;

-          return true;

-      }

-      if ("I".equals(parameterName) ) {

-          this.fI = (InformationLink) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setT(final FAMTerminator pT) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fT = pT;

-    }

-    

-    public void setI(final InformationLink pI) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fI = pI;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.terminatorAndInformation";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return TerminatorAndInformation.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fT, fI};

-    }

-    

-    @Override

-    public TerminatorAndInformation.Match toImmutable() {

-      return isMutable() ? newMatch(fT, fI) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"T\"=" + prettyPrintValue(fT) + ", ");

-      result.append("\"I\"=" + prettyPrintValue(fI));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fT, fI);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof TerminatorAndInformation.Match)) {

-          TerminatorAndInformation.Match other = (TerminatorAndInformation.Match) obj;

-          return Objects.equals(fT, other.fT) && Objects.equals(fI, other.fI);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public TerminatorAndInformation specification() {

-      return TerminatorAndInformation.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static TerminatorAndInformation.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static TerminatorAndInformation.Match newMutableMatch(final FAMTerminator pT, final InformationLink pI) {

-      return new Mutable(pT, pI);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static TerminatorAndInformation.Match newMatch(final FAMTerminator pT, final InformationLink pI) {

-      return new Immutable(pT, pI);

-    }

-    

-    private static final class Mutable extends TerminatorAndInformation.Match {

-      Mutable(final FAMTerminator pT, final InformationLink pI) {

-        super(pT, pI);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends TerminatorAndInformation.Match {

-      Immutable(final FAMTerminator pT, final InformationLink pI) {

-        super(pT, pI);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.terminatorAndInformation pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(message="terminatorAndInformation", severity="error", key={T})

-   * pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {

-   *    FunctionalOutput.outgoingLinks(Out,I);

-   *    FunctionalOutput.terminator(Out,T); 

-   * } or {

-   *    InformationLink.to(I,In);

-   *    FunctionalInput.terminator(In,T);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see TerminatorAndInformation

-   * 

-   */

-  public static class Matcher extends BaseMatcher<TerminatorAndInformation.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static TerminatorAndInformation.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static TerminatorAndInformation.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_T = 0;

-    

-    private final static int POSITION_I = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TerminatorAndInformation.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<TerminatorAndInformation.Match> getAllMatches(final FAMTerminator pT, final InformationLink pI) {

-      return rawStreamAllMatches(new Object[]{pT, pI}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<TerminatorAndInformation.Match> streamAllMatches(final FAMTerminator pT, final InformationLink pI) {

-      return rawStreamAllMatches(new Object[]{pT, pI});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<TerminatorAndInformation.Match> getOneArbitraryMatch(final FAMTerminator pT, final InformationLink pI) {

-      return rawGetOneArbitraryMatch(new Object[]{pT, pI});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final FAMTerminator pT, final InformationLink pI) {

-      return rawHasMatch(new Object[]{pT, pI});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final FAMTerminator pT, final InformationLink pI) {

-      return rawCountMatches(new Object[]{pT, pI});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final FAMTerminator pT, final InformationLink pI, final Consumer<? super TerminatorAndInformation.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pT, pI}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public TerminatorAndInformation.Match newMatch(final FAMTerminator pT, final InformationLink pI) {

-      return TerminatorAndInformation.Match.newMatch(pT, pI);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<FAMTerminator> rawStreamAllValuesOfT(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_T, parameters).map(FAMTerminator.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FAMTerminator> getAllValuesOfT() {

-      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FAMTerminator> streamAllValuesOfT() {

-      return rawStreamAllValuesOfT(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FAMTerminator> streamAllValuesOfT(final TerminatorAndInformation.Match partialMatch) {

-      return rawStreamAllValuesOfT(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FAMTerminator> streamAllValuesOfT(final InformationLink pI) {

-      return rawStreamAllValuesOfT(new Object[]{null, pI});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FAMTerminator> getAllValuesOfT(final TerminatorAndInformation.Match partialMatch) {

-      return rawStreamAllValuesOfT(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FAMTerminator> getAllValuesOfT(final InformationLink pI) {

-      return rawStreamAllValuesOfT(new Object[]{null, pI}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<InformationLink> rawStreamAllValuesOfI(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_I, parameters).map(InformationLink.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<InformationLink> getAllValuesOfI() {

-      return rawStreamAllValuesOfI(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<InformationLink> streamAllValuesOfI() {

-      return rawStreamAllValuesOfI(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<InformationLink> streamAllValuesOfI(final TerminatorAndInformation.Match partialMatch) {

-      return rawStreamAllValuesOfI(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<InformationLink> streamAllValuesOfI(final FAMTerminator pT) {

-      return rawStreamAllValuesOfI(new Object[]{pT, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<InformationLink> getAllValuesOfI(final TerminatorAndInformation.Match partialMatch) {

-      return rawStreamAllValuesOfI(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<InformationLink> getAllValuesOfI(final FAMTerminator pT) {

-      return rawStreamAllValuesOfI(new Object[]{pT, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected TerminatorAndInformation.Match tupleToMatch(final Tuple t) {

-      try {

-          return TerminatorAndInformation.Match.newMatch((FAMTerminator) t.get(POSITION_T), (InformationLink) t.get(POSITION_I));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected TerminatorAndInformation.Match arrayToMatch(final Object[] match) {

-      try {

-          return TerminatorAndInformation.Match.newMatch((FAMTerminator) match[POSITION_T], (InformationLink) match[POSITION_I]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected TerminatorAndInformation.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return TerminatorAndInformation.Match.newMutableMatch((FAMTerminator) match[POSITION_T], (InformationLink) match[POSITION_I]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<TerminatorAndInformation.Matcher> querySpecification() {

-      return TerminatorAndInformation.instance();

-    }

-  }

-  

-  private TerminatorAndInformation() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static TerminatorAndInformation instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected TerminatorAndInformation.Matcher instantiate(final ViatraQueryEngine engine) {

-    return TerminatorAndInformation.Matcher.on(engine);

-  }

-  

-  @Override

-  public TerminatorAndInformation.Matcher instantiate() {

-    return TerminatorAndInformation.Matcher.create();

-  }

-  

-  @Override

-  public TerminatorAndInformation.Match newEmptyMatch() {

-    return TerminatorAndInformation.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public TerminatorAndInformation.Match newMatch(final Object... parameters) {

-    return TerminatorAndInformation.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.fam.FAMTerminator) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.fam.InformationLink) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.TerminatorAndInformation (visibility: PUBLIC, simpleName: TerminatorAndInformation, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.TerminatorAndInformation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.TerminatorAndInformation (visibility: PUBLIC, simpleName: TerminatorAndInformation, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.TerminatorAndInformation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static TerminatorAndInformation INSTANCE = new TerminatorAndInformation();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static TerminatorAndInformation.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_T = new PParameter("T", "ca.mcgill.ecse.dslreasoner.standalone.test.fam.FAMTerminator", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FamMetamodel", "FAMTerminator")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_I = new PParameter("I", "ca.mcgill.ecse.dslreasoner.standalone.test.fam.InformationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FamMetamodel", "InformationLink")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_T, parameter_I);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.terminatorAndInformation";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("T","I");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_T = body.getOrCreateVariableByName("T");

-          PVariable var_I = body.getOrCreateVariableByName("I");

-          PVariable var_Out = body.getOrCreateVariableByName("Out");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "FAMTerminator")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_I), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "InformationLink")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_T, parameter_T),

-             new ExportedParameter(body, var_I, parameter_I)

-          ));

-          //    FunctionalOutput.outgoingLinks(Out,I)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Out), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "FunctionalOutput")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Out, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FamMetamodel", "FunctionalOutput", "outgoingLinks")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "InformationLink")));

-          new Equality(body, var__virtual_0_, var_I);

-          //    FunctionalOutput.terminator(Out,T)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Out), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "FunctionalOutput")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Out, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FamMetamodel", "FunctionalData", "terminator")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "FAMTerminator")));

-          new Equality(body, var__virtual_1_, var_T);

-          bodies.add(body);

-      }

-      {

-          PBody body = new PBody(this);

-          PVariable var_T = body.getOrCreateVariableByName("T");

-          PVariable var_I = body.getOrCreateVariableByName("I");

-          PVariable var_In = body.getOrCreateVariableByName("In");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "FAMTerminator")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_I), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "InformationLink")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_T, parameter_T),

-             new ExportedParameter(body, var_I, parameter_I)

-          ));

-          //    InformationLink.to(I,In)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_I), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "InformationLink")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_I, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FamMetamodel", "InformationLink", "to")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "FunctionalInput")));

-          new Equality(body, var__virtual_0_, var_In);

-          //    FunctionalInput.terminator(In,T)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_In), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "FunctionalInput")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_In, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FamMetamodel", "FunctionalData", "terminator")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FamMetamodel", "FAMTerminator")));

-          new Equality(body, var__virtual_1_, var_T);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("message", "terminatorAndInformation");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("T")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.classpath b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.classpath
index 3f0838b6..f03a6d83 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.classpath
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.classpath
@@ -5,5 +5,6 @@
         <classpathentry kind="src" path="src"/>

         <classpathentry kind="src" path="src-gen"/>

         <classpathentry kind="src" path="xtend-gen"/>

+        <classpathentry kind="src" path="queries"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
index 2ea274a4..8b69d9a8 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
@@ -3,7 +3,11 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: ca.mcgill.ecse.dslreasoner.vampire.test;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries
+Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries,
+  ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore,
+  ca.mcgill.ecse.dslreasoner.vampire.test.queries.fam,
+  ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem,
+  ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu
 Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
   org.eclipse.emf.ecore,
   org.eclipse.viatra.query.runtime.rete,
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/FaModel.xmi b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/FAM/FaModel.xmi
index cef17e1b..cef17e1b 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/FaModel.xmi
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/FAM/FaModel.xmi
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
index 18e58ab0..4f0bbdb1 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>

 <language:LogicProblem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/ecore2logicannotation" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem" xmlns:language_1="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language">

   <types xsi:type="language_1:TypeDeclaration" name="FunctionalElement class" subtypes="//@types.2" isAbstract="true"/>

-  <types xsi:type="language_1:TypeDeclaration" name="FunctionalArchitectureModel class"/>

+  <types xsi:type="language_1:TypeDeclaration" name="FunctionalArchitectureModel class" subtypes="//@types.10 //@types.11" isAbstract="true"/>

   <types xsi:type="language_1:TypeDeclaration" name="Function class" supertypes="//@types.0"/>

   <types xsi:type="language_1:TypeDeclaration" name="FAMTerminator class"/>

   <types xsi:type="language_1:TypeDeclaration" name="InformationLink class"/>

@@ -10,6 +10,8 @@
   <types xsi:type="language_1:TypeDeclaration" name="FunctionalOutput class" supertypes="//@types.8"/>

   <types xsi:type="language_1:TypeDeclaration" name="FunctionalData class" subtypes="//@types.6 //@types.7" isAbstract="true"/>

   <types xsi:type="language_1:TypeDefinition" name="FunctionType enum" elements="//@elements.0 //@elements.1 //@elements.2"/>

+  <types xsi:type="language_1:TypeDefinition" name="FunctionalArchitectureModel class DefinedPart" supertypes="//@types.1" elements="//@elements.3"/>

+  <types xsi:type="language_1:TypeDeclaration" name="FunctionalArchitectureModel class UndefinedPart" supertypes="//@types.1"/>

   <assertions name="upperMultiplicity interface FunctionalElement" annotations="//@annotations.0">

     <value xsi:type="language_1:Forall">

       <quantifiedVariables name="src">

@@ -557,7 +559,8 @@
   <elements name="Root literal FunctionType" definedInType="//@types.9"/>

   <elements name="Intermediate literal FunctionType" definedInType="//@types.9"/>

   <elements name="Leaf literal FunctionType" definedInType="//@types.9"/>

-  <containmentHierarchies typesOrderedInHierarchy="//@types.8 //@types.5 //@types.4 //@types.6 //@types.1 //@types.7 //@types.3 //@types.2 //@types.0" containmentRelations="//@relations.0 //@relations.3 //@relations.4 //@relations.8 //@relations.11 //@relations.12"/>

+  <elements name="o 1" definedInType="//@types.10"/>

+  <containmentHierarchies typesOrderedInHierarchy="//@types.1 //@types.5 //@types.6 //@types.3 //@types.8 //@types.7 //@types.0 //@types.2 //@types.4 //@types.10 //@types.11" containmentRelations="//@relations.0 //@relations.3 //@relations.4 //@relations.8 //@relations.11 //@relations.12"/>

   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.0" upper="1"/>

   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.1" relation="//@relations.1" lower="1"/>

   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.2" relation="//@relations.1" upper="1"/>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
deleted file mode 100644
index 3d49d42c..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
+++ /dev/null
@@ -1,72 +0,0 @@
-% This is an initial Test Comment

-fof ( typeDef_FunctionType , axiom , ! [ A ] : ( t_FunctionType ( A ) <=> ( object ( A ) & ( ( e_Root_FunctionType ( A ) & ( ~ e_Intermediate_FunctionType ( A ) & ~ e_Leaf_FunctionType ( A ) ) ) | ( ( ~ e_Root_FunctionType ( A ) & ( e_Intermediate_FunctionType ( A ) & ~ e_Leaf_FunctionType ( A ) ) ) | ( ~ e_Root_FunctionType ( A ) & ( ~ e_Intermediate_FunctionType ( A ) & e_Leaf_FunctionType ( A ) ) ) ) ) ) ) ) .

-fof ( enumScope_FunctionType_Root , axiom , ! [ A ] : ( A = eo1 <=> e_Root_FunctionType ( A ) ) ) .

-fof ( enumScope_FunctionType_Intermediate , axiom , ! [ A ] : ( A = eo2 <=> e_Intermediate_FunctionType ( A ) ) ) .

-fof ( enumScope_FunctionType_Leaf , axiom , ! [ A ] : ( A = eo3 <=> e_Leaf_FunctionType ( A ) ) ) .

-fof ( notObjectHandler , axiom , ! [ A ] : ( ~ object ( A ) <=> ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionType ( A ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( inheritanceHierarchyHandler , axiom , ! [ A ] : ( object ( A ) <=> ( ( t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( t_FunctionalOutput ( A ) & ( t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( typeScope_min_object , axiom , ! [ A ] : ( ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | ( A = eo1 | ( A = eo2 | A = eo3 ) ) ) ) ) ) => object ( A ) ) ) .

-fof ( typeScope_max_object , axiom , ! [ A ] : ( object ( A ) => ( A = eo1 | ( A = eo2 | ( A = eo3 | ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | A = o5 ) ) ) ) ) ) ) ) ) .

-fof ( typeScope_min_t_Function , axiom , ! [ A ] : ( A = o2 => ( t_Function ( A ) & object ( A ) ) ) ) .

-fof ( typeScope_min_t_FunctionalOutput , axiom , ! [ A ] : ( ( A = o3 | ( A = o4 | A = o5 ) ) => ( t_FunctionalOutput ( A ) & object ( A ) ) ) ) .

-fof ( typeScope_min_t_FunctionalInterface , axiom , ! [ A ] : ( ( A = o6 | A = o7 ) => ( t_FunctionalInterface ( A ) & object ( A ) ) ) ) .

-fof ( typeScope_max_t_Function , axiom , ! [ A ] : ( ( t_Function ( A ) & object ( A ) ) => A = o2 ) ) .

-fof ( typeScope_max_t_FunctionalOutput , axiom , ! [ A ] : ( ( t_FunctionalOutput ( A ) & object ( A ) ) => ( A = o3 | ( A = o4 | A = o5 ) ) ) ) .

-fof ( t_uniqueness_eo1 , axiom , eo1 != eo2 & ( eo1 != eo3 & ( eo1 != o1 & ( eo1 != o2 & ( eo1 != o3 & ( eo1 != o4 & eo1 != o5 ) ) ) ) ) ) .

-fof ( t_uniqueness_eo2 , axiom , eo2 != eo3 & ( eo2 != o1 & ( eo2 != o2 & ( eo2 != o3 & ( eo2 != o4 & eo2 != o5 ) ) ) ) ) .

-fof ( t_uniqueness_eo3 , axiom , eo3 != o1 & ( eo3 != o2 & ( eo3 != o3 & ( eo3 != o4 & eo3 != o5 ) ) ) ) .

-fof ( t_uniqueness_o1 , axiom , o1 != o2 & ( o1 != o3 & ( o1 != o4 & o1 != o5 ) ) ) .

-fof ( t_uniqueness_o2 , axiom , o2 != o3 & ( o2 != o4 & o2 != o5 ) ) .

-fof ( t_uniqueness_o3 , axiom , o3 != o4 & o3 != o5 ) .

-fof ( t_uniqueness_o4 , axiom , o4 != o5 ) .

-fof ( compliance_interface_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_interface_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_FunctionalInterface ( V_1 ) ) ) ) .

-fof ( compliance_model_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_model_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_FunctionalArchitectureModel ( V_1 ) ) ) ) .

-fof ( compliance_parent_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_parent_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_Function ( V_1 ) ) ) ) .

-fof ( compliance_rootElements_FunctionalArchitectureModel , axiom , ! [ V_0 , V_1 ] : ( r_rootElements_FunctionalArchitectureModel ( V_0 , V_1 ) => ( t_FunctionalArchitectureModel ( V_0 ) & t_FunctionalElement ( V_1 ) ) ) ) .

-fof ( compliance_subElements_Function , axiom , ! [ V_0 , V_1 ] : ( r_subElements_Function ( V_0 , V_1 ) => ( t_Function ( V_0 ) & t_FunctionalElement ( V_1 ) ) ) ) .

-fof ( compliance_data_FAMTerminator , axiom , ! [ V_0 , V_1 ] : ( r_data_FAMTerminator ( V_0 , V_1 ) => ( t_FAMTerminator ( V_0 ) & t_FunctionalData ( V_1 ) ) ) ) .

-fof ( compliance_from_InformationLink , axiom , ! [ V_0 , V_1 ] : ( r_from_InformationLink ( V_0 , V_1 ) => ( t_InformationLink ( V_0 ) & t_FunctionalOutput ( V_1 ) ) ) ) .

-fof ( compliance_to_InformationLink , axiom , ! [ V_0 , V_1 ] : ( r_to_InformationLink ( V_0 , V_1 ) => ( t_InformationLink ( V_0 ) & t_FunctionalInput ( V_1 ) ) ) ) .

-fof ( compliance_data_FunctionalInterface , axiom , ! [ V_0 , V_1 ] : ( r_data_FunctionalInterface ( V_0 , V_1 ) => ( t_FunctionalInterface ( V_0 ) & t_FunctionalData ( V_1 ) ) ) ) .

-fof ( compliance_element_FunctionalInterface , axiom , ! [ V_0 , V_1 ] : ( r_element_FunctionalInterface ( V_0 , V_1 ) => ( t_FunctionalInterface ( V_0 ) & t_FunctionalElement ( V_1 ) ) ) ) .

-fof ( compliance_IncomingLinks_FunctionalInput , axiom , ! [ V_0 , V_1 ] : ( r_IncomingLinks_FunctionalInput ( V_0 , V_1 ) => ( t_FunctionalInput ( V_0 ) & t_InformationLink ( V_1 ) ) ) ) .

-fof ( compliance_outgoingLinks_FunctionalOutput , axiom , ! [ V_0 , V_1 ] : ( r_outgoingLinks_FunctionalOutput ( V_0 , V_1 ) => ( t_FunctionalOutput ( V_0 ) & t_InformationLink ( V_1 ) ) ) ) .

-fof ( compliance_terminator_FunctionalData , axiom , ! [ V_0 , V_1 ] : ( r_terminator_FunctionalData ( V_0 , V_1 ) => ( t_FunctionalData ( V_0 ) & t_FAMTerminator ( V_1 ) ) ) ) .

-fof ( compliance_interface_FunctionalData , axiom , ! [ V_0 , V_1 ] : ( r_interface_FunctionalData ( V_0 , V_1 ) => ( t_FunctionalData ( V_0 ) & t_FunctionalInterface ( V_1 ) ) ) ) .

-fof ( compliance_type_Function , axiom , ! [ V_0 , V_1 ] : ( r_type_Function ( V_0 , V_1 ) => ( t_Function ( V_0 ) & t_FunctionType ( V_1 ) ) ) ) .

-fof ( containment_topLevel_t_FunctionalArchitectureModel , axiom , ! [ A ] : ( t_FunctionalArchitectureModel ( A ) <=> A = o1 ) ) .

-fof ( containment_noDup_r_interface_FunctionalElement , axiom , ? [ A , B ] : ( r_interface_FunctionalElement ( A , B ) => ~ ? [ C , B ] : r_interface_FunctionalElement ( C , B ) ) ) .

-fof ( containment_noDup_r_rootElements_FunctionalArchitectureModel , axiom , ? [ A , B ] : ( r_rootElements_FunctionalArchitectureModel ( A , B ) => ~ ? [ C , B ] : r_rootElements_FunctionalArchitectureModel ( C , B ) ) ) .

-fof ( containment_noDup_r_subElements_Function , axiom , ? [ A , B ] : ( r_subElements_Function ( A , B ) => ~ ? [ C , B ] : r_subElements_Function ( C , B ) ) ) .

-fof ( containment_noDup_r_data_FunctionalInterface , axiom , ? [ A , B ] : ( r_data_FunctionalInterface ( A , B ) => ~ ? [ C , B ] : r_data_FunctionalInterface ( C , B ) ) ) .

-fof ( containment_noDup_r_outgoingLinks_FunctionalOutput , axiom , ? [ A , B ] : ( r_outgoingLinks_FunctionalOutput ( A , B ) => ~ ? [ C , B ] : r_outgoingLinks_FunctionalOutput ( C , B ) ) ) .

-fof ( containment_noDup_r_terminator_FunctionalData , axiom , ? [ A , B ] : ( r_terminator_FunctionalData ( A , B ) => ~ ? [ C , B ] : r_terminator_FunctionalData ( C , B ) ) ) .

-fof ( containment_t_FunctionalElement , axiom , ! [ A ] : ( t_FunctionalElement ( A ) => ? [ B ] : ( ( r_rootElements_FunctionalArchitectureModel ( B , A ) & ~ r_subElements_Function ( B , A ) ) | ( ~ r_rootElements_FunctionalArchitectureModel ( B , A ) & r_subElements_Function ( B , A ) ) ) ) ) .

-fof ( containment_t_FunctionalData , axiom , ! [ A ] : ( t_FunctionalData ( A ) => ? [ B ] : r_data_FunctionalInterface ( B , A ) ) ) .

-fof ( containment_t_InformationLink , axiom , ! [ A ] : ( t_InformationLink ( A ) => ? [ B ] : r_outgoingLinks_FunctionalOutput ( B , A ) ) ) .

-fof ( containment_t_FunctionalInterface , axiom , ! [ A ] : ( t_FunctionalInterface ( A ) => ? [ B ] : r_interface_FunctionalElement ( B , A ) ) ) .

-fof ( containment_t_FAMTerminator , axiom , ! [ A ] : ( t_FAMTerminator ( A ) => ? [ B ] : r_terminator_FunctionalData ( B , A ) ) ) .

-fof ( containment_noCycle_1 , axiom , ~ ? [ V1 ] : ( r_interface_FunctionalElement ( V1 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V1 ) | ( r_subElements_Function ( V1 , V1 ) | ( r_data_FunctionalInterface ( V1 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V1 ) | r_terminator_FunctionalData ( V1 , V1 ) ) ) ) ) ) ) .

-fof ( containment_noCycle_2 , axiom , ~ ? [ V1 , V2 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V2 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V1 ) | ( r_subElements_Function ( V2 , V1 ) | ( r_data_FunctionalInterface ( V2 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V1 ) | r_terminator_FunctionalData ( V2 , V1 ) ) ) ) ) ) ) ) .

-fof ( containment_noCycle_3 , axiom , ~ ? [ V1 , V2 , V3 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V2 , V3 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V3 ) | ( r_subElements_Function ( V2 , V3 ) | ( r_data_FunctionalInterface ( V2 , V3 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V3 ) | r_terminator_FunctionalData ( V2 , V3 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V3 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V3 , V1 ) | ( r_subElements_Function ( V3 , V1 ) | ( r_data_FunctionalInterface ( V3 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V3 , V1 ) | r_terminator_FunctionalData ( V3 , V1 ) ) ) ) ) ) ) ) ) .

-fof ( containment_noCycle_4 , axiom , ~ ? [ V1 , V2 , V3 , V4 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V2 , V3 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V3 ) | ( r_subElements_Function ( V2 , V3 ) | ( r_data_FunctionalInterface ( V2 , V3 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V3 ) | r_terminator_FunctionalData ( V2 , V3 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V3 , V4 ) | ( r_rootElements_FunctionalArchitectureModel ( V3 , V4 ) | ( r_subElements_Function ( V3 , V4 ) | ( r_data_FunctionalInterface ( V3 , V4 ) | ( r_outgoingLinks_FunctionalOutput ( V3 , V4 ) | r_terminator_FunctionalData ( V3 , V4 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V4 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V4 , V1 ) | ( r_subElements_Function ( V4 , V1 ) | ( r_data_FunctionalInterface ( V4 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V4 , V1 ) | r_terminator_FunctionalData ( V4 , V1 ) ) ) ) ) ) ) ) ) ) .

-fof ( containment_noCycle_5 , axiom , ~ ? [ V1 , V2 , V3 , V4 , V5 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V2 , V3 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V3 ) | ( r_subElements_Function ( V2 , V3 ) | ( r_data_FunctionalInterface ( V2 , V3 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V3 ) | r_terminator_FunctionalData ( V2 , V3 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V3 , V4 ) | ( r_rootElements_FunctionalArchitectureModel ( V3 , V4 ) | ( r_subElements_Function ( V3 , V4 ) | ( r_data_FunctionalInterface ( V3 , V4 ) | ( r_outgoingLinks_FunctionalOutput ( V3 , V4 ) | r_terminator_FunctionalData ( V3 , V4 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V4 , V5 ) | ( r_rootElements_FunctionalArchitectureModel ( V4 , V5 ) | ( r_subElements_Function ( V4 , V5 ) | ( r_data_FunctionalInterface ( V4 , V5 ) | ( r_outgoingLinks_FunctionalOutput ( V4 , V5 ) | r_terminator_FunctionalData ( V4 , V5 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V5 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V5 , V1 ) | ( r_subElements_Function ( V5 , V1 ) | ( r_data_FunctionalInterface ( V5 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V5 , V1 ) | r_terminator_FunctionalData ( V5 , V1 ) ) ) ) ) ) ) ) ) ) ) .

-fof ( upperMultiplicity_interface_FunctionalElement , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FunctionalElement ( V_src ) & ( t_FunctionalInterface ( V_trg_1 ) & t_FunctionalInterface ( V_trg_2 ) ) ) => ( ( r_interface_FunctionalElement ( V_src , V_trg_1 ) & r_interface_FunctionalElement ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( lowerMultiplicity_model_FunctionalElement , axiom , ! [ V_src ] : ( t_FunctionalElement ( V_src ) => ? [ V_trg_1 ] : ( t_FunctionalArchitectureModel ( V_trg_1 ) & r_model_FunctionalElement ( V_src , V_trg_1 ) ) ) ) .

-fof ( upperMultiplicity_model_FunctionalElement , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FunctionalElement ( V_src ) & ( t_FunctionalArchitectureModel ( V_trg_1 ) & t_FunctionalArchitectureModel ( V_trg_2 ) ) ) => ( ( r_model_FunctionalElement ( V_src , V_trg_1 ) & r_model_FunctionalElement ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( upperMultiplicity_parent_FunctionalElement , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FunctionalElement ( V_src ) & ( t_Function ( V_trg_1 ) & t_Function ( V_trg_2 ) ) ) => ( ( r_parent_FunctionalElement ( V_src , V_trg_1 ) & r_parent_FunctionalElement ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( upperMultiplicity_data_FAMTerminator , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FAMTerminator ( V_src ) & ( t_FunctionalData ( V_trg_1 ) & t_FunctionalData ( V_trg_2 ) ) ) => ( ( r_data_FAMTerminator ( V_src , V_trg_1 ) & r_data_FAMTerminator ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( upperMultiplicity_from_InformationLink , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_InformationLink ( V_src ) & ( t_FunctionalOutput ( V_trg_1 ) & t_FunctionalOutput ( V_trg_2 ) ) ) => ( ( r_from_InformationLink ( V_src , V_trg_1 ) & r_from_InformationLink ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( lowerMultiplicity_to_InformationLink , axiom , ! [ V_src ] : ( t_InformationLink ( V_src ) => ? [ V_trg_1 ] : ( t_FunctionalInput ( V_trg_1 ) & r_to_InformationLink ( V_src , V_trg_1 ) ) ) ) .

-fof ( upperMultiplicity_to_InformationLink , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_InformationLink ( V_src ) & ( t_FunctionalInput ( V_trg_1 ) & t_FunctionalInput ( V_trg_2 ) ) ) => ( ( r_to_InformationLink ( V_src , V_trg_1 ) & r_to_InformationLink ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( upperMultiplicity_element_FunctionalInterface , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FunctionalInterface ( V_src ) & ( t_FunctionalElement ( V_trg_1 ) & t_FunctionalElement ( V_trg_2 ) ) ) => ( ( r_element_FunctionalInterface ( V_src , V_trg_1 ) & r_element_FunctionalInterface ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( upperMultiplicity_terminator_FunctionalData , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FunctionalData ( V_src ) & ( t_FAMTerminator ( V_trg_1 ) & t_FAMTerminator ( V_trg_2 ) ) ) => ( ( r_terminator_FunctionalData ( V_src , V_trg_1 ) & r_terminator_FunctionalData ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( upperMultiplicity_interface_FunctionalData , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_FunctionalData ( V_src ) & ( t_FunctionalInterface ( V_trg_1 ) & t_FunctionalInterface ( V_trg_2 ) ) ) => ( ( r_interface_FunctionalData ( V_src , V_trg_1 ) & r_interface_FunctionalData ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

-fof ( oppositeReference_interface_FunctionalElement , axiom , ! [ V_src , V_trg ] : ( ( t_FunctionalElement ( V_src ) & t_FunctionalInterface ( V_trg ) ) => ( r_interface_FunctionalElement ( V_src , V_trg ) <=> r_element_FunctionalInterface ( V_trg , V_src ) ) ) ) .

-fof ( oppositeReference_parent_FunctionalElement , axiom , ! [ V_src , V_trg ] : ( ( t_FunctionalElement ( V_src ) & t_Function ( V_trg ) ) => ( r_parent_FunctionalElement ( V_src , V_trg ) <=> r_subElements_Function ( V_trg , V_src ) ) ) ) .

-fof ( oppositeReference_data_FAMTerminator , axiom , ! [ V_src , V_trg ] : ( ( t_FAMTerminator ( V_src ) & t_FunctionalData ( V_trg ) ) => ( r_data_FAMTerminator ( V_src , V_trg ) <=> r_terminator_FunctionalData ( V_trg , V_src ) ) ) ) .

-fof ( oppositeReference_from_InformationLink , axiom , ! [ V_src , V_trg ] : ( ( t_InformationLink ( V_src ) & t_FunctionalOutput ( V_trg ) ) => ( r_from_InformationLink ( V_src , V_trg ) <=> r_outgoingLinks_FunctionalOutput ( V_trg , V_src ) ) ) ) .

-fof ( oppositeReference_to_InformationLink , axiom , ! [ V_src , V_trg ] : ( ( t_InformationLink ( V_src ) & t_FunctionalInput ( V_trg ) ) => ( r_to_InformationLink ( V_src , V_trg ) <=> r_IncomingLinks_FunctionalInput ( V_trg , V_src ) ) ) ) .

-fof ( oppositeReference_data_FunctionalInterface , axiom , ! [ V_src , V_trg ] : ( ( t_FunctionalInterface ( V_src ) & t_FunctionalData ( V_trg ) ) => ( r_data_FunctionalInterface ( V_src , V_trg ) <=> r_interface_FunctionalData ( V_trg , V_src ) ) ) ) .

-fof ( lowerMultiplicity_type_Function , axiom , ! [ V_src ] : ( t_Function ( V_src ) => ? [ V_trg_1 ] : ( t_FunctionType ( V_trg_1 ) & r_type_Function ( V_src , V_trg_1 ) ) ) ) .

-fof ( upperMultiplicity_type_Function , axiom , ! [ V_src , V_trg_1 , V_trg_2 ] : ( ( t_Function ( V_src ) & ( t_FunctionType ( V_trg_1 ) & t_FunctionType ( V_trg_2 ) ) ) => ( ( r_type_Function ( V_src , V_trg_1 ) & r_type_Function ( V_src , V_trg_2 ) ) => ~ V_trg_1 != V_trg_2 ) ) ) .

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
index 3770f0af..0d17c01b 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><plugin>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.terminatorAndInformation"/>

+  <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.EcorePatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.queries.EcorePatterns" id="ca.mcgill.ecse.dslreasoner.vampire.queries.EcorePatterns">

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.directSupertype"/>

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.loopInInheritence"/>

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.opposite"/>

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.nonSymmetricOpposite"/>

     </group>

   </extension>

   <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

@@ -11,7 +14,18 @@
       <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.contentInNotLive"/>

     </group>

   </extension>

+  <extension id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.EcorePatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.EcorePatterns" id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.EcorePatterns">

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.directSupertype"/>

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.loopInInheritence"/>

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.opposite"/>

+      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.nonSymmetricOpposite"/>

+    </group>

+  </extension>

   <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.vampire.queries.live" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

     <wellbehaving-derived-feature classifier-name="FileSystem" feature-name="live" package-nsUri="FileSystemMetamodel"/>

   </extension>

+  <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem.live" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

+    <wellbehaving-derived-feature classifier-name="FileSystem" feature-name="live" package-nsUri="FileSystemMetamodel"/>

+  </extension>

 </plugin>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/FamPatterns.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/FamPatterns.java
deleted file mode 100644
index cf1378da..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/FamPatterns.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/queries/FamPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-import ca.mcgill.ecse.dslreasoner.vampire.queries.TerminatorAndInformation;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;

-

-/**

- * A pattern group formed of all public patterns defined in FamPatterns.vql.

- * 

- * <p>Use the static instance as any {@link interface org.eclipse.viatra.query.runtime.api.IQueryGroup}, to conveniently prepare

- * a VIATRA Query engine for matching all patterns originally defined in file FamPatterns.vql,

- * in order to achieve better performance than one-by-one on-demand matcher initialization.

- * 

- * <p> From package ca.mcgill.ecse.dslreasoner.vampire.queries, the group contains the definition of the following patterns: <ul>

- * <li>terminatorAndInformation</li>

- * </ul>

- * 

- * @see IQueryGroup

- * 

- */

-@SuppressWarnings("all")

-public final class FamPatterns extends BaseGeneratedPatternGroup {

-  /**

-   * Access the pattern group.

-   * 

-   * @return the singleton instance of the group

-   * @throws ViatraQueryRuntimeException if there was an error loading the generated code of pattern specifications

-   * 

-   */

-  public static FamPatterns instance() {

-    if (INSTANCE == null) {

-        INSTANCE = new FamPatterns();

-    }

-    return INSTANCE;

-  }

-  

-  private static FamPatterns INSTANCE;

-  

-  private FamPatterns() {

-    querySpecifications.add(TerminatorAndInformation.instance());

-  }

-  

-  public TerminatorAndInformation getTerminatorAndInformation() {

-    return TerminatorAndInformation.instance();

-  }

-  

-  public TerminatorAndInformation.Matcher getTerminatorAndInformation(final ViatraQueryEngine engine) {

-    return TerminatorAndInformation.Matcher.on(engine);

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/TerminatorAndInformation.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/TerminatorAndInformation.java
deleted file mode 100644
index cb0708ad..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/TerminatorAndInformation.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/queries/FamPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-import functionalarchitecture.FAMTerminator;

-import functionalarchitecture.InformationLink;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(message="terminatorAndInformation", severity="error", key={T})

- *         pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {

- *              FunctionalOutput.outgoingLinks(Out,I);

- *              FunctionalOutput.terminator(Out,T); 

- *         } or {

- *              InformationLink.to(I,In);

- *              FunctionalInput.terminator(In,T);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class TerminatorAndInformation extends BaseGeneratedEMFQuerySpecification<TerminatorAndInformation.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.terminatorAndInformation pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private FAMTerminator fT;

-    

-    private InformationLink fI;

-    

-    private static List<String> parameterNames = makeImmutableList("T", "I");

-    

-    private Match(final FAMTerminator pT, final InformationLink pI) {

-      this.fT = pT;

-      this.fI = pI;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("T".equals(parameterName)) return this.fT;

-      if ("I".equals(parameterName)) return this.fI;

-      return null;

-    }

-    

-    public FAMTerminator getT() {

-      return this.fT;

-    }

-    

-    public InformationLink getI() {

-      return this.fI;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("T".equals(parameterName) ) {

-          this.fT = (FAMTerminator) newValue;

-          return true;

-      }

-      if ("I".equals(parameterName) ) {

-          this.fI = (InformationLink) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setT(final FAMTerminator pT) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fT = pT;

-    }

-    

-    public void setI(final InformationLink pI) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fI = pI;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.terminatorAndInformation";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return TerminatorAndInformation.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fT, fI};

-    }

-    

-    @Override

-    public TerminatorAndInformation.Match toImmutable() {

-      return isMutable() ? newMatch(fT, fI) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"T\"=" + prettyPrintValue(fT) + ", ");

-      result.append("\"I\"=" + prettyPrintValue(fI));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fT, fI);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof TerminatorAndInformation.Match)) {

-          TerminatorAndInformation.Match other = (TerminatorAndInformation.Match) obj;

-          return Objects.equals(fT, other.fT) && Objects.equals(fI, other.fI);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public TerminatorAndInformation specification() {

-      return TerminatorAndInformation.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static TerminatorAndInformation.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static TerminatorAndInformation.Match newMutableMatch(final FAMTerminator pT, final InformationLink pI) {

-      return new Mutable(pT, pI);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static TerminatorAndInformation.Match newMatch(final FAMTerminator pT, final InformationLink pI) {

-      return new Immutable(pT, pI);

-    }

-    

-    private static final class Mutable extends TerminatorAndInformation.Match {

-      Mutable(final FAMTerminator pT, final InformationLink pI) {

-        super(pT, pI);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends TerminatorAndInformation.Match {

-      Immutable(final FAMTerminator pT, final InformationLink pI) {

-        super(pT, pI);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.terminatorAndInformation pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(message="terminatorAndInformation", severity="error", key={T})

-   * pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {

-   *    FunctionalOutput.outgoingLinks(Out,I);

-   *    FunctionalOutput.terminator(Out,T); 

-   * } or {

-   *    InformationLink.to(I,In);

-   *    FunctionalInput.terminator(In,T);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see TerminatorAndInformation

-   * 

-   */

-  public static class Matcher extends BaseMatcher<TerminatorAndInformation.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static TerminatorAndInformation.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static TerminatorAndInformation.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_T = 0;

-    

-    private final static int POSITION_I = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TerminatorAndInformation.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<TerminatorAndInformation.Match> getAllMatches(final FAMTerminator pT, final InformationLink pI) {

-      return rawStreamAllMatches(new Object[]{pT, pI}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<TerminatorAndInformation.Match> streamAllMatches(final FAMTerminator pT, final InformationLink pI) {

-      return rawStreamAllMatches(new Object[]{pT, pI});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<TerminatorAndInformation.Match> getOneArbitraryMatch(final FAMTerminator pT, final InformationLink pI) {

-      return rawGetOneArbitraryMatch(new Object[]{pT, pI});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final FAMTerminator pT, final InformationLink pI) {

-      return rawHasMatch(new Object[]{pT, pI});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final FAMTerminator pT, final InformationLink pI) {

-      return rawCountMatches(new Object[]{pT, pI});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final FAMTerminator pT, final InformationLink pI, final Consumer<? super TerminatorAndInformation.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pT, pI}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter T, or null if not bound.

-     * @param pI the fixed value of pattern parameter I, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public TerminatorAndInformation.Match newMatch(final FAMTerminator pT, final InformationLink pI) {

-      return TerminatorAndInformation.Match.newMatch(pT, pI);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<FAMTerminator> rawStreamAllValuesOfT(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_T, parameters).map(FAMTerminator.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FAMTerminator> getAllValuesOfT() {

-      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FAMTerminator> streamAllValuesOfT() {

-      return rawStreamAllValuesOfT(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FAMTerminator> streamAllValuesOfT(final TerminatorAndInformation.Match partialMatch) {

-      return rawStreamAllValuesOfT(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FAMTerminator> streamAllValuesOfT(final InformationLink pI) {

-      return rawStreamAllValuesOfT(new Object[]{null, pI});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FAMTerminator> getAllValuesOfT(final TerminatorAndInformation.Match partialMatch) {

-      return rawStreamAllValuesOfT(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for T.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FAMTerminator> getAllValuesOfT(final InformationLink pI) {

-      return rawStreamAllValuesOfT(new Object[]{null, pI}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<InformationLink> rawStreamAllValuesOfI(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_I, parameters).map(InformationLink.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<InformationLink> getAllValuesOfI() {

-      return rawStreamAllValuesOfI(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<InformationLink> streamAllValuesOfI() {

-      return rawStreamAllValuesOfI(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<InformationLink> streamAllValuesOfI(final TerminatorAndInformation.Match partialMatch) {

-      return rawStreamAllValuesOfI(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<InformationLink> streamAllValuesOfI(final FAMTerminator pT) {

-      return rawStreamAllValuesOfI(new Object[]{pT, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<InformationLink> getAllValuesOfI(final TerminatorAndInformation.Match partialMatch) {

-      return rawStreamAllValuesOfI(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for I.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<InformationLink> getAllValuesOfI(final FAMTerminator pT) {

-      return rawStreamAllValuesOfI(new Object[]{pT, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected TerminatorAndInformation.Match tupleToMatch(final Tuple t) {

-      try {

-          return TerminatorAndInformation.Match.newMatch((FAMTerminator) t.get(POSITION_T), (InformationLink) t.get(POSITION_I));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected TerminatorAndInformation.Match arrayToMatch(final Object[] match) {

-      try {

-          return TerminatorAndInformation.Match.newMatch((FAMTerminator) match[POSITION_T], (InformationLink) match[POSITION_I]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected TerminatorAndInformation.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return TerminatorAndInformation.Match.newMutableMatch((FAMTerminator) match[POSITION_T], (InformationLink) match[POSITION_I]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<TerminatorAndInformation.Matcher> querySpecification() {

-      return TerminatorAndInformation.instance();

-    }

-  }

-  

-  private TerminatorAndInformation() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static TerminatorAndInformation instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected TerminatorAndInformation.Matcher instantiate(final ViatraQueryEngine engine) {

-    return TerminatorAndInformation.Matcher.on(engine);

-  }

-  

-  @Override

-  public TerminatorAndInformation.Matcher instantiate() {

-    return TerminatorAndInformation.Matcher.create();

-  }

-  

-  @Override

-  public TerminatorAndInformation.Match newEmptyMatch() {

-    return TerminatorAndInformation.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public TerminatorAndInformation.Match newMatch(final Object... parameters) {

-    return TerminatorAndInformation.Match.newMatch((functionalarchitecture.FAMTerminator) parameters[0], (functionalarchitecture.InformationLink) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.TerminatorAndInformation (visibility: PUBLIC, simpleName: TerminatorAndInformation, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.TerminatorAndInformation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.TerminatorAndInformation (visibility: PUBLIC, simpleName: TerminatorAndInformation, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.TerminatorAndInformation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static TerminatorAndInformation INSTANCE = new TerminatorAndInformation();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static TerminatorAndInformation.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_T = new PParameter("T", "functionalarchitecture.FAMTerminator", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FAMTerminator")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_I = new PParameter("I", "functionalarchitecture.InformationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "InformationLink")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_T, parameter_I);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.terminatorAndInformation";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("T","I");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_T = body.getOrCreateVariableByName("T");

-          PVariable var_I = body.getOrCreateVariableByName("I");

-          PVariable var_Out = body.getOrCreateVariableByName("Out");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FAMTerminator")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_I), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "InformationLink")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_T, parameter_T),

-             new ExportedParameter(body, var_I, parameter_I)

-          ));

-          //    FunctionalOutput.outgoingLinks(Out,I)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Out), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FunctionalOutput")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Out, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FunctionalOutput", "outgoingLinks")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "InformationLink")));

-          new Equality(body, var__virtual_0_, var_I);

-          //    FunctionalOutput.terminator(Out,T)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Out), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FunctionalOutput")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_Out, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FunctionalData", "terminator")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FAMTerminator")));

-          new Equality(body, var__virtual_1_, var_T);

-          bodies.add(body);

-      }

-      {

-          PBody body = new PBody(this);

-          PVariable var_T = body.getOrCreateVariableByName("T");

-          PVariable var_I = body.getOrCreateVariableByName("I");

-          PVariable var_In = body.getOrCreateVariableByName("In");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FAMTerminator")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_I), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "InformationLink")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_T, parameter_T),

-             new ExportedParameter(body, var_I, parameter_I)

-          ));

-          //    InformationLink.to(I,In)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_I), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "InformationLink")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_I, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "InformationLink", "to")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FunctionalInput")));

-          new Equality(body, var__virtual_0_, var_In);

-          //    FunctionalInput.terminator(In,T)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_In), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FunctionalInput")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_In, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FunctionalData", "terminator")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.inf.mit.bme.hu/viatrasolver/example/fam", "FAMTerminator")));

-          new Equality(body, var__virtual_1_, var_T);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("message", "terminatorAndInformation");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("T")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
index 18b3badd..35b76350 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
@@ -1,11 +1,10 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration

-import functionalarchitecture.FunctionalarchitecturePackage

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration

-import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult

@@ -13,91 +12,48 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace

-import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

-import java.util.List

-import org.eclipse.emf.ecore.EAttribute

-import org.eclipse.emf.ecore.EClass

-import org.eclipse.emf.ecore.EEnum

-import org.eclipse.emf.ecore.EEnumLiteral

-import org.eclipse.emf.ecore.EObject

-import org.eclipse.emf.ecore.EReference

-import org.eclipse.emf.ecore.resource.Resource

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

 

 class EcoreTest {

         def static void main(String[] args) {

                 val inputs = new FileSystemWorkspace('''initialModels/''', "")

-                val workspace = new FileSystemWorkspace('''output/FAMTest/''', "")

+                val workspace = new FileSystemWorkspace('''output/FEcoreTest/''', "")

                 workspace.initAndClear

 

                 println("Input and output workspaces are created")

 

-                val metamodel = loadMetamodel()

-                val partialModel = loadPartialModel(inputs)

-//              val queries = loadQueries(metamodel)

+                val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE)

+                val partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi")

+//              val queries = GeneralTest.loadQueries(metamodel, ecorePatterns.instance)

+                val queries = null

 

                 println("DSL loaded")

-                

+

                 val Ecore2Logic ecore2Logic = new Ecore2Logic

                 val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)

                 val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)

                 val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic

-                

-                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel,new Ecore2LogicConfiguration())

-                val modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem,partialModel)

+

+                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())

+                val modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel)

 //              val validModelExtensionProblem = viatra2Logic.transformQueries(queries,modelGenerationProblem,new Viatra2LogicConfiguration)

-                

                 val logicProblem = modelGenerationProblem.output

 //              val logicProblem = modelExtensionProblem.output

 //              val logicProblem = validModelExtensionProblem.output

-                

-                

                 println("Problem created")

-                

+

                 var LogicResult solution

                 var LogicReasoner reasoner

-                //*

+                // *

                 reasoner = new VampireSolver

                 val vampireConfig = new VampireSolverConfiguration => [

-                        //add configuration things, in config file first

+                        // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

                 ]

-                

-                solution = reasoner.solve(logicProblem, vampireConfig,  workspace)

-                

-                println("Problem solved")

-                

-                

-        }

 

-        def private static loadMetamodel() {

-                val pckg = FunctionalarchitecturePackage.eINSTANCE

-                val List<EClass> classes = pckg.getEClassifiers.filter(EClass).toList

-                val List<EEnum> enums = pckg.getEClassifiers.filter(EEnum).toList

-                val List<EEnumLiteral> literals = enums.map[getELiterals].flatten.toList

-                val List<EReference> references = classes.map[getEReferences].flatten.toList

-                val List<EAttribute> attributes = classes.map[getEAttributes].flatten.toList

-                return new EcoreMetamodelDescriptor(classes,#{},false,enums,literals,references,attributes)

-        }

+                solution = reasoner.solve(logicProblem, vampireConfig, workspace)

 

-        def private static loadPartialModel(ReasonerWorkspace inputs) {

-                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());

-//              inputs.readModel(EObject,"FunctionalArchitectureModel.xmi").eResource.allContents.toList

-                inputs.readModel(EObject,"FamInstance.xmi").eResource.allContents.toList

-        }

+                println("Problem solved")

 

-        def private static loadQueries(EcoreMetamodelDescriptor metamodel) {

-//              val i = Patterns.instance

-//              val patterns = i.specifications.toList

-//              val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet

-//              val derivedFeatures = new LinkedHashMap

-//              derivedFeatures.put(i.type,metamodel.attributes.filter[it.name == "type"].head)

-//              derivedFeatures.put(i.model,metamodel.references.filter[it.name == "model"].head)

-//              val res = new ViatraQuerySetDescriptor(

-//                      patterns,

-//                      wfPatterns,

-//                      derivedFeatures

-//              )

-//              return res

         }

+

 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
index f66ad93c..3fc3d70f 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
@@ -1,6 +1,5 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

-import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration

 import functionalarchitecture.Function

@@ -39,14 +38,15 @@ class FAMTest {
 

                 // Load DSL

                 val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE)

-                val partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi")

-                val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance)

+                val partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi")

+//              val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance)

+                val queries = null

 

                 println("DSL loaded")

 

                 val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())

                 var problem = modelGenerationProblem.output

-//              problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

+                problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

 //              problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output

                 workspace.writeModel(problem, "Fam.logicproblem")

 

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
index 50639577..d4cbb299 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
@@ -1,7 +1,7 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

-import ca.mcgill.ecse.dslreasoner.vampire.queries

 import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage

+import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic

@@ -24,7 +24,7 @@ class FileSystemTest {
 

                 // Workspace setup

                 val inputs = new FileSystemWorkspace('''initialModels/''', "")

-                val workspace = new FileSystemWorkspace('''output/FAMTest/''', "")

+                val workspace = new FileSystemWorkspace('''output/FileSystemTest/''', "")

                 workspace.initAndClear

 

                 // Logicproblem writing setup

@@ -34,9 +34,10 @@ class FileSystemTest {
 

                 println("Input and output workspaces are created")

 

+

                 val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE)

                 val partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi")

-                //val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance)

+                val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance)

 

                 println("DSL loaded")

 

@@ -44,7 +45,7 @@ class FileSystemTest {
                 var problem = modelGenerationProblem.output

 //              problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

 //              problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output

-                workspace.writeModel(problem, "Fam.logicproblem")

+                workspace.writeModel(problem, "FileSystem.logicproblem")

 

                 println("Problem created")

 

@@ -75,8 +76,8 @@ class FileSystemTest {
                         // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

 

-                        it.typeScopes.minNewElements = 4

-                        it.typeScopes.maxNewElements = 5

+                        it.typeScopes.minNewElements = 40

+                        it.typeScopes.maxNewElements = 59

                         if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

                         if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

                         it.contCycleLevel = 5

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
index 1fac968b..f0d88b49 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
@@ -35,7 +35,7 @@ class YakinduTest {
 

                 val metamodel = GeneralTest.loadMetamodel(yakinduPackage.eINSTANCE)

                 val partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/yakinduinstance.xmi")

-//              val queries = GeneralTest.loadQueries(metamodel, FamPa

+//              val queries = GeneralTest.loadQueries(metamodel, yakinduPatterns.instance)

                 val queries = null

 

                 println("DSL loaded")

@@ -75,8 +75,8 @@ class YakinduTest {
                         // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

 

-                        it.typeScopes.minNewElements = 20

-                        it.typeScopes.maxNewElements = 30

+                        it.typeScopes.minNewElements = 53

+                        it.typeScopes.maxNewElements = 53

                         if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

                         if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

                         it.contCycleLevel = 5

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
index 55d90ac7..2cecdaac 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
index 8eeb2d28..a34ab846 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
index ab6aaf6e..a18fd1a5 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
index cd75a66c..0969c84c 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
index 1b920064..f0af3ba5 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
index 820dd354..7019f162 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
@@ -1,9 +1,9 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;

+import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

-import com.google.common.collect.Iterables;

-import functionalarchitecture.FunctionalarchitecturePackage;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;

@@ -17,27 +17,11 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore;
 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

-import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

 import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

 import org.eclipse.xtend2.lib.StringConcatenation;

-import org.eclipse.xtext.xbase.lib.CollectionLiterals;

 import org.eclipse.xtext.xbase.lib.Exceptions;

-import org.eclipse.xtext.xbase.lib.Functions.Function1;

 import org.eclipse.xtext.xbase.lib.InputOutput;

-import org.eclipse.xtext.xbase.lib.IterableExtensions;

-import org.eclipse.xtext.xbase.lib.IteratorExtensions;

-import org.eclipse.xtext.xbase.lib.ListExtensions;

 import org.eclipse.xtext.xbase.lib.ObjectExtensions;

 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

 

@@ -49,12 +33,13 @@ public class EcoreTest {
       _builder.append("initialModels/");

       final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

       StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("output/FAMTest/");

+      _builder_1.append("output/FEcoreTest/");

       final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

       workspace.initAndClear();

       InputOutput.<String>println("Input and output workspaces are created");

-      final EcoreMetamodelDescriptor metamodel = EcoreTest.loadMetamodel();

-      final List<EObject> partialModel = EcoreTest.loadPartialModel(inputs);

+      final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);

+      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");

+      final Object queries = null;

       InputOutput.<String>println("DSL loaded");

       final Ecore2Logic ecore2Logic = new Ecore2Logic();

       final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic);

@@ -80,38 +65,4 @@ public class EcoreTest {
       throw Exceptions.sneakyThrow(_e);

     }

   }

-  

-  private static EcoreMetamodelDescriptor loadMetamodel() {

-    final FunctionalarchitecturePackage pckg = FunctionalarchitecturePackage.eINSTANCE;

-    final List<EClass> classes = IterableExtensions.<EClass>toList(Iterables.<EClass>filter(pckg.getEClassifiers(), EClass.class));

-    final List<EEnum> enums = IterableExtensions.<EEnum>toList(Iterables.<EEnum>filter(pckg.getEClassifiers(), EEnum.class));

-    final Function1<EEnum, EList<EEnumLiteral>> _function = (EEnum it) -> {

-      return it.getELiterals();

-    };

-    final List<EEnumLiteral> literals = IterableExtensions.<EEnumLiteral>toList(Iterables.<EEnumLiteral>concat(ListExtensions.<EEnum, EList<EEnumLiteral>>map(enums, _function)));

-    final Function1<EClass, EList<EReference>> _function_1 = (EClass it) -> {

-      return it.getEReferences();

-    };

-    final List<EReference> references = IterableExtensions.<EReference>toList(Iterables.<EReference>concat(ListExtensions.<EClass, EList<EReference>>map(classes, _function_1)));

-    final Function1<EClass, EList<EAttribute>> _function_2 = (EClass it) -> {

-      return it.getEAttributes();

-    };

-    final List<EAttribute> attributes = IterableExtensions.<EAttribute>toList(Iterables.<EAttribute>concat(ListExtensions.<EClass, EList<EAttribute>>map(classes, _function_2)));

-    return new EcoreMetamodelDescriptor(classes, Collections.<EClass>unmodifiableSet(CollectionLiterals.<EClass>newHashSet()), false, enums, literals, references, attributes);

-  }

-  

-  private static List<EObject> loadPartialModel(final ReasonerWorkspace inputs) {

-    List<EObject> _xblockexpression = null;

-    {

-      Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();

-      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

-      _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);

-      _xblockexpression = IteratorExtensions.<EObject>toList(inputs.<EObject>readModel(EObject.class, "FamInstance.xmi").eResource().getAllContents());

-    }

-    return _xblockexpression;

-  }

-  

-  private static Object loadQueries(final EcoreMetamodelDescriptor metamodel) {

-    return null;

-  }

 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
index 5fc2a391..08f1b4a7 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
@@ -1,7 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

 import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

 import functionalarchitecture.Function;

@@ -18,7 +17,6 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

-import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

 import java.util.HashMap;

@@ -53,12 +51,13 @@ public class FAMTest {
       map.put("logicproblem", _xMIResourceFactoryImpl);

       InputOutput.<String>println("Input and output workspaces are created");

       final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE);

-      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi");

-      final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance());

+      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi");

+      final Object queries = null;

       InputOutput.<String>println("DSL loaded");

       Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

       final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

       LogicProblem problem = modelGenerationProblem.getOutput();

+      problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput();

       workspace.writeModel(problem, "Fam.logicproblem");

       InputOutput.<String>println("Problem created");

       long startTime = System.currentTimeMillis();

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
index eedec995..f7f8a5ee 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
@@ -2,6 +2,7 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse;
 

 import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;

 import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

+import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

@@ -15,6 +16,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

+import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

 import java.util.HashMap;

@@ -40,7 +42,7 @@ public class FileSystemTest {
       _builder.append("initialModels/");

       final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

       StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("output/FAMTest/");

+      _builder_1.append("output/FileSystemTest/");

       final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

       workspace.initAndClear();

       final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;

@@ -50,11 +52,12 @@ public class FileSystemTest {
       InputOutput.<String>println("Input and output workspaces are created");

       final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);

       final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");

+      final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance());

       InputOutput.<String>println("DSL loaded");

       Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

       final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

       LogicProblem problem = modelGenerationProblem.getOutput();

-      workspace.writeModel(problem, "Fam.logicproblem");

+      workspace.writeModel(problem, "FileSystem.logicproblem");

       InputOutput.<String>println("Problem created");

       long startTime = System.currentTimeMillis();

       LogicReasoner reasoner = null;

@@ -67,8 +70,8 @@ public class FileSystemTest {
       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

       final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

         it.documentationLevel = DocumentationLevel.FULL;

-        it.typeScopes.minNewElements = 4;

-        it.typeScopes.maxNewElements = 5;

+        it.typeScopes.minNewElements = 40;

+        it.typeScopes.maxNewElements = 59;

         int _size = typeMapMin.size();

         boolean _notEquals = (_size != 0);

         if (_notEquals) {

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
index 81079764..3a322ee0 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
@@ -68,8 +68,8 @@ public class YakinduTest {
       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

       final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

         it.documentationLevel = DocumentationLevel.FULL;

-        it.typeScopes.minNewElements = 20;

-        it.typeScopes.maxNewElements = 30;

+        it.typeScopes.minNewElements = 53;

+        it.typeScopes.maxNewElements = 53;

         int _size = typeMapMin.size();

         boolean _notEquals = (_size != 0);

         if (_notEquals) {

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
index 29f8df00..c5ed4b90 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
index 72d33e5d..21fdd9b7 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
index e9c4c0a4..b1887ff2 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin