Add gitignore, commit everything

138 files changed, 7160 insertions, 7633 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/.gitignore b/Application/hu.bme.mit.inf.dslreasoner.application.ide/.gitignore
index ae3c1726..d95727ab 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/.gitignore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/.gitignore
@@ -1 +1,3 @@
 /bin/
+/xtend-gen/
+/src-gen/
\ No newline at end of file
diff --git a/Domains/Examples/ModelGenExampleFAM_standalone/inputs/FamPatterns.vql b/Domains/Examples/ModelGenExampleFAM_standalone/inputs/FamPatterns.vql
index 34394ef6..3966d0af 100644
--- a/Domains/Examples/ModelGenExampleFAM_standalone/inputs/FamPatterns.vql
+++ b/Domains/Examples/ModelGenExampleFAM_standalone/inputs/FamPatterns.vql
@@ -1,7 +1,7 @@
 package hu.bme.mit.inf.dslreasoner.domains.fam

 

-import epackage "http://www.inf.mit.bme.hu/viatrasolver/example/fam"

-//import epackage "platform:/resource/ModelGenExampleFAM/inputs/FamMetamodel.ecore";

+//import epackage "http://www.inf.mit.bme.hu/viatrasolver/example/fam"

+import epackage "platform:/resource/ModelGenExampleFAM/inputs/FamMetamodel.ecore";

 

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

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

diff --git a/Domains/hu.bme.mit.inf.yakinduModelExtractor/src/hu/bme/mit/inf/yakinduModelExtractor/ModelManager.java b/Domains/hu.bme.mit.inf.yakinduModelExtractor/src/hu/bme/mit/inf/yakinduModelExtractor/ModelManager.java
index 85fd208c..951e44a3 100644
--- a/Domains/hu.bme.mit.inf.yakinduModelExtractor/src/hu/bme/mit/inf/yakinduModelExtractor/ModelManager.java
+++ b/Domains/hu.bme.mit.inf.yakinduModelExtractor/src/hu/bme/mit/inf/yakinduModelExtractor/ModelManager.java
@@ -1,21 +1,21 @@
-package hu.bme.mit.inf.yakinduModelExtractor;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
+package hu.bme.mit.inf.yakinduModelExtractor;

+

+import java.io.BufferedWriter;

+import java.io.File;

+import java.io.FileOutputStream;

+import java.io.IOException;

+import java.io.OutputStreamWriter;

+import java.io.Writer;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.yakindu.sct.model.sgraph.SGraphPackage;

 

 public class ModelManager {

@@ -28,27 +28,27 @@ public class ModelManager {
         public void init() {

                 SGraphPackage.eINSTANCE.eClass();

                 NotationPackage.eINSTANCE.eClass();

-                resourceSet = new ResourceSetImpl();
+                resourceSet = new ResourceSetImpl();

                 Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());

         }

-        
-        public List<String> loadAllModelPathsInDirectory(String path) {
-                File directory = new File(path);
-                if(directory.exists() && directory.isDirectory()) {
-                        List<String> filePaths = new LinkedList<>();
-                        for(File f  : directory.listFiles()) {
-                                if(f.isFile()) {
-                                        String filePath =  f.getPath();
-                                        if(filePath.endsWith("sct")) {
-                                                filePaths.add(filePath);
-                                        }
-                                }
-                        }
-                        return filePaths;
-                } else {
-                        throw new IllegalArgumentException("invalid path");
-                }
-        }
+        

+        public List<String> loadAllModelPathsInDirectory(String path) {

+                File directory = new File(path);

+                if(directory.exists() && directory.isDirectory()) {

+                        List<String> filePaths = new LinkedList<>();

+                        for(File f  : directory.listFiles()) {

+                                if(f.isFile()) {

+                                        String filePath =  f.getPath();

+                                        if(filePath.endsWith("sct")) {

+                                                filePaths.add(filePath);

+                                        }

+                                }

+                        }

+                        return filePaths;

+                } else {

+                        throw new IllegalArgumentException("invalid path");

+                }

+        }

         

         public EObject loadModel(String path) {

                 Resource resource = this.resourceSet.getResource(URI.createFileURI(path), true);

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/.classpath b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/.classpath
index e84a3295..a9e661c7 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/.classpath
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/.classpath
@@ -7,5 +7,6 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

         <classpathentry kind="src" path="src"/>

+        <classpathentry kind="src" path="src-gen/"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
index 338e8c09..878247b1 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.logic.model;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,
@@ -22,6 +21,7 @@ Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,
  hu.bme.mit.inf.dslreasoner.util,
  hu.bme.mit.inf.dslreasoner.workspace
 Require-Bundle: org.eclipse.core.runtime,
+<<<<<<< HEAD
  org.eclipse.emf.ecore;visibility:=reexport,
  com.google.guava,
  org.eclipse.xtend.lib,
@@ -30,7 +30,17 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.viatra.query.runtime;bundle-version="1.3.0",
  org.apache.commons.lang;bundle-version="2.6.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.13.0"
+=======
+  org.eclipse.emf.ecore;visibility:=reexport,
+  com.google.guava,
+  org.eclipse.xtend.lib,
+  org.eclipse.xtext.xbase.lib,
+  org.eclipse.core.resources;bundle-version="3.8.101",
+  org.eclipse.viatra.query.runtime;bundle-version="1.3.0",
+  org.apache.commons.lang;bundle-version="2.6.0",
+  org.eclipse.emf.ecore.xmi;bundle-version="2.13.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+>>>>>>> b42fb751... Add gitignore, commit everything
 Import-Package: org.apache.log4j
 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic.model
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/build.properties b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/build.properties
index 9403fc5f..c18a0403 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/build.properties
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/build.properties
@@ -8,5 +8,6 @@ source.. = ecore-gen/,\
            src/,\

            xtend-gen/,\

            patterns/,\

-           vql-gen/

+           vql-gen/,\

+           src-gen/

 output.. = bin/

diff --git a/Metrics/ca.mcgill.ecse.dslreasoner.realistic.metrics/bin/ca/mcgill/ecse/dslreasoner/realistic/metrics/examples/.CSERposterSample.java._trace b/Metrics/ca.mcgill.ecse.dslreasoner.realistic.metrics/bin/ca/mcgill/ecse/dslreasoner/realistic/metrics/examples/.CSERposterSample.java._trace
new file mode 100644
index 00000000..32fa550b
--- /dev/null
+++ b/Metrics/ca.mcgill.ecse.dslreasoner.realistic.metrics/bin/ca/mcgill/ecse/dslreasoner/realistic/metrics/examples/.CSERposterSample.java._trace
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
index de68b5f7..a29b9deb 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
@@ -7,5 +7,6 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

         <classpathentry kind="src" path="src"/>

+        <classpathentry kind="src" path="src-gen/"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/build.properties b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/build.properties
index 685c072b..1eb934ae 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/build.properties
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/build.properties
@@ -6,5 +6,6 @@ jars.compile.order = .
 source.. = src/,\

            queries/,\

            xtend-gen/,\

-           vql-gen/

+           vql-gen/,\

+           src-gen/

 output.. = bin/

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/.classpath b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/.classpath
deleted file mode 100644
index a0c6dd9c..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-        <classpathentry kind="src" path="src"/>

-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-        <classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/META-INF/MANIFEST.MF
deleted file mode 100644
index f4f91de8..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: ca.mcgill.ecse.dslreasoner.trace.logic2vampire

-Bundle-SymbolicName: ca.mcgill.ecse.dslreasoner.trace.logic2vampire; singleton:=true

-Bundle-Version: 0.1.0.qualifier

-Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.core.runtime

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.aird b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.aird
deleted file mode 100644
index 4fda4ff6..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.aird
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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: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">

-  <viewpoint:DAnalysis xmi:id="_c5vPUBjhEemoVuGVD8l-rg" selectedViews="_c-elYBjhEemoVuGVD8l-rg" version="12.0.0.201704271200">

-    <semanticResources>logic2vampire.ecore</semanticResources>

-    <semanticResources>logic2vampire.genmodel</semanticResources>

-    <ownedViews xmi:type="viewpoint:DView" xmi:id="_c-elYBjhEemoVuGVD8l-rg">

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

-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_dEOBABjhEemoVuGVD8l-rg" name="logic2vampire" repPath="#_dEIhcBjhEemoVuGVD8l-rg">

-        <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="logic2vampire.ecore#/"/>

-      </ownedRepresentationDescriptors>

-    </ownedViews>

-  </viewpoint:DAnalysis>

-  <diagram:DSemanticDiagram xmi:id="_dEIhcBjhEemoVuGVD8l-rg" name="logic2vampire">

-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_dEIhcRjhEemoVuGVD8l-rg" source="DANNOTATION_CUSTOMIZATION_KEY">

-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_dEIhchjhEemoVuGVD8l-rg"/>

-    </ownedAnnotationEntries>

-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_dFEVkBjhEemoVuGVD8l-rg" source="GMF_DIAGRAMS">

-      <data xmi:type="notation:Diagram" xmi:id="_dFEVkRjhEemoVuGVD8l-rg" type="Sirius" element="_dEIhcBjhEemoVuGVD8l-rg" measurementUnit="Pixel">

-        <styles xmi:type="notation:DiagramStyle" xmi:id="_dFEVkhjhEemoVuGVD8l-rg"/>

-      </data>

-    </ownedAnnotationEntries>

-    <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" xmi:id="_dEIhdBjhEemoVuGVD8l-rg"/>

-    <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']"/>

-    <target xmi:type="ecore:EPackage" href="logic2vampire.ecore#/"/>

-  </diagram:DSemanticDiagram>

-</xmi:XMI>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.ecore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.ecore
deleted file mode 100644
index 0cdf6d7f..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.ecore
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    name="logic2vampire" nsURI="http://www.example.org/logic2vampire"

-    nsPrefix="logic2vampire"/>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.genmodel b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.genmodel
deleted file mode 100644
index 32de743d..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/model/logic2vampire.genmodel
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/src-gen"

-    creationIcons="false" editDirectory="/ca.mcgill.ecse.dslreasoner.trace.logic2vampire.edit/src-gen"

-    editorDirectory="/ca.mcgill.ecse.dslreasoner.trace.logic2vampire.editor/src-gen"

-    modelPluginID="ca.mcgill.ecse.dslreasoner.trace.logic2vampire" modelName="Logic2vampire"

-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>logic2vampire.ecore</foreignModel>

-  <testsDirectory xsi:nil="true"/>

-  <genPackages prefix="Logic2vampire" basePackage="ca.mcgill.ecse.dslreasoner.trace"

-      disposableProviderFactory="true" ecorePackage="logic2vampire.ecore#/"/>

-</genmodel:GenModel>

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 035b992e..416a4ced 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 3a2b0f09..4c3a5366 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 b8a39035..b9e07a68 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 c462e145..f51dce03 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 2d3b2709..23bdd607 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 8640966e..438765b1 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 183e5e40..fb05770c 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 7c2fb4bf..1626ed6c 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/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFiniteModel.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFiniteModel.java
deleted file mode 100644
index bfd23d8d..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFiniteModel.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

-package ca.mcgill.ecse.dslreasoner.vampireLanguage;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>VLS Finite Model</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFiniteModel()

- * @model

- * @generated

- */

-public interface VLSFiniteModel extends EObject

-{

-} // VLSFiniteModel

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionFof.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionFof.java
deleted file mode 100644
index d151685f..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionFof.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

-package ca.mcgill.ecse.dslreasoner.vampireLanguage;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>VLS Function Fof</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getFunctor <em>Functor</em>}</li>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getTerms <em>Terms</em>}</li>

- * </ul>

- *

- * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionFof()

- * @model

- * @generated

- */

-public interface VLSFunctionFof extends VLSTerm

-{

-  /**

-   * Returns the value of the '<em><b>Functor</b></em>' attribute.

-   * <!-- begin-user-doc -->

-   * <p>

-   * If the meaning of the '<em>Functor</em>' attribute isn't clear,

-   * there really should be more of a description here...

-   * </p>

-   * <!-- end-user-doc -->

-   * @return the value of the '<em>Functor</em>' attribute.

-   * @see #setFunctor(String)

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionFof_Functor()

-   * @model

-   * @generated

-   */

-  String getFunctor();

-

-  /**

-   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getFunctor <em>Functor</em>}' attribute.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @param value the new value of the '<em>Functor</em>' attribute.

-   * @see #getFunctor()

-   * @generated

-   */

-  void setFunctor(String value);

-

-  /**

-   * Returns the value of the '<em><b>Terms</b></em>' containment reference list.

-   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm}.

-   * <!-- begin-user-doc -->

-   * <p>

-   * If the meaning of the '<em>Terms</em>' containment reference list isn't clear,

-   * there really should be more of a description here...

-   * </p>

-   * <!-- end-user-doc -->

-   * @return the value of the '<em>Terms</em>' containment reference list.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionFof_Terms()

-   * @model containment="true"

-   * @generated

-   */

-  EList<VLSTerm> getTerms();

-

-} // VLSFunctionFof

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrying.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrying.java
deleted file mode 100644
index c2080a9c..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrying.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

-package ca.mcgill.ecse.dslreasoner.vampireLanguage;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>VLS Trying</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying#getName <em>Name</em>}</li>

- * </ul>

- *

- * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTrying()

- * @model

- * @generated

- */

-public interface VLSTrying extends EObject

-{

-  /**

-   * Returns the value of the '<em><b>Name</b></em>' attribute.

-   * <!-- begin-user-doc -->

-   * <p>

-   * If the meaning of the '<em>Name</em>' attribute isn't clear,

-   * there really should be more of a description here...

-   * </p>

-   * <!-- end-user-doc -->

-   * @return the value of the '<em>Name</em>' attribute.

-   * @see #setName(String)

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTrying_Name()

-   * @model

-   * @generated

-   */

-  String getName();

-

-  /**

-   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying#getName <em>Name</em>}' attribute.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @param value the new value of the '<em>Name</em>' attribute.

-   * @see #getName()

-   * @generated

-   */

-  void setName(String value);

-

-} // VLSTrying

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFiniteModelImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFiniteModelImpl.java
deleted file mode 100644
index dfbbf6ed..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFiniteModelImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

-package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

-

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

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

-

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

-

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>VLS Finite Model</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VLSFiniteModelImpl extends MinimalEObjectImpl.Container implements VLSFiniteModel

-{

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  protected VLSFiniteModelImpl()

-  {

-    super();

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  protected EClass eStaticClass()

-  {

-    return VampireLanguagePackage.Literals.VLS_FINITE_MODEL;

-  }

-

-} //VLSFiniteModelImpl

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionFofImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionFofImpl.java
deleted file mode 100644
index 6d1c538b..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionFofImpl.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

-package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

-

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

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

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

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

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

-

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

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

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>VLS Function Fof</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl#getFunctor <em>Functor</em>}</li>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl#getTerms <em>Terms</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class VLSFunctionFofImpl extends VLSTermImpl implements VLSFunctionFof

-{

-  /**

-   * The default value of the '{@link #getFunctor() <em>Functor</em>}' attribute.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @see #getFunctor()

-   * @generated

-   * @ordered

-   */

-  protected static final String FUNCTOR_EDEFAULT = null;

-

-  /**

-   * The cached value of the '{@link #getFunctor() <em>Functor</em>}' attribute.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @see #getFunctor()

-   * @generated

-   * @ordered

-   */

-  protected String functor = FUNCTOR_EDEFAULT;

-

-  /**

-   * The cached value of the '{@link #getTerms() <em>Terms</em>}' containment reference list.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @see #getTerms()

-   * @generated

-   * @ordered

-   */

-  protected EList<VLSTerm> terms;

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  protected VLSFunctionFofImpl()

-  {

-    super();

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  protected EClass eStaticClass()

-  {

-    return VampireLanguagePackage.Literals.VLS_FUNCTION_FOF;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public String getFunctor()

-  {

-    return functor;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public void setFunctor(String newFunctor)

-  {

-    String oldFunctor = functor;

-    functor = newFunctor;

-    if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_FUNCTION_FOF__FUNCTOR, oldFunctor, functor));

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public EList<VLSTerm> getTerms()

-  {

-    if (terms == null)

-    {

-      terms = new EObjectContainmentEList<VLSTerm>(VLSTerm.class, this, VampireLanguagePackage.VLS_FUNCTION_FOF__TERMS);

-    }

-    return terms;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__TERMS:

-        return ((InternalEList<?>)getTerms()).basicRemove(otherEnd, msgs);

-    }

-    return super.eInverseRemove(otherEnd, featureID, msgs);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public Object eGet(int featureID, boolean resolve, boolean coreType)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__FUNCTOR:

-        return getFunctor();

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__TERMS:

-        return getTerms();

-    }

-    return super.eGet(featureID, resolve, coreType);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @SuppressWarnings("unchecked")

-  @Override

-  public void eSet(int featureID, Object newValue)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__FUNCTOR:

-        setFunctor((String)newValue);

-        return;

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__TERMS:

-        getTerms().clear();

-        getTerms().addAll((Collection<? extends VLSTerm>)newValue);

-        return;

-    }

-    super.eSet(featureID, newValue);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public void eUnset(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__FUNCTOR:

-        setFunctor(FUNCTOR_EDEFAULT);

-        return;

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__TERMS:

-        getTerms().clear();

-        return;

-    }

-    super.eUnset(featureID);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public boolean eIsSet(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__FUNCTOR:

-        return FUNCTOR_EDEFAULT == null ? functor != null : !FUNCTOR_EDEFAULT.equals(functor);

-      case VampireLanguagePackage.VLS_FUNCTION_FOF__TERMS:

-        return terms != null && !terms.isEmpty();

-    }

-    return super.eIsSet(featureID);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public String toString()

-  {

-    if (eIsProxy()) return super.toString();

-

-    StringBuffer result = new StringBuffer(super.toString());

-    result.append(" (functor: ");

-    result.append(functor);

-    result.append(')');

-    return result.toString();

-  }

-

-} //VLSFunctionFofImpl

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTryingImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTryingImpl.java
deleted file mode 100644
index 40e62d9e..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTryingImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

-package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

-

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

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

-

-import org.eclipse.emf.common.notify.Notification;

-

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

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>VLS Trying</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl#getName <em>Name</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class VLSTryingImpl extends MinimalEObjectImpl.Container implements VLSTrying

-{

-  /**

-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @see #getName()

-   * @generated

-   * @ordered

-   */

-  protected static final String NAME_EDEFAULT = null;

-

-  /**

-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @see #getName()

-   * @generated

-   * @ordered

-   */

-  protected String name = NAME_EDEFAULT;

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  protected VLSTryingImpl()

-  {

-    super();

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  protected EClass eStaticClass()

-  {

-    return VampireLanguagePackage.Literals.VLS_TRYING;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public String getName()

-  {

-    return name;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public void setName(String newName)

-  {

-    String oldName = name;

-    name = newName;

-    if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TRYING__NAME, oldName, name));

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public Object eGet(int featureID, boolean resolve, boolean coreType)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TRYING__NAME:

-        return getName();

-    }

-    return super.eGet(featureID, resolve, coreType);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public void eSet(int featureID, Object newValue)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TRYING__NAME:

-        setName((String)newValue);

-        return;

-    }

-    super.eSet(featureID, newValue);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public void eUnset(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TRYING__NAME:

-        setName(NAME_EDEFAULT);

-        return;

-    }

-    super.eUnset(featureID);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public boolean eIsSet(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TRYING__NAME:

-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-    }

-    return super.eIsSet(featureID);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public String toString()

-  {

-    if (eIsProxy()) return super.toString();

-

-    StringBuffer result = new StringBuffer(super.toString());

-    result.append(" (name: ");

-    result.append(name);

-    result.append(')');

-    return result.toString();

-  }

-

-} //VLSTryingImpl

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 415d0cc9..c38505ea 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 9d43d4a1..3ab52ff6 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 d3a5a764..e845ff1e 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 dd4b1eaa..d45af918 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 a3a95c68..cc9d50ce 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 88c7412c..0418e131 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.queries/.gitignore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/.gitignore
index ae3c1726..39fc9cc5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/.gitignore
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/.gitignore
@@ -1 +1,2 @@
 /bin/
+/src-gen/
\ No newline at end of file
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSAnd.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSAnd.java
deleted file mode 100644
index 23d9293f..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSAnd.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSAnd(term: VLSAnd){

- *              VLSAnd(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSAnd.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSAnd.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSAnd specification() {

-      return VLSAnd.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 VLSAnd.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSAnd.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSAnd.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSAnd.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSAnd.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd 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>

-   * pattern VLSAnd(term: VLSAnd){

-   *    VLSAnd(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSAnd

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSAnd.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 VLSAnd.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 VLSAnd.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSAnd.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSAnd.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSAnd.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSAnd.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm, final Consumer<? super VLSAnd.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSAnd.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd pTerm) {

-      return VLSAnd.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSAnd.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSAnd.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSAnd.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSAnd.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSAnd.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSAnd.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd) match[POSITION_TERM]);

-      } 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<VLSAnd.Matcher> querySpecification() {

-      return VLSAnd.instance();

-    }

-  }

-  

-  private VLSAnd() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSAnd instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSAnd.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSAnd.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSAnd.Matcher instantiate() {

-    return VLSAnd.Matcher.create();

-  }

-  

-  @Override

-  public VLSAnd.Match newEmptyMatch() {

-    return VLSAnd.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSAnd.Match newMatch(final Object... parameters) {

-    return VLSAnd.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd (visibility: PUBLIC, simpleName: VLSAnd, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd, 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.VLSAnd (visibility: PUBLIC, simpleName: VLSAnd, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd, 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 VLSAnd INSTANCE = new VLSAnd();

-    

-    /**

-     * 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 VLSAnd.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnd")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnd")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSAnd(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnd")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSAnnotation.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSAnnotation.java
deleted file mode 100644
index 282d813f..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSAnnotation.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSAnnotation(term: VLSAnnotation){

- *              VLSAnnotation(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSAnnotation.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSAnnotation.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSAnnotation specification() {

-      return VLSAnnotation.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 VLSAnnotation.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSAnnotation.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSAnnotation.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSAnnotation.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSAnnotation.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation 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>

-   * pattern VLSAnnotation(term: VLSAnnotation){

-   *    VLSAnnotation(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSAnnotation

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSAnnotation.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 VLSAnnotation.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 VLSAnnotation.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSAnnotation.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSAnnotation.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSAnnotation.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSAnnotation.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm, final Consumer<? super VLSAnnotation.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSAnnotation.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation pTerm) {

-      return VLSAnnotation.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSAnnotation.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSAnnotation.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSAnnotation.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSAnnotation.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSAnnotation.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSAnnotation.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation) match[POSITION_TERM]);

-      } 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<VLSAnnotation.Matcher> querySpecification() {

-      return VLSAnnotation.instance();

-    }

-  }

-  

-  private VLSAnnotation() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSAnnotation instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSAnnotation.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSAnnotation.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSAnnotation.Matcher instantiate() {

-    return VLSAnnotation.Matcher.create();

-  }

-  

-  @Override

-  public VLSAnnotation.Match newEmptyMatch() {

-    return VLSAnnotation.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSAnnotation.Match newMatch(final Object... parameters) {

-    return VLSAnnotation.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation (visibility: PUBLIC, simpleName: VLSAnnotation, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation, 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.VLSAnnotation (visibility: PUBLIC, simpleName: VLSAnnotation, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation, 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 VLSAnnotation INSTANCE = new VLSAnnotation();

-    

-    /**

-     * 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 VLSAnnotation.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnnotation")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnnotation")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSAnnotation(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnnotation")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSComment.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSComment.java
deleted file mode 100644
index ec2bfef3..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSComment.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSComment(term: VLSComment){

- *              VLSComment(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSComment.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSComment.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSComment specification() {

-      return VLSComment.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 VLSComment.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSComment.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSComment.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSComment.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSComment.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment 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>

-   * pattern VLSComment(term: VLSComment){

-   *    VLSComment(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSComment

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSComment.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 VLSComment.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 VLSComment.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSComment.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSComment.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSComment.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSComment.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm, final Consumer<? super VLSComment.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSComment.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment pTerm) {

-      return VLSComment.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSComment.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSComment.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSComment.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSComment.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSComment.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSComment.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment) match[POSITION_TERM]);

-      } 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<VLSComment.Matcher> querySpecification() {

-      return VLSComment.instance();

-    }

-  }

-  

-  private VLSComment() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSComment instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSComment.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSComment.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSComment.Matcher instantiate() {

-    return VLSComment.Matcher.create();

-  }

-  

-  @Override

-  public VLSComment.Match newEmptyMatch() {

-    return VLSComment.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSComment.Match newMatch(final Object... parameters) {

-    return VLSComment.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment (visibility: PUBLIC, simpleName: VLSComment, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment, 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.VLSComment (visibility: PUBLIC, simpleName: VLSComment, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment, 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 VLSComment INSTANCE = new VLSComment();

-    

-    /**

-     * 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 VLSComment.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSComment")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSComment")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSComment(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSComment")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSEquivalent.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSEquivalent.java
deleted file mode 100644
index 5a174fed..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSEquivalent.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSEquivalent(term: VLSEquivalent){

- *              VLSEquivalent(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSEquivalent.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSEquivalent.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSEquivalent specification() {

-      return VLSEquivalent.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 VLSEquivalent.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSEquivalent.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSEquivalent.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSEquivalent.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSEquivalent.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent 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>

-   * pattern VLSEquivalent(term: VLSEquivalent){

-   *    VLSEquivalent(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSEquivalent

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSEquivalent.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 VLSEquivalent.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 VLSEquivalent.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSEquivalent.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSEquivalent.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSEquivalent.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSEquivalent.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm, final Consumer<? super VLSEquivalent.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSEquivalent.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent pTerm) {

-      return VLSEquivalent.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSEquivalent.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSEquivalent.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSEquivalent.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSEquivalent.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSEquivalent.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSEquivalent.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent) match[POSITION_TERM]);

-      } 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<VLSEquivalent.Matcher> querySpecification() {

-      return VLSEquivalent.instance();

-    }

-  }

-  

-  private VLSEquivalent() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSEquivalent instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSEquivalent.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSEquivalent.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSEquivalent.Matcher instantiate() {

-    return VLSEquivalent.Matcher.create();

-  }

-  

-  @Override

-  public VLSEquivalent.Match newEmptyMatch() {

-    return VLSEquivalent.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSEquivalent.Match newMatch(final Object... parameters) {

-    return VLSEquivalent.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent (visibility: PUBLIC, simpleName: VLSEquivalent, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent, 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.VLSEquivalent (visibility: PUBLIC, simpleName: VLSEquivalent, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent, 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 VLSEquivalent INSTANCE = new VLSEquivalent();

-    

-    /**

-     * 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 VLSEquivalent.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSEquivalent")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSEquivalent")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSEquivalent(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSEquivalent")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSExistentialQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSExistentialQuantifier.java
deleted file mode 100644
index 137e4ca0..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSExistentialQuantifier.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSExistentialQuantifier(term: VLSExistentialQuantifier){

- *              VLSExistentialQuantifier(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSExistentialQuantifier.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSExistentialQuantifier.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSExistentialQuantifier specification() {

-      return VLSExistentialQuantifier.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 VLSExistentialQuantifier.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSExistentialQuantifier.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSExistentialQuantifier.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSExistentialQuantifier.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSExistentialQuantifier.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier 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>

-   * pattern VLSExistentialQuantifier(term: VLSExistentialQuantifier){

-   *    VLSExistentialQuantifier(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSExistentialQuantifier

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSExistentialQuantifier.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 VLSExistentialQuantifier.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 VLSExistentialQuantifier.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSExistentialQuantifier.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSExistentialQuantifier.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSExistentialQuantifier.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSExistentialQuantifier.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm, final Consumer<? super VLSExistentialQuantifier.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSExistentialQuantifier.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier pTerm) {

-      return VLSExistentialQuantifier.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSExistentialQuantifier.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSExistentialQuantifier.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSExistentialQuantifier.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSExistentialQuantifier.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSExistentialQuantifier.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSExistentialQuantifier.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier) match[POSITION_TERM]);

-      } 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<VLSExistentialQuantifier.Matcher> querySpecification() {

-      return VLSExistentialQuantifier.instance();

-    }

-  }

-  

-  private VLSExistentialQuantifier() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSExistentialQuantifier instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSExistentialQuantifier.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSExistentialQuantifier.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSExistentialQuantifier.Matcher instantiate() {

-    return VLSExistentialQuantifier.Matcher.create();

-  }

-  

-  @Override

-  public VLSExistentialQuantifier.Match newEmptyMatch() {

-    return VLSExistentialQuantifier.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSExistentialQuantifier.Match newMatch(final Object... parameters) {

-    return VLSExistentialQuantifier.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier (visibility: PUBLIC, simpleName: VLSExistentialQuantifier, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier, 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.VLSExistentialQuantifier (visibility: PUBLIC, simpleName: VLSExistentialQuantifier, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier, 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 VLSExistentialQuantifier INSTANCE = new VLSExistentialQuantifier();

-    

-    /**

-     * 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 VLSExistentialQuantifier.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSExistentialQuantifier")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSExistentialQuantifier")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSExistentialQuantifier(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSExistentialQuantifier")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFofFormula.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFofFormula.java
deleted file mode 100644
index f55f408a..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFofFormula.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSFofFormula(term: VLSFofFormula){

- *              VLSFofFormula(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSFofFormula.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSFofFormula.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSFofFormula specification() {

-      return VLSFofFormula.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 VLSFofFormula.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSFofFormula.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSFofFormula.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSFofFormula.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSFofFormula.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula 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>

-   * pattern VLSFofFormula(term: VLSFofFormula){

-   *    VLSFofFormula(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSFofFormula

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSFofFormula.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 VLSFofFormula.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 VLSFofFormula.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFofFormula.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSFofFormula.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSFofFormula.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSFofFormula.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm, final Consumer<? super VLSFofFormula.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSFofFormula.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula pTerm) {

-      return VLSFofFormula.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSFofFormula.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSFofFormula.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSFofFormula.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSFofFormula.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSFofFormula.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSFofFormula.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula) match[POSITION_TERM]);

-      } 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<VLSFofFormula.Matcher> querySpecification() {

-      return VLSFofFormula.instance();

-    }

-  }

-  

-  private VLSFofFormula() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSFofFormula instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSFofFormula.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSFofFormula.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSFofFormula.Matcher instantiate() {

-    return VLSFofFormula.Matcher.create();

-  }

-  

-  @Override

-  public VLSFofFormula.Match newEmptyMatch() {

-    return VLSFofFormula.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSFofFormula.Match newMatch(final Object... parameters) {

-    return VLSFofFormula.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula (visibility: PUBLIC, simpleName: VLSFofFormula, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula, 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.VLSFofFormula (visibility: PUBLIC, simpleName: VLSFofFormula, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula, 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 VLSFofFormula INSTANCE = new VLSFofFormula();

-    

-    /**

-     * 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 VLSFofFormula.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFofFormula")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFofFormula")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSFofFormula(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFofFormula")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFunction.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFunction.java
deleted file mode 100644
index f81a6e1a..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFunction.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSFunction(term: VLSFunction){

- *              VLSFunction(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSFunction.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSFunction.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSFunction specification() {

-      return VLSFunction.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 VLSFunction.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSFunction.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSFunction.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSFunction.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSFunction.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction 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>

-   * pattern VLSFunction(term: VLSFunction){

-   *    VLSFunction(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSFunction

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSFunction.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 VLSFunction.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 VLSFunction.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFunction.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSFunction.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSFunction.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSFunction.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm, final Consumer<? super VLSFunction.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSFunction.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction pTerm) {

-      return VLSFunction.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSFunction.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSFunction.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSFunction.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSFunction.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSFunction.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSFunction.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction) match[POSITION_TERM]);

-      } 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<VLSFunction.Matcher> querySpecification() {

-      return VLSFunction.instance();

-    }

-  }

-  

-  private VLSFunction() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSFunction instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSFunction.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSFunction.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSFunction.Matcher instantiate() {

-    return VLSFunction.Matcher.create();

-  }

-  

-  @Override

-  public VLSFunction.Match newEmptyMatch() {

-    return VLSFunction.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSFunction.Match newMatch(final Object... parameters) {

-    return VLSFunction.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction (visibility: PUBLIC, simpleName: VLSFunction, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction, 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.VLSFunction (visibility: PUBLIC, simpleName: VLSFunction, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction, 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 VLSFunction INSTANCE = new VLSFunction();

-    

-    /**

-     * 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 VLSFunction.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunction")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunction")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSFunction(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunction")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFunctionFof.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFunctionFof.java
deleted file mode 100644
index 86a3b95c..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSFunctionFof.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSFunctionFof(term: VLSFunctionFof){

- *              VLSFunctionFof(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunctionFof 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunctionFof";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSFunctionFof.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSFunctionFof.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSFunctionFof specification() {

-      return VLSFunctionFof.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 VLSFunctionFof.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSFunctionFof.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSFunctionFof.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSFunctionFof.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSFunctionFof.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunctionFof 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>

-   * pattern VLSFunctionFof(term: VLSFunctionFof){

-   *    VLSFunctionFof(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSFunctionFof

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSFunctionFof.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 VLSFunctionFof.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 VLSFunctionFof.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFunctionFof.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSFunctionFof.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSFunctionFof.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSFunctionFof.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm, final Consumer<? super VLSFunctionFof.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSFunctionFof.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) {

-      return VLSFunctionFof.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSFunctionFof.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSFunctionFof.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSFunctionFof.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSFunctionFof.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) match[POSITION_TERM]);

-      } 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<VLSFunctionFof.Matcher> querySpecification() {

-      return VLSFunctionFof.instance();

-    }

-  }

-  

-  private VLSFunctionFof() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSFunctionFof instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSFunctionFof.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSFunctionFof.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSFunctionFof.Matcher instantiate() {

-    return VLSFunctionFof.Matcher.create();

-  }

-  

-  @Override

-  public VLSFunctionFof.Match newEmptyMatch() {

-    return VLSFunctionFof.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSFunctionFof.Match newMatch(final Object... parameters) {

-    return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunctionFof (visibility: PUBLIC, simpleName: VLSFunctionFof, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunctionFof, 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.VLSFunctionFof (visibility: PUBLIC, simpleName: VLSFunctionFof, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunctionFof, 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 VLSFunctionFof INSTANCE = new VLSFunctionFof();

-    

-    /**

-     * 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 VLSFunctionFof.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunctionFof";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSFunctionFof(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSInequality.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSInequality.java
deleted file mode 100644
index 0dd35ed9..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSInequality.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSInequality(term: VLSInequality){

- *              VLSInequality(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSInequality.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSInequality.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSInequality specification() {

-      return VLSInequality.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 VLSInequality.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSInequality.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSInequality.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSInequality.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSInequality.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality 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>

-   * pattern VLSInequality(term: VLSInequality){

-   *    VLSInequality(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSInequality

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSInequality.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 VLSInequality.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 VLSInequality.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSInequality.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSInequality.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSInequality.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSInequality.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm, final Consumer<? super VLSInequality.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSInequality.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality pTerm) {

-      return VLSInequality.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSInequality.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSInequality.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSInequality.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSInequality.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSInequality.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSInequality.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality) match[POSITION_TERM]);

-      } 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<VLSInequality.Matcher> querySpecification() {

-      return VLSInequality.instance();

-    }

-  }

-  

-  private VLSInequality() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSInequality instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSInequality.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSInequality.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSInequality.Matcher instantiate() {

-    return VLSInequality.Matcher.create();

-  }

-  

-  @Override

-  public VLSInequality.Match newEmptyMatch() {

-    return VLSInequality.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSInequality.Match newMatch(final Object... parameters) {

-    return VLSInequality.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality (visibility: PUBLIC, simpleName: VLSInequality, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality, 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.VLSInequality (visibility: PUBLIC, simpleName: VLSInequality, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality, 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 VLSInequality INSTANCE = new VLSInequality();

-    

-    /**

-     * 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 VLSInequality.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSInequality")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSInequality")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSInequality(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSInequality")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSOr.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSOr.java
deleted file mode 100644
index 0d8e0648..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSOr.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         //VLSFormula

- *         pattern VLSOr(term: VLSOr){

- *              VLSOr(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSOr.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSOr.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSOr specification() {

-      return VLSOr.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 VLSOr.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSOr.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSOr.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSOr.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSOr.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr 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>

-   * //VLSFormula

-   * pattern VLSOr(term: VLSOr){

-   *    VLSOr(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSOr

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSOr.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 VLSOr.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 VLSOr.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSOr.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSOr.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSOr.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSOr.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm, final Consumer<? super VLSOr.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSOr.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr pTerm) {

-      return VLSOr.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSOr.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSOr.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSOr.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSOr.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSOr.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSOr.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr) match[POSITION_TERM]);

-      } 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<VLSOr.Matcher> querySpecification() {

-      return VLSOr.instance();

-    }

-  }

-  

-  private VLSOr() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSOr instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSOr.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSOr.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSOr.Matcher instantiate() {

-    return VLSOr.Matcher.create();

-  }

-  

-  @Override

-  public VLSOr.Match newEmptyMatch() {

-    return VLSOr.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSOr.Match newMatch(final Object... parameters) {

-    return VLSOr.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr (visibility: PUBLIC, simpleName: VLSOr, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr, 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.VLSOr (visibility: PUBLIC, simpleName: VLSOr, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr, 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 VLSOr INSTANCE = new VLSOr();

-    

-    /**

-     * 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 VLSOr.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSOr")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSOr")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSOr(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSOr")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSUnaryNegation.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSUnaryNegation.java
deleted file mode 100644
index b6290aab..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSUnaryNegation.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSUnaryNegation(term: VLSUnaryNegation){

- *              VLSUnaryNegation(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSUnaryNegation.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSUnaryNegation.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSUnaryNegation specification() {

-      return VLSUnaryNegation.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 VLSUnaryNegation.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSUnaryNegation.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSUnaryNegation.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSUnaryNegation.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSUnaryNegation.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation 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>

-   * pattern VLSUnaryNegation(term: VLSUnaryNegation){

-   *    VLSUnaryNegation(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSUnaryNegation

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSUnaryNegation.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 VLSUnaryNegation.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 VLSUnaryNegation.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSUnaryNegation.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSUnaryNegation.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSUnaryNegation.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSUnaryNegation.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm, final Consumer<? super VLSUnaryNegation.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSUnaryNegation.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation pTerm) {

-      return VLSUnaryNegation.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSUnaryNegation.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSUnaryNegation.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSUnaryNegation.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSUnaryNegation.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSUnaryNegation.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSUnaryNegation.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation) match[POSITION_TERM]);

-      } 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<VLSUnaryNegation.Matcher> querySpecification() {

-      return VLSUnaryNegation.instance();

-    }

-  }

-  

-  private VLSUnaryNegation() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSUnaryNegation instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSUnaryNegation.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSUnaryNegation.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSUnaryNegation.Matcher instantiate() {

-    return VLSUnaryNegation.Matcher.create();

-  }

-  

-  @Override

-  public VLSUnaryNegation.Match newEmptyMatch() {

-    return VLSUnaryNegation.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSUnaryNegation.Match newMatch(final Object... parameters) {

-    return VLSUnaryNegation.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation (visibility: PUBLIC, simpleName: VLSUnaryNegation, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation, 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.VLSUnaryNegation (visibility: PUBLIC, simpleName: VLSUnaryNegation, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation, 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 VLSUnaryNegation INSTANCE = new VLSUnaryNegation();

-    

-    /**

-     * 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 VLSUnaryNegation.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUnaryNegation")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUnaryNegation")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSUnaryNegation(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUnaryNegation")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSUniversalQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSUniversalQuantifier.java
deleted file mode 100644
index 0dab9771..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VLSUniversalQuantifier.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-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.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.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>

- *         pattern VLSUniversalQuantifier(term: VLSUniversalQuantifier){

- *              VLSUniversalQuantifier(term);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

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

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier fTerm;

-    

-    private static List<String> parameterNames = makeImmutableList("term");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("term".equals(parameterName)) return this.fTerm;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier getTerm() {

-      return this.fTerm;

-    }

-    

-    @Override

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

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

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

-          this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

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

-      this.fTerm = pTerm;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return VLSUniversalQuantifier.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fTerm};

-    }

-    

-    @Override

-    public VLSUniversalQuantifier.Match toImmutable() {

-      return isMutable() ? newMatch(fTerm) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"term\"=" + prettyPrintValue(fTerm));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fTerm);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

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

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

-          return Objects.equals(fTerm, other.fTerm);

-      } 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 VLSUniversalQuantifier specification() {

-      return VLSUniversalQuantifier.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 VLSUniversalQuantifier.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

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

-     * 

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

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

-     * 

-     */

-    public static VLSUniversalQuantifier.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      return new Mutable(pTerm);

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static VLSUniversalQuantifier.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      return new Immutable(pTerm);

-    }

-    

-    private static final class Mutable extends VLSUniversalQuantifier.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends VLSUniversalQuantifier.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-        super(pTerm);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier 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>

-   * pattern VLSUniversalQuantifier(term: VLSUniversalQuantifier){

-   *    VLSUniversalQuantifier(term);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see VLSUniversalQuantifier

-   * 

-   */

-  public static class Matcher extends BaseMatcher<VLSUniversalQuantifier.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 VLSUniversalQuantifier.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 VLSUniversalQuantifier.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_TERM = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSUniversalQuantifier.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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<VLSUniversalQuantifier.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm}).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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<VLSUniversalQuantifier.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      return rawStreamAllMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<VLSUniversalQuantifier.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      return rawGetOneArbitraryMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      return rawHasMatch(new Object[]{pTerm});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

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

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      return rawCountMatches(new Object[]{pTerm});

-    }

-    

-    /**

-     * 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 pTerm the fixed value of pattern parameter term, 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm, final Consumer<? super VLSUniversalQuantifier.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pTerm}, 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 pTerm the fixed value of pattern parameter term, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public VLSUniversalQuantifier.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier pTerm) {

-      return VLSUniversalQuantifier.Match.newMatch(pTerm);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier> rawStreamAllValuesOfterm(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier> getAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for term.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier> streamAllValuesOfterm() {

-      return rawStreamAllValuesOfterm(emptyArray());

-    }

-    

-    @Override

-    protected VLSUniversalQuantifier.Match tupleToMatch(final Tuple t) {

-      try {

-          return VLSUniversalQuantifier.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier) t.get(POSITION_TERM));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSUniversalQuantifier.Match arrayToMatch(final Object[] match) {

-      try {

-          return VLSUniversalQuantifier.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier) match[POSITION_TERM]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected VLSUniversalQuantifier.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return VLSUniversalQuantifier.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier) match[POSITION_TERM]);

-      } 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<VLSUniversalQuantifier.Matcher> querySpecification() {

-      return VLSUniversalQuantifier.instance();

-    }

-  }

-  

-  private VLSUniversalQuantifier() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static VLSUniversalQuantifier instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected VLSUniversalQuantifier.Matcher instantiate(final ViatraQueryEngine engine) {

-    return VLSUniversalQuantifier.Matcher.on(engine);

-  }

-  

-  @Override

-  public VLSUniversalQuantifier.Matcher instantiate() {

-    return VLSUniversalQuantifier.Matcher.create();

-  }

-  

-  @Override

-  public VLSUniversalQuantifier.Match newEmptyMatch() {

-    return VLSUniversalQuantifier.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public VLSUniversalQuantifier.Match newMatch(final Object... parameters) {

-    return VLSUniversalQuantifier.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier (visibility: PUBLIC, simpleName: VLSUniversalQuantifier, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier, 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.VLSUniversalQuantifier (visibility: PUBLIC, simpleName: VLSUniversalQuantifier, identifier: ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier, 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 VLSUniversalQuantifier INSTANCE = new VLSUniversalQuantifier();

-    

-    /**

-     * 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 VLSUniversalQuantifier.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUniversalQuantifier")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_term);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("term");

-    }

-    

-    @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_term = body.getOrCreateVariableByName("term");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUniversalQuantifier")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_term, parameter_term)

-          ));

-          //    VLSUniversalQuantifier(term)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUniversalQuantifier")));

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VampireQueries.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VampireQueries.java
deleted file mode 100644
index e3518cd6..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/src-gen/ca/mcgill/ecse/dslreasoner/vampire/queries/VampireQueries.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.vampire.queries/src/ca/mcgill/ecse/dslreasoner/vampire/queries/vampireQueries.vql

- */

-package ca.mcgill.ecse.dslreasoner.vampire.queries;

-

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnd;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSAnnotation;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSComment;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSEquivalent;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSExistentialQuantifier;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFofFormula;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunction;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSFunctionFof;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSInequality;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSOr;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUnaryNegation;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.VLSUniversalQuantifier;

-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 vampireQueries.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 vampireQueries.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>VLSComment</li>

- * <li>VLSFofFormula</li>

- * <li>VLSAnnotation</li>

- * <li>VLSOr</li>

- * <li>VLSAnd</li>

- * <li>VLSEquivalent</li>

- * <li>VLSFunction</li>

- * <li>VLSExistentialQuantifier</li>

- * <li>VLSUniversalQuantifier</li>

- * <li>VLSUnaryNegation</li>

- * <li>VLSInequality</li>

- * <li>VLSFunctionFof</li>

- * </ul>

- * 

- * @see IQueryGroup

- * 

- */

-@SuppressWarnings("all")

-public final class VampireQueries 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 VampireQueries instance() {

-    if (INSTANCE == null) {

-        INSTANCE = new VampireQueries();

-    }

-    return INSTANCE;

-  }

-  

-  private static VampireQueries INSTANCE;

-  

-  private VampireQueries() {

-    querySpecifications.add(VLSComment.instance());

-    querySpecifications.add(VLSFofFormula.instance());

-    querySpecifications.add(VLSAnnotation.instance());

-    querySpecifications.add(VLSOr.instance());

-    querySpecifications.add(VLSAnd.instance());

-    querySpecifications.add(VLSEquivalent.instance());

-    querySpecifications.add(VLSFunction.instance());

-    querySpecifications.add(VLSExistentialQuantifier.instance());

-    querySpecifications.add(VLSUniversalQuantifier.instance());

-    querySpecifications.add(VLSUnaryNegation.instance());

-    querySpecifications.add(VLSInequality.instance());

-    querySpecifications.add(VLSFunctionFof.instance());

-  }

-  

-  public VLSComment getVLSComment() {

-    return VLSComment.instance();

-  }

-  

-  public VLSComment.Matcher getVLSComment(final ViatraQueryEngine engine) {

-    return VLSComment.Matcher.on(engine);

-  }

-  

-  public VLSFofFormula getVLSFofFormula() {

-    return VLSFofFormula.instance();

-  }

-  

-  public VLSFofFormula.Matcher getVLSFofFormula(final ViatraQueryEngine engine) {

-    return VLSFofFormula.Matcher.on(engine);

-  }

-  

-  public VLSAnnotation getVLSAnnotation() {

-    return VLSAnnotation.instance();

-  }

-  

-  public VLSAnnotation.Matcher getVLSAnnotation(final ViatraQueryEngine engine) {

-    return VLSAnnotation.Matcher.on(engine);

-  }

-  

-  public VLSOr getVLSOr() {

-    return VLSOr.instance();

-  }

-  

-  public VLSOr.Matcher getVLSOr(final ViatraQueryEngine engine) {

-    return VLSOr.Matcher.on(engine);

-  }

-  

-  public VLSAnd getVLSAnd() {

-    return VLSAnd.instance();

-  }

-  

-  public VLSAnd.Matcher getVLSAnd(final ViatraQueryEngine engine) {

-    return VLSAnd.Matcher.on(engine);

-  }

-  

-  public VLSEquivalent getVLSEquivalent() {

-    return VLSEquivalent.instance();

-  }

-  

-  public VLSEquivalent.Matcher getVLSEquivalent(final ViatraQueryEngine engine) {

-    return VLSEquivalent.Matcher.on(engine);

-  }

-  

-  public VLSFunction getVLSFunction() {

-    return VLSFunction.instance();

-  }

-  

-  public VLSFunction.Matcher getVLSFunction(final ViatraQueryEngine engine) {

-    return VLSFunction.Matcher.on(engine);

-  }

-  

-  public VLSExistentialQuantifier getVLSExistentialQuantifier() {

-    return VLSExistentialQuantifier.instance();

-  }

-  

-  public VLSExistentialQuantifier.Matcher getVLSExistentialQuantifier(final ViatraQueryEngine engine) {

-    return VLSExistentialQuantifier.Matcher.on(engine);

-  }

-  

-  public VLSUniversalQuantifier getVLSUniversalQuantifier() {

-    return VLSUniversalQuantifier.instance();

-  }

-  

-  public VLSUniversalQuantifier.Matcher getVLSUniversalQuantifier(final ViatraQueryEngine engine) {

-    return VLSUniversalQuantifier.Matcher.on(engine);

-  }

-  

-  public VLSUnaryNegation getVLSUnaryNegation() {

-    return VLSUnaryNegation.instance();

-  }

-  

-  public VLSUnaryNegation.Matcher getVLSUnaryNegation(final ViatraQueryEngine engine) {

-    return VLSUnaryNegation.Matcher.on(engine);

-  }

-  

-  public VLSInequality getVLSInequality() {

-    return VLSInequality.instance();

-  }

-  

-  public VLSInequality.Matcher getVLSInequality(final ViatraQueryEngine engine) {

-    return VLSInequality.Matcher.on(engine);

-  }

-  

-  public VLSFunctionFof getVLSFunctionFof() {

-    return VLSFunctionFof.instance();

-  }

-  

-  public VLSFunctionFof.Matcher getVLSFunctionFof(final ViatraQueryEngine engine) {

-    return VLSFunctionFof.Matcher.on(engine);

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.gitignore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.gitignore
index ae3c1726..8d2cfe73 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.gitignore
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.gitignore
@@ -1 +1,3 @@
 /bin/
+/src-gen/
+/xtend-gen/
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 0820f47d..ff5a192e 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
@@ -81,6 +81,14 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
                         val fromType = (l.parameters.get(0) as ComplexTypeReference).referred as Type

                         val toType = (l.parameters.get(1) as ComplexTypeReference).referred as Type

 

+                        val listForAnd = newArrayList

+//                      listForAnd.add(support.duplicate(fromType.lookup(trace.type2Predicate), varB))

+                        listForAnd.add(support.duplicate((l as RelationDeclaration).lookup(trace.rel2Predicate), varList))

+//                      listForAnd.add(createVLSInequality => [

+//                              it.left = support.duplicate(varA)

+//                              it.right = support.duplicate(varB)

+//                      ])

+

                         val relFormula = createVLSFofFormula => [

                                 it.name = support.toIDMultiple("containment", relName)

                                 it.fofRole = "axiom"

@@ -91,11 +99,7 @@ class Logic2VampireLanguageMapper_ContainmentMapper {
                                                 it.left = support.duplicate(toType.lookup(trace.type2Predicate), varA)

                                                 it.right = createVLSExistentialQuantifier => [

                                                         it.variables += support.duplicate(varB)

-                                                        it.operand = createVLSAnd => [

-                                                                it.left = support.duplicate(fromType.lookup(trace.type2Predicate), varB)

-                                                                it.right = support.duplicate((l as RelationDeclaration).lookup(trace.rel2Predicate),

-                                                                        varList)

-                                                        ]

+                                                        it.operand = support.unfoldAnd(listForAnd)

                                                 ]

 

                                                 createVLSEquality => [

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.xtend
deleted file mode 100644
index aba47edb..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.xtend
+++ /dev/null
@@ -1,18 +0,0 @@
-package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder
-
-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction
-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
-import java.util.HashMap
-import java.util.Map
-
-class Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes implements Logic2VampireLanguageMapper_TypeMapperTrace{
-        
-//      public var VLSFofFormula objectSuperClass
-        public val Map<Type, VLSFunction> type2Predicate = new HashMap;
-        public val Map<DefinedElement, VLSFunction> element2Predicate = new HashMap
-        public val Map<Type, VLSTerm> type2PossibleNot = new HashMap
-        public val Map<Type, VLSTerm> type2And = new HashMap
-
-}
\ No newline at end of file
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 b86e8068..be554f99 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 8e50f399..0ee9b884 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 99ba52b8..8e96ba14 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 0210a300..ee720e29 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 7b01a284..528da797 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 9f455fdd..a1204329 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 0b91349d..3413fc3f 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 07e249ce..a53a998a 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 115249ba..f265f6a3 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 2e86d0c7..efde8350 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/.Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.xtendbin
deleted file mode 100644
index e870dabc..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.xtendbin
+++ /dev/null
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper_FilteredTypes.xtendbin
deleted file mode 100644
index ed198ef6..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper_FilteredTypes.xtendbin
+++ /dev/null
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 cf8e4acd..2cabecc8 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 07d5b7b4..57844580 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 983108a2..24898f59 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 4442cdea..a9589e7e 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 da0e5615..8c0ae38d 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
@@ -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.VLSAnd;

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

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

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

@@ -118,6 +117,8 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
         TypeReference _get_1 = l_1.getParameters().get(1);

         Type _referred_1 = ((ComplexTypeReference) _get_1).getReferred();

         final Type toType = ((Type) _referred_1);

+        final ArrayList<VLSFunction> listForAnd = CollectionLiterals.<VLSFunction>newArrayList();

+        listForAnd.add(this.support.duplicate(CollectionsUtil.<RelationDeclaration, VLSFunction>lookup(((RelationDeclaration) l_1), trace.rel2Predicate), varList));

         VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula();

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

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

@@ -135,13 +136,7 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
                 EList<VLSVariable> _variables_1 = it_3.getVariables();

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

                 _variables_1.add(_duplicate_1);

-                VLSAnd _createVLSAnd = this.factory.createVLSAnd();

-                final Procedure1<VLSAnd> _function_7 = (VLSAnd it_4) -> {

-                  it_4.setLeft(this.support.duplicate(CollectionsUtil.<Type, VLSFunction>lookup(fromType, trace.type2Predicate), varB));

-                  it_4.setRight(this.support.duplicate(CollectionsUtil.<RelationDeclaration, VLSFunction>lookup(((RelationDeclaration) l_1), trace.rel2Predicate), varList));

-                };

-                VLSAnd _doubleArrow = ObjectExtensions.<VLSAnd>operator_doubleArrow(_createVLSAnd, _function_7);

-                it_3.setOperand(_doubleArrow);

+                it_3.setOperand(this.support.unfoldAnd(listForAnd));

               };

               VLSExistentialQuantifier _doubleArrow = ObjectExtensions.<VLSExistentialQuantifier>operator_doubleArrow(_createVLSExistentialQuantifier, _function_6);

               it_2.setRight(_doubleArrow);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.java
deleted file mode 100644
index f7c6cb70..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder;

-

-import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_TypeMapperTrace;

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

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

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

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

-import java.util.HashMap;

-import java.util.Map;

-

-@SuppressWarnings("all")

-public class Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes implements Logic2VampireLanguageMapper_TypeMapperTrace {

-  public final Map<Type, VLSFunction> type2Predicate = new HashMap<Type, VLSFunction>();

-  

-  public final Map<DefinedElement, VLSFunction> element2Predicate = new HashMap<DefinedElement, VLSFunction>();

-  

-  public final Map<Type, VLSTerm> type2PossibleNot = new HashMap<Type, VLSTerm>();

-  

-  public final Map<Type, VLSTerm> type2And = new HashMap<Type, VLSTerm>();

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/fam.aird b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/fam.aird
new file mode 100644
index 00000000..75ed2fbb
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/fam.aird
@@ -0,0 +1,633 @@
+<?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="_WMDXMD6wEemlzLOTmNfcSQ" selectedViews="_W6M2oD6wEemlzLOTmNfcSQ _W6fKgD6wEemlzLOTmNfcSQ _W6kqED6wEemlzLOTmNfcSQ _W6l4MD6wEemlzLOTmNfcSQ" version="14.1.0.201810161215">

+    <semanticResources>fam.ecore</semanticResources>

+    <semanticResources>fam.genmodel</semanticResources>

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

+      <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="_Xa8zQT6wEemlzLOTmNfcSQ" name="fam class diagram" repPath="#_XZL4sD6wEemlzLOTmNfcSQ">

+        <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="fam.ecore#/"/>

+      </ownedRepresentationDescriptors>

+    </ownedViews>

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

+      <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="_W6kqED6wEemlzLOTmNfcSQ">

+      <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="_W6l4MD6wEemlzLOTmNfcSQ">

+      <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="_XZL4sD6wEemlzLOTmNfcSQ" name="fam class diagram">

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

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

+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_YLs6yT6wEemlzLOTmNfcSQ" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">

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

+          <labelFormat>bold</labelFormat>

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

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

+        </computedStyleDescriptions>

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

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

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

+            <labelFormat>bold</labelFormat>

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

+          </centerLabelStyleDescription>

+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_YL_1sz6wEemlzLOTmNfcSQ" 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="_YMDgFz6wEemlzLOTmNfcSQ" sourceArrow="FillDiamond" routingStyle="manhattan">

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

+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_YMDgGD6wEemlzLOTmNfcSQ" 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="_YMDgGT6wEemlzLOTmNfcSQ" 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="_YMNRJD6wEemlzLOTmNfcSQ" 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="_YMNRJT6wEemlzLOTmNfcSQ" 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="_YMNRJj6wEemlzLOTmNfcSQ" showIcon="false" labelExpression="service:render">

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

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

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

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

+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_YMNRNj6wEemlzLOTmNfcSQ" 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="_YMNRNz6wEemlzLOTmNfcSQ" showIcon="false" labelExpression="service:render">

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

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

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

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

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

+            <labelFormat>bold</labelFormat>

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

+          </beginLabelStyleDescription>

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

+            <labelFormat>bold</labelFormat>

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

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

+      </data>

+    </ownedAnnotationEntries>

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

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

+        <children xmi:type="notation:Node" xmi:id="_YMXCEz6wEemlzLOTmNfcSQ" type="2003" element="_YLGd0D6wEemlzLOTmNfcSQ">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMXCFT6wEemlzLOTmNfcSQ" x="444" y="324"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMgMAz6wEemlzLOTmNfcSQ" type="2003" element="_YLQO0j6wEemlzLOTmNfcSQ">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMgMBT6wEemlzLOTmNfcSQ" x="264" y="156"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMgMCj6wEemlzLOTmNfcSQ" type="2003" element="_YLQO1T6wEemlzLOTmNfcSQ">

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

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

+            <children xmi:type="notation:Node" xmi:id="_YMp9Dj6wEemlzLOTmNfcSQ" type="3010" element="_YLs6yD6wEemlzLOTmNfcSQ">

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

+              <layoutConstraint xmi:type="notation:Location" xmi:id="_YMp9ED6wEemlzLOTmNfcSQ"/>

+            </children>

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMgMDD6wEemlzLOTmNfcSQ" x="456" y="456"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMgMET6wEemlzLOTmNfcSQ" type="2003" element="_YLQO2D6wEemlzLOTmNfcSQ">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMgMEz6wEemlzLOTmNfcSQ" x="684" y="72"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMgMGD6wEemlzLOTmNfcSQ" type="2003" element="_YLQO2z6wEemlzLOTmNfcSQ">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMgMGj6wEemlzLOTmNfcSQ" x="1104" y="324"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMgMHz6wEemlzLOTmNfcSQ" type="2003" element="_YLZYwT6wEemlzLOTmNfcSQ">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMgMIT6wEemlzLOTmNfcSQ" x="828" y="156"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMgMJj6wEemlzLOTmNfcSQ" type="2003" element="_YLZYxD6wEemlzLOTmNfcSQ">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMgMKD6wEemlzLOTmNfcSQ" x="1200" y="156"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMgMLT6wEemlzLOTmNfcSQ" type="2003" element="_YLZYxz6wEemlzLOTmNfcSQ">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMgMLz6wEemlzLOTmNfcSQ" x="1008" y="156"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMp9AD6wEemlzLOTmNfcSQ" type="2003" element="_YLZYyj6wEemlzLOTmNfcSQ">

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

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

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMp9Aj6wEemlzLOTmNfcSQ" x="1068" y="-36"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_YMp9Bz6wEemlzLOTmNfcSQ" type="2003" element="_YLZYzT6wEemlzLOTmNfcSQ">

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

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

+            <children xmi:type="notation:Node" xmi:id="_YMp9ET6wEemlzLOTmNfcSQ" type="3010" element="_YL2Esj6wEemlzLOTmNfcSQ">

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

+              <layoutConstraint xmi:type="notation:Location" xmi:id="_YMp9Ez6wEemlzLOTmNfcSQ"/>

+            </children>

+            <children xmi:type="notation:Node" xmi:id="_YMp9FD6wEemlzLOTmNfcSQ" type="3010" element="_YL2EtD6wEemlzLOTmNfcSQ">

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

+              <layoutConstraint xmi:type="notation:Location" xmi:id="_YMp9Fj6wEemlzLOTmNfcSQ"/>

+            </children>

+            <children xmi:type="notation:Node" xmi:id="_YMp9Fz6wEemlzLOTmNfcSQ" type="3010" element="_YL2Etj6wEemlzLOTmNfcSQ">

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

+              <layoutConstraint xmi:type="notation:Location" xmi:id="_YMp9GT6wEemlzLOTmNfcSQ"/>

+            </children>

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

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

+          </children>

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

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YMp9CT6wEemlzLOTmNfcSQ" x="252"/>

+        </children>

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

+        <edges xmi:type="notation:Edge" xmi:id="_YNBJYD6wEemlzLOTmNfcSQ" type="4001" element="_YL_1sD6wEemlzLOTmNfcSQ" source="_YMXCEz6wEemlzLOTmNfcSQ" target="_YMgMAz6wEemlzLOTmNfcSQ">

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

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YNBJZT6wEemlzLOTmNfcSQ" x="32" y="48"/>

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNBJYz6wEemlzLOTmNfcSQ" points="[-59, -37, 95, 131]$[-74, -37, 80, 131]$[-74, -119, 80, 49]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNUEUj6wEemlzLOTmNfcSQ" type="4001" element="_YMDgFj6wEemlzLOTmNfcSQ" source="_YMgMAz6wEemlzLOTmNfcSQ" target="_YMXCEz6wEemlzLOTmNfcSQ">

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

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YNUEVz6wEemlzLOTmNfcSQ" x="27" y="46"/>

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNUEVT6wEemlzLOTmNfcSQ" points="[80, 49, -74, -119]$[80, 131, -74, -37]$[95, 131, -59, -37]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNUEXj6wEemlzLOTmNfcSQ" type="4001" element="_YMDgID6wEemlzLOTmNfcSQ" source="_YMgMCj6wEemlzLOTmNfcSQ" target="_YMXCEz6wEemlzLOTmNfcSQ">

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

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

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNUEYT6wEemlzLOTmNfcSQ" points="[0, -98, 0, 144]$[0, -122, 0, 120]$[58, -122, 58, 120]$[58, -144, 58, 98]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNd1Uj6wEemlzLOTmNfcSQ" type="4001" element="_YMNRFT6wEemlzLOTmNfcSQ" source="_YMgMLT6wEemlzLOTmNfcSQ" target="_YMp9AD6wEemlzLOTmNfcSQ">

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

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

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNd1VT6wEemlzLOTmNfcSQ" points="[0, 0, -60, 94]$[0, 10, -60, 104]$[49, 10, -11, 104]$[49, -94, -11, 0]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNd1Xj6wEemlzLOTmNfcSQ" type="4001" element="_YMNRHD6wEemlzLOTmNfcSQ" source="_YMgMJj6wEemlzLOTmNfcSQ" target="_YMp9AD6wEemlzLOTmNfcSQ">

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

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

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNd1YT6wEemlzLOTmNfcSQ" points="[0, 0, 132, 94]$[0, 10, 132, 104]$[-143, 10, -11, 104]$[-143, -94, -11, 0]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNd1aj6wEemlzLOTmNfcSQ" type="4001" element="_YMNRIz6wEemlzLOTmNfcSQ" source="_YMXCEz6wEemlzLOTmNfcSQ" target="_YMgMCj6wEemlzLOTmNfcSQ">

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

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

+          </children>

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

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

+          </children>

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

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YNd1cz6wEemlzLOTmNfcSQ" x="-14" y="-44"/>

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNd1bT6wEemlzLOTmNfcSQ" points="[-59, 1, -100, -131]$[-107, 1, -148, -131]$[-107, 133, -148, 1]$[-47, 133, -88, 1]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNd1dj6wEemlzLOTmNfcSQ" type="4001" element="_YMNRLT6wEemlzLOTmNfcSQ" source="_YMgMGD6wEemlzLOTmNfcSQ" target="_YMgMLT6wEemlzLOTmNfcSQ">

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

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

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNd1eT6wEemlzLOTmNfcSQ" points="[-59, 48, 37, 118]$[-96, 48, 0, 118]$[-96, -70, 0, 0]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNd1gj6wEemlzLOTmNfcSQ" type="4001" element="_YMNRND6wEemlzLOTmNfcSQ" source="_YMgMHz6wEemlzLOTmNfcSQ" target="_YMp9AD6wEemlzLOTmNfcSQ">

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

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YNd1hz6wEemlzLOTmNfcSQ" x="13" y="18"/>

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNd1hT6wEemlzLOTmNfcSQ" points="[30, -49, -209, 143]$[30, -205, -209, -13]$[180, -205, -59, -13]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNd1jj6wEemlzLOTmNfcSQ" type="4001" element="_YMNRPj6wEemlzLOTmNfcSQ" source="_YMgMET6wEemlzLOTmNfcSQ" target="_YMp9AD6wEemlzLOTmNfcSQ">

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

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

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNd1kT6wEemlzLOTmNfcSQ" points="[0, 0, -384, 10]$[0, -36, -384, -26]$[325, -36, -59, -26]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNd1mj6wEemlzLOTmNfcSQ" type="4001" element="_YMNRRT6wEemlzLOTmNfcSQ" source="_YMXCEz6wEemlzLOTmNfcSQ" target="_YMgMHz6wEemlzLOTmNfcSQ">

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

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

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNd1nT6wEemlzLOTmNfcSQ" points="[0, -50, -390, 110]$[390, -110, 0, 50]"/>

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

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

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_YNm_QD6wEemlzLOTmNfcSQ" type="4001" element="_YMNRTD6wEemlzLOTmNfcSQ" source="_YMgMGD6wEemlzLOTmNfcSQ" target="_YMgMJj6wEemlzLOTmNfcSQ">

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

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

+          </children>

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

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

+          </children>

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

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

+          </children>

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

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

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YNm_Qz6wEemlzLOTmNfcSQ" points="[59, 60, -37, 130]$[96, 60, 0, 130]$[96, -70, 0, 0]"/>

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

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

+        </edges>

+      </data>

+    </ownedAnnotationEntries>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_YLGd0D6wEemlzLOTmNfcSQ" name="FunctionalElement" tooltipText="" outgoingEdges="_YL_1sD6wEemlzLOTmNfcSQ _YMNRIz6wEemlzLOTmNfcSQ _YMNRRT6wEemlzLOTmNfcSQ" incomingEdges="_YMDgFj6wEemlzLOTmNfcSQ _YMDgID6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FunctionalElement"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FunctionalElement"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLQO0D6wEemlzLOTmNfcSQ" 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="_YLQO0j6wEemlzLOTmNfcSQ" name="FunctionalArchitectureModel" tooltipText="" outgoingEdges="_YMDgFj6wEemlzLOTmNfcSQ" incomingEdges="_YL_1sD6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FunctionalArchitectureModel"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FunctionalArchitectureModel"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLQO0z6wEemlzLOTmNfcSQ" 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="_YLQO1T6wEemlzLOTmNfcSQ" name="Function" tooltipText="" outgoingEdges="_YMDgID6wEemlzLOTmNfcSQ" incomingEdges="_YMNRIz6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//Function"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//Function"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLQO1j6wEemlzLOTmNfcSQ" 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']"/>

+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_YLs6yD6wEemlzLOTmNfcSQ" name="/type : FunctionType = Root" tooltipText="">

+        <target xmi:type="ecore:EAttribute" href="fam.ecore#//Function/type"/>

+        <semanticElements xmi:type="ecore:EAttribute" href="fam.ecore#//Function/type"/>

+        <ownedStyle xmi:type="diagram:BundledImage" uid="_YLs6yj6wEemlzLOTmNfcSQ" labelColor="39,76,114" labelAlignment="LEFT" description="_YLs6yT6wEemlzLOTmNfcSQ">

+          <labelFormat>bold</labelFormat>

+        </ownedStyle>

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

+      </ownedElements>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_YLQO2D6wEemlzLOTmNfcSQ" name="FAMTerminator" tooltipText="" outgoingEdges="_YMNRPj6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FAMTerminator"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FAMTerminator"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLQO2T6wEemlzLOTmNfcSQ" 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="_YLQO2z6wEemlzLOTmNfcSQ" name="InformationLink" tooltipText="" outgoingEdges="_YMNRLT6wEemlzLOTmNfcSQ _YMNRTD6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//InformationLink"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//InformationLink"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLQO3D6wEemlzLOTmNfcSQ" 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="_YLZYwT6wEemlzLOTmNfcSQ" name="FunctionalInterface" tooltipText="" outgoingEdges="_YMNRND6wEemlzLOTmNfcSQ" incomingEdges="_YMNRRT6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FunctionalInterface"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FunctionalInterface"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLZYwj6wEemlzLOTmNfcSQ" 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="_YLZYxD6wEemlzLOTmNfcSQ" name="FunctionalInput" tooltipText="" outgoingEdges="_YMNRHD6wEemlzLOTmNfcSQ" incomingEdges="_YMNRTD6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FunctionalInput"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FunctionalInput"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLZYxT6wEemlzLOTmNfcSQ" 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="_YLZYxz6wEemlzLOTmNfcSQ" name="FunctionalOutput" tooltipText="" outgoingEdges="_YMNRFT6wEemlzLOTmNfcSQ" incomingEdges="_YMNRLT6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FunctionalOutput"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FunctionalOutput"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLZYyD6wEemlzLOTmNfcSQ" 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="_YLZYyj6wEemlzLOTmNfcSQ" name="FunctionalData" tooltipText="" incomingEdges="_YMNRFT6wEemlzLOTmNfcSQ _YMNRHD6wEemlzLOTmNfcSQ _YMNRND6wEemlzLOTmNfcSQ _YMNRPj6wEemlzLOTmNfcSQ" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FunctionalData"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FunctionalData"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLZYyz6wEemlzLOTmNfcSQ" 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="_YLZYzT6wEemlzLOTmNfcSQ" name="FunctionType" tooltipText="" width="12" height="10">

+      <target xmi:type="ecore:EEnum" href="fam.ecore#//FunctionType"/>

+      <semanticElements xmi:type="ecore:EEnum" href="fam.ecore#//FunctionType"/>

+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YLZYzj6wEemlzLOTmNfcSQ" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">

+        <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%20EEnum']/@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%20EEnum']"/>

+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_YL2Esj6wEemlzLOTmNfcSQ" name="Root" tooltipText="">

+        <target xmi:type="ecore:EEnumLiteral" href="fam.ecore#//FunctionType/Root"/>

+        <semanticElements xmi:type="ecore:EEnumLiteral" href="fam.ecore#//FunctionType/Root"/>

+        <ownedStyle xmi:type="diagram:BundledImage" uid="_YL2Esz6wEemlzLOTmNfcSQ" labelAlignment="LEFT">

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

+        </ownedStyle>

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

+      </ownedElements>

+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_YL2EtD6wEemlzLOTmNfcSQ" name="Intermediate" tooltipText="">

+        <target xmi:type="ecore:EEnumLiteral" href="fam.ecore#//FunctionType/Intermediate"/>

+        <semanticElements xmi:type="ecore:EEnumLiteral" href="fam.ecore#//FunctionType/Intermediate"/>

+        <ownedStyle xmi:type="diagram:BundledImage" uid="_YL2EtT6wEemlzLOTmNfcSQ" labelAlignment="LEFT">

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

+        </ownedStyle>

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

+      </ownedElements>

+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_YL2Etj6wEemlzLOTmNfcSQ" name="Leaf" tooltipText="">

+        <target xmi:type="ecore:EEnumLiteral" href="fam.ecore#//FunctionType/Leaf"/>

+        <semanticElements xmi:type="ecore:EEnumLiteral" href="fam.ecore#//FunctionType/Leaf"/>

+        <ownedStyle xmi:type="diagram:BundledImage" uid="_YL2Etz6wEemlzLOTmNfcSQ" labelAlignment="LEFT">

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

+        </ownedStyle>

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

+      </ownedElements>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_YL_1sD6wEemlzLOTmNfcSQ" name="[1..1] /model" sourceNode="_YLGd0D6wEemlzLOTmNfcSQ" targetNode="_YLQO0j6wEemlzLOTmNfcSQ">

+      <target xmi:type="ecore:EReference" href="fam.ecore#//FunctionalElement/model"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalElement/model"/>

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

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

+          <customFeatures>labelSize</customFeatures>

+          <labelFormat>bold</labelFormat>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YMDgET6wEemlzLOTmNfcSQ" 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="_YMDgFj6wEemlzLOTmNfcSQ" name="[0..*] rootElements" sourceNode="_YLQO0j6wEemlzLOTmNfcSQ" targetNode="_YLGd0D6wEemlzLOTmNfcSQ">

+      <target xmi:type="ecore:EReference" href="fam.ecore#//FunctionalArchitectureModel/rootElements"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalArchitectureModel/rootElements"/>

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

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

+          <customFeatures>labelSize</customFeatures>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YMDgGz6wEemlzLOTmNfcSQ" 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="_YMDgID6wEemlzLOTmNfcSQ" sourceNode="_YLQO1T6wEemlzLOTmNfcSQ" targetNode="_YLGd0D6wEemlzLOTmNfcSQ">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//Function"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//Function"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_YMDgIT6wEemlzLOTmNfcSQ" 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="_YMNRED6wEemlzLOTmNfcSQ" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_YMNRET6wEemlzLOTmNfcSQ" 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="_YMNRFT6wEemlzLOTmNfcSQ" sourceNode="_YLZYxz6wEemlzLOTmNfcSQ" targetNode="_YLZYyj6wEemlzLOTmNfcSQ">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FunctionalOutput"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FunctionalOutput"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_YMNRFj6wEemlzLOTmNfcSQ" 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="_YMNRFz6wEemlzLOTmNfcSQ" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_YMNRGD6wEemlzLOTmNfcSQ" 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="_YMNRHD6wEemlzLOTmNfcSQ" sourceNode="_YLZYxD6wEemlzLOTmNfcSQ" targetNode="_YLZYyj6wEemlzLOTmNfcSQ">

+      <target xmi:type="ecore:EClass" href="fam.ecore#//FunctionalInput"/>

+      <semanticElements xmi:type="ecore:EClass" href="fam.ecore#//FunctionalInput"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_YMNRHT6wEemlzLOTmNfcSQ" 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="_YMNRHj6wEemlzLOTmNfcSQ" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_YMNRHz6wEemlzLOTmNfcSQ" 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="_YMNRIz6wEemlzLOTmNfcSQ" sourceNode="_YLGd0D6wEemlzLOTmNfcSQ" targetNode="_YLQO1T6wEemlzLOTmNfcSQ" beginLabel="[0..*] subElements" endLabel="[0..1] parent">

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

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

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//Function/subElements"/>

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

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

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YMNRKT6wEemlzLOTmNfcSQ" 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>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_YMNRLT6wEemlzLOTmNfcSQ" sourceNode="_YLQO2z6wEemlzLOTmNfcSQ" targetNode="_YLZYxz6wEemlzLOTmNfcSQ" beginLabel="[0..*] outgoingLinks" endLabel="[0..1] from">

+      <target xmi:type="ecore:EReference" href="fam.ecore#//InformationLink/from"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//InformationLink/from"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalOutput/outgoingLinks"/>

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

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

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YMNRMD6wEemlzLOTmNfcSQ" 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>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_YMNRND6wEemlzLOTmNfcSQ" sourceNode="_YLZYwT6wEemlzLOTmNfcSQ" targetNode="_YLZYyj6wEemlzLOTmNfcSQ" beginLabel="[0..1] interface" endLabel="[0..*] data">

+      <target xmi:type="ecore:EReference" href="fam.ecore#//FunctionalInterface/data"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalInterface/data"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalData/interface"/>

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

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

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YMNROj6wEemlzLOTmNfcSQ" 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>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_YMNRPj6wEemlzLOTmNfcSQ" sourceNode="_YLQO2D6wEemlzLOTmNfcSQ" targetNode="_YLZYyj6wEemlzLOTmNfcSQ" beginLabel="[0..1] terminator" endLabel="[0..1] data">

+      <target xmi:type="ecore:EReference" href="fam.ecore#//FAMTerminator/data"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FAMTerminator/data"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalData/terminator"/>

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

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

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YMNRQT6wEemlzLOTmNfcSQ" 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>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_YMNRRT6wEemlzLOTmNfcSQ" sourceNode="_YLGd0D6wEemlzLOTmNfcSQ" targetNode="_YLZYwT6wEemlzLOTmNfcSQ" beginLabel="[0..1] element" endLabel="[0..1] interface">

+      <target xmi:type="ecore:EReference" href="fam.ecore#//FunctionalElement/interface"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalInterface/element"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalElement/interface"/>

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

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

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YMNRSD6wEemlzLOTmNfcSQ" 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>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_YMNRTD6wEemlzLOTmNfcSQ" sourceNode="_YLQO2z6wEemlzLOTmNfcSQ" targetNode="_YLZYxD6wEemlzLOTmNfcSQ" beginLabel="[0..*] IncomingLinks" endLabel="[1..1] to">

+      <target xmi:type="ecore:EReference" href="fam.ecore#//InformationLink/to"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//FunctionalInput/IncomingLinks"/>

+      <semanticElements xmi:type="ecore:EReference" href="fam.ecore#//InformationLink/to"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_YMNRUD6wEemlzLOTmNfcSQ" description="_YMNRTT6wEemlzLOTmNfcSQ" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">

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

+          <labelFormat>bold</labelFormat>

+        </beginLabelStyle>

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

+          <labelFormat>bold</labelFormat>

+        </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='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="_XZsPAD6wEemlzLOTmNfcSQ"/>

+    <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="fam.ecore#/"/>

+  </diagram:DSemanticDiagram>

+</xmi:XMI>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
index 28ea4798..a2a573fc 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
@@ -23,6 +23,8 @@
   <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="ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.queries.FileSystemPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql
index 1c6a545e..7e0db222 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql
@@ -25,7 +25,7 @@ pattern type(This : Function, Target : FunctionType) = {
         find parent(_Child, This);

         Target == FunctionType::Intermediate;

 }

-

+*/

 pattern rootElements(Model: FunctionalArchitectureModel, Root : Function) = {

         FunctionalArchitectureModel.rootElements(Model, Root);

 }

@@ -33,7 +33,7 @@ pattern rootElements(Model: FunctionalArchitectureModel, Root : Function) = {
 pattern parent(Func : Function, Par : Function) = {

         Function.parent(Func, Par);

 }

-

+/*

 @QueryBasedFeature 

 pattern model(This:FunctionalElement, Target: FunctionalArchitectureModel) {

         FunctionalElement(This);

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famSPatterns.vql b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famSPatterns.vql
deleted file mode 100644
index 307b0f9c..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famSPatterns.vql
+++ /dev/null
@@ -1,13 +0,0 @@
-package ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries

-

-//import epackage "http://www.inf.mit.bme.hu/viatrasolver/example/fam"

-import epackage "FamMetamodel"

-

-@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);

-}
\ No newline at end of file
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.gitignore
index ae3c1726..7d818ce2 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.gitignore
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.gitignore
@@ -1 +1,4 @@
 /bin/
+/xtend-gen/
+/src-gen/
+/output/*
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakinduPatterns.vql_ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakinduPatterns.vql_
new file mode 100644
index 00000000..f52113ca
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakinduPatterns.vql_
@@ -0,0 +1,227 @@
+package ca.mcgill.ecse.dslreasoner.yakindu.queries
+
+import epackage "hu.bme.mit.inf.yakindumm"
+
+/////////
+// Entry
+/////////
+
+pattern entryInRegion(r1 : Region, e1 : Entry) {
+        Region.vertices(r1, e1);
+}
+
+@Constraint(severity="error", message="error", key = {r1})
+pattern noEntryInRegion(r1 : Region) {
+        neg find entryInRegion(r1, _);
+}
+
+@Constraint(severity="error", message="error", key = {r})
+pattern multipleEntryInRegion(r : Region) {
+        find entryInRegion(r, e1);
+        find entryInRegion(r, e2);
+        e1 != e2;
+}
+
+pattern transition(t : Transition, src : Vertex, trg : Vertex) {
+        Transition.source(t, src);
+        Transition.target(t, trg);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern incomingToEntry(t : Transition, e : Entry) {
+        find transition(t, _, e);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern noOutgoingTransitionFromEntry(e : Entry) {
+        neg find transition(_, e, _);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern multipleTransitionFromEntry(e : Entry, t1 : Transition, t2: Transition) {
+        Entry.outgoingTransitions(e,t1);
+        Entry.outgoingTransitions(e,t2);
+        t1!=t2;
+}
+
+/////////
+// Exit
+/////////
+
+@Constraint(severity="error", message="error", key = {e})
+pattern outgoingFromExit(t : Transition, e : Exit) {
+        Exit.outgoingTransitions(e,t);
+}
+
+/////////
+// Final
+/////////
+
+@Constraint(severity="error", message="error", key = {f})
+pattern outgoingFromFinal(t : Transition, f : FinalState) {
+        FinalState.outgoingTransitions(f,t);
+}
+
+/////////
+// State vs Region
+/////////
+
+@Constraint(severity="error", message="error", key = {region})
+pattern noStateInRegion(region: Region) {
+        neg find StateInRegion(region,_);
+}
+pattern StateInRegion(region: Region, state: State) {
+        Region.vertices(region,state);
+}
+
+/////////
+// Choice
+/////////
+
+@Constraint(severity="error", message="error", key = {c})
+pattern choiceHasNoOutgoing(c : Choice) {
+        neg find transition(_, c, _);
+}
+
+@Constraint(severity="error", message="error", key = {c})
+pattern choiceHasNoIncoming(c: Choice) {
+        neg find transition(_, _, c);
+}
+
+/////////
+// Synchronization
+/////////
+
+@Constraint(severity="error", message="error", key = {s})
+pattern synchHasNoOutgoing(s : Synchronization) {
+        neg find transition(_, s, _);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern synchHasNoIncoming(s : Synchronization) {
+        neg find transition(_, _, s);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern SynchronizedIncomingInSameRegion(s : Synchronization, v1 : Vertex, v2 : Vertex) {
+        find transition(t1, v1, s);
+        find transition(t2, v2, s);
+        t1!=t2;
+        Region.vertices(r, v1);
+        Region.vertices(r, v2);
+} or {
+        find transition(t1, s, v1);
+        find transition(t2, s, v2);
+        t1!=t2;
+        Region.vertices(r, v1);
+        Region.vertices(r, v2);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern notSynchronizingStates(s : Synchronization) {
+        neg find hasMultipleOutgoingTrainsition(s);
+        neg find hasMultipleIncomingTrainsition(s);
+}
+
+pattern hasMultipleOutgoingTrainsition(v : Synchronization) {
+        find transition(_, v, trg1);
+        find transition(_, v, trg2);
+        trg1 != trg2;
+}
+
+pattern hasMultipleIncomingTrainsition(v : Synchronization) {
+        find transition(_, src1, v);
+        find transition(_, src2, v);
+        src1 != src2;
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern SynchronizedRegionsAreNotSiblings(s : Synchronization, v1 : Vertex, v2 : Vertex) {
+        find transition(_, v1, s);
+        find transition(_, v2, s);
+        CompositeElement.regions.vertices(r1, v1);
+        CompositeElement.regions.vertices(r2, v2);
+        r1 != r2;
+} or {
+        find transition(_, s, v1);
+        find transition(_, s, v2);
+        CompositeElement.regions.vertices(r1, v1);
+        CompositeElement.regions.vertices(r2, v2);
+        r1 != r2;
+}
+
+///////////////////////////////
+// Extra
+//
+//@Constraint(severity="error", message="error", key = {s})
+//pattern SynchronizedRegionDoesNotHaveParent(s : Synchronization, v : Vertex) {
+//      find transition(_, v, s);
+//      neg find child(_,v);
+//} or {
+//      find transition(_, s, v);
+//      neg find child(_,v);
+//}
+
+pattern child(parent: CompositeElement, child: Vertex) {
+        CompositeElement.regions.vertices(parent, child);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern SynchronizedRegionDoesNotHaveMultipleRegions(s : Synchronization, v : Vertex) {
+        find transition(_, v, s);
+        find child(c,v);
+        neg find hasMultipleRegions(c);
+} or {
+        find transition(_, s, v);
+        find child(c,v);
+        neg find hasMultipleRegions(c);
+}
+
+
+pattern hasMultipleRegions(composite: CompositeElement) {
+        CompositeElement.regions(composite,region1);
+        CompositeElement.regions(composite,region2);
+        region1 != region2;
+}
+
+/**
+ * Simplifying model generation
+ */
+@Constraint(severity="error", message="error", key = {s})
+pattern synchThree(s: Synchronization) {
+        Transition.target(t1,s);
+        Transition.target(t2,s);
+        Transition.target(t3,s);
+        t1!=t2;
+        t2!=t3;
+        t1!=t3;
+} or {
+        Transition.source(t1,s);
+        Transition.source(t2,s);
+        Transition.source(t3,s);
+        t1!=t2;
+        t2!=t3;
+        t1!=t3;
+}
+
+/**
+ * Simplifying model generation
+ */
+@Constraint(severity="error", message="error", key = {s1,s2})
+pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {
+        Synchronization(s1);
+        Synchronization(s2);
+        s1 != s2;
+}
+
+/**
+ * Model generation task: at least one synch
+ */
+@Constraint(severity="error", message="error", key = {s})
+pattern noSynch(s:Statechart) {
+        Statechart(s);
+        neg find synch(_);
+}
+pattern synch(s:Synchronization) {
+        Synchronization(s);
+}
\ No newline at end of file
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.aird b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.aird
new file mode 100644
index 00000000..38b2b410
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.aird
@@ -0,0 +1,704 @@
+<?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="_HYD4oOn9EemFBtgp5W26GA" selectedViews="_IBOxcOn9EemFBtgp5W26GA _IBa-sOn9EemFBtgp5W26GA _IBblwOn9EemFBtgp5W26GA _IBgeQOn9EemFBtgp5W26GA" version="14.1.0.201810161215">
+    <semanticResources>yakindu_simplified.ecore</semanticResources>
+    <semanticResources>yakindu_simplified.genmodel</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" uid="_IBOxcOn9EemFBtgp5W26GA">
+      <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="_JMbZQOn9EemFBtgp5W26GA" name="yakindumm class diagram" repPath="#_JKuwIOn9EemFBtgp5W26GA">
+        <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="yakindu_simplified.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" uid="_IBa-sOn9EemFBtgp5W26GA">
+      <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="_IBblwOn9EemFBtgp5W26GA">
+      <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="_IBgeQOn9EemFBtgp5W26GA">
+      <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="_JKuwIOn9EemFBtgp5W26GA" name="yakindumm class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_JMS2YOn9EemFBtgp5W26GA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_JMTdcOn9EemFBtgp5W26GA">
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_J83XsOn9EemFBtgp5W26GA" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_J9Dk8On9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_J9Dk8en9EemFBtgp5W26GA" 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="_J9Dk8un9EemFBtgp5W26GA" 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="_J9UqsOn9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_J9Uqsen9EemFBtgp5W26GA" 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="_J9Uqsun9EemFBtgp5W26GA" 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="_JNGHoOn9EemFBtgp5W26GA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_JNGHoen9EemFBtgp5W26GA" type="Sirius" element="_JKuwIOn9EemFBtgp5W26GA" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_J9aKQOn9EemFBtgp5W26GA" type="2003" element="_J8MpUOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9bYYOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9d0oOn9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9d0oen9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9d0oun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9aKQen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9aKQun9EemFBtgp5W26GA" x="480" y="324"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9ebsOn9EemFBtgp5W26GA" type="2003" element="_J8TXAOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9fCwOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9fCwen9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9fCwun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9fCw-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9ebsen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9ebsun9EemFBtgp5W26GA" x="696" y="156"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9fp0On9EemFBtgp5W26GA" type="2003" element="_J8VMMOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9fp0-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9fp1On9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9fp1en9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9fp1un9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9fp0en9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9fp0un9EemFBtgp5W26GA" x="876" y="324"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9gQ4On9EemFBtgp5W26GA" type="2003" element="_J8WaUOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9gQ4-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9gQ5On9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9gQ5en9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9gQ5un9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9gQ4en9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9gQ4un9EemFBtgp5W26GA" x="696"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9g38On9EemFBtgp5W26GA" type="2003" element="_J8XBYun9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9g38-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9g39On9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9g39en9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9g39un9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9g38en9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9g38un9EemFBtgp5W26GA" x="984" y="636"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9g39-n9EemFBtgp5W26GA" type="2003" element="_J8YPgen9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9hfAOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9hfAen9EemFBtgp5W26GA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_J9oMsOn9EemFBtgp5W26GA" type="3010" element="_J82JkOn9EemFBtgp5W26GA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_J9oMsen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J9oMsun9EemFBtgp5W26GA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9hfAun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9hfA-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9g3-On9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9g3-en9EemFBtgp5W26GA" x="144" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9hfBOn9EemFBtgp5W26GA" type="2003" element="_J8ZdoOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9iGEOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9itIOn9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9itIen9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9itIun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9hfBen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9hfBun9EemFBtgp5W26GA" x="696" y="636"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9jUMOn9EemFBtgp5W26GA" type="2003" element="_J8arwOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9j7QOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9j7Qen9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9j7Qun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9j7Q-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9jUMen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9jUMun9EemFBtgp5W26GA" x="696" y="324"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9j7ROn9EemFBtgp5W26GA" type="2003" element="_J8b54On9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9j7R-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9kiUOn9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9kiUen9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9kiUun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9j7Ren9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8" italic="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9j7Run9EemFBtgp5W26GA" x="984" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9kiU-n9EemFBtgp5W26GA" type="2003" element="_J8dvEOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9lJYOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9lJYen9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9lJYun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9lJY-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9kiVOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9kiVen9EemFBtgp5W26GA" x="408" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9lJZOn9EemFBtgp5W26GA" type="2003" element="_J8fkQOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9lwcOn9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9lwcen9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9lwcun9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9lwc-n9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9lJZen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9lJZun9EemFBtgp5W26GA" x="588" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9mXgOn9EemFBtgp5W26GA" type="2003" element="_J8gyYOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9mXg-n9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9m-kOn9EemFBtgp5W26GA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9m-ken9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9m-kun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9mXgen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9mXgun9EemFBtgp5W26GA" x="804" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J9m-k-n9EemFBtgp5W26GA" type="2003" element="_J8iAgOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9m-lun9EemFBtgp5W26GA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_J9nloOn9EemFBtgp5W26GA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_J9ozwOn9EemFBtgp5W26GA" type="3010" element="_J883QOn9EemFBtgp5W26GA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_J9ozwen9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J9ozwun9EemFBtgp5W26GA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J9ozw-n9EemFBtgp5W26GA" type="3010" element="_J883Qun9EemFBtgp5W26GA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_J9ozxOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J9ozxen9EemFBtgp5W26GA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J9pa0On9EemFBtgp5W26GA" type="3010" element="_J89eUOn9EemFBtgp5W26GA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_J9pa0en9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J9pa0un9EemFBtgp5W26GA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J9nloen9EemFBtgp5W26GA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J9nloun9EemFBtgp5W26GA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J9m-lOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9m-len9EemFBtgp5W26GA" x="363" y="168"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_JNGHoun9EemFBtgp5W26GA"/>
+        <edges xmi:type="notation:Edge" xmi:id="_J9ykwOn9EemFBtgp5W26GA" type="4001" element="_J9BvwOn9EemFBtgp5W26GA" source="_J9fp0On9EemFBtgp5W26GA" target="_J9ebsOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J9zL0On9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9zL0en9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J9zy4On9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9zy4en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J90Z8On9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J90Z8en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J9ykwen9EemFBtgp5W26GA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J9ykwun9EemFBtgp5W26GA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J9ykw-n9EemFBtgp5W26GA" points="[0, 0, 180, 60]$[-180, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-AnMOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-AnMen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-BOQOn9EemFBtgp5W26GA" type="4001" element="_J9H2YOn9EemFBtgp5W26GA" source="_J9j7ROn9EemFBtgp5W26GA" target="_J9fp0On9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-BOROn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-BORen9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-B1UOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-B1Uen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-B1Uun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-B1U-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-BOQen9EemFBtgp5W26GA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-BOQun9EemFBtgp5W26GA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-BOQ-n9EemFBtgp5W26GA" points="[0, 0, 106, 60]$[-106, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-B1VOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-B1Ven9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-B1Vun9EemFBtgp5W26GA" type="4001" element="_J9JrkOn9EemFBtgp5W26GA" source="_J9g38On9EemFBtgp5W26GA" target="_J9j7ROn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-CcYOn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-CcYen9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-CcYun9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-CcY-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-CcZOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-CcZen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-B1V-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-B1WOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-B1Wen9EemFBtgp5W26GA" points="[37, 0, 37, 58]$[37, -24, 37, 34]$[1, -24, 1, 34]$[1, -58, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-DDcOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-DDcen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-DDcun9EemFBtgp5W26GA" type="4001" element="_J9NV8-n9EemFBtgp5W26GA" source="_J9mXgOn9EemFBtgp5W26GA" target="_J9jUMOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-DDdun9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-DDd-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-DqgOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Dqgen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-Dqgun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Dqg-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-DDc-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-DDdOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-DDden9EemFBtgp5W26GA" points="[0, 0, 108, 58]$[0, -24, 108, 34]$[-107, -24, 1, 34]$[-107, -58, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-ERkOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-ERken9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-ERkun9EemFBtgp5W26GA" type="4001" element="_J9OkEOn9EemFBtgp5W26GA" source="_J9g39-n9EemFBtgp5W26GA" target="_J9aKQOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-ERlun9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-ERl-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-ERmOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-ERmen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-ERmun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-ERm-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-ERk-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-ERlOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-ERlen9EemFBtgp5W26GA" points="[0, 0, -270, 60]$[270, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-E4oOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-E4oen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-E4oun9EemFBtgp5W26GA" type="4001" element="_J9PLIOn9EemFBtgp5W26GA" source="_J9lJZOn9EemFBtgp5W26GA" target="_J9aKQOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-E4pun9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-E4p-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-E4qOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-E4qen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-E4qun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-E4q-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-E4o-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-E4pOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-E4pen9EemFBtgp5W26GA" points="[0, 0, 115, 60]$[-115, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-FfsOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-Ffsen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-Ffsun9EemFBtgp5W26GA" type="4001" element="_J9PyMOn9EemFBtgp5W26GA" source="_J9hfBOn9EemFBtgp5W26GA" target="_J9jUMOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-Fftun9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Fft-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-GGwOn9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-GGwen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-GGwun9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-GGw-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-Ffs-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-FftOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-Fften9EemFBtgp5W26GA" points="[-35, 0, -35, 214]$[-35, -180, -35, 34]$[1, -180, 1, 34]$[1, -214, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-GGxOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-GGxen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-GGxun9EemFBtgp5W26GA" type="4001" element="_J9QZQOn9EemFBtgp5W26GA" source="_J9hfBOn9EemFBtgp5W26GA" target="_J9j7ROn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-Gt0On9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Gt0en9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-Gt0un9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Gt0-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-Gt1On9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-Gt1en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-GGx-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-GGyOn9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-GGyen9EemFBtgp5W26GA" points="[0, 0, -288, 58]$[0, -24, -288, 34]$[289, -24, 1, 34]$[289, -58, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-Gt1un9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-Gt1-n9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-Gt2On9EemFBtgp5W26GA" type="4001" element="_J9RAU-n9EemFBtgp5W26GA" source="_J9kiU-n9EemFBtgp5W26GA" target="_J9aKQOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-HU4On9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-HU4en9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-HU4un9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-HU4-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-HU5On9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-HU5en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-Gt2en9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-Gt2un9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-Gt2-n9EemFBtgp5W26GA" points="[0, 0, -65, 60]$[65, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-H78On9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-H78en9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-H78un9EemFBtgp5W26GA" type="4001" element="_J9RnZun9EemFBtgp5W26GA" source="_J9aKQOn9EemFBtgp5W26GA" target="_J9ebsOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-H79un9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-H79-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-H7-On9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-H7-en9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-IjAOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-IjAen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-H78-n9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-H79On9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-H79en9EemFBtgp5W26GA" points="[0, 0, -220, 60]$[220, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-IjAun9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-IjA-n9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-IjBOn9EemFBtgp5W26GA" type="4001" element="_J9SOdun9EemFBtgp5W26GA" source="_J9jUMOn9EemFBtgp5W26GA" target="_J9ebsOn9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-JKEOn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JKEen9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-JKEun9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JKE-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-JKFOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JKFen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-IjBen9EemFBtgp5W26GA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-IjBun9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-IjB-n9EemFBtgp5W26GA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-JKFun9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-JKF-n9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-JxIOn9EemFBtgp5W26GA" type="4001" element="_J9Tck-n9EemFBtgp5W26GA" source="_J9ebsOn9EemFBtgp5W26GA" target="_J9gQ4On9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-JxJOn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JxJen9EemFBtgp5W26GA" x="1" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-JxJun9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JxJ-n9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-JxKOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-JxKen9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-JxIen9EemFBtgp5W26GA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-JxIun9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-JxI-n9EemFBtgp5W26GA" points="[-59, 50, -59, 108]$[-143, 50, -143, 108]$[-143, -106, -143, -48]$[-59, -106, -59, -48]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-JxKun9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-JxK-n9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_J-KYMOn9EemFBtgp5W26GA" type="4001" element="_J9VRw-n9EemFBtgp5W26GA" source="_J9ebsOn9EemFBtgp5W26GA" target="_J9gQ4On9EemFBtgp5W26GA">
+          <children xmi:type="notation:Node" xmi:id="_J-KYNOn9EemFBtgp5W26GA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-KYNen9EemFBtgp5W26GA" x="1" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-KYNun9EemFBtgp5W26GA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-KYN-n9EemFBtgp5W26GA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J-KYOOn9EemFBtgp5W26GA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J-KYOen9EemFBtgp5W26GA" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_J-KYMen9EemFBtgp5W26GA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_J-KYMun9EemFBtgp5W26GA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J-KYM-n9EemFBtgp5W26GA" points="[59, 50, 59, 108]$[145, 50, 145, 108]$[145, -106, 145, -48]$[59, -106, 59, -48]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-K_QOn9EemFBtgp5W26GA" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J-K_Qen9EemFBtgp5W26GA" id="(0.5,1.0)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8MpUOn9EemFBtgp5W26GA" name="Pseudostate" tooltipText="" outgoingEdges="_J9RnZun9EemFBtgp5W26GA" incomingEdges="_J9OkEOn9EemFBtgp5W26GA _J9PLIOn9EemFBtgp5W26GA _J9RAU-n9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Pseudostate"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Pseudostate"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8Q6wOn9EemFBtgp5W26GA" 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="_J8TXAOn9EemFBtgp5W26GA" name="Vertex" tooltipText="" outgoingEdges="_J9Tck-n9EemFBtgp5W26GA _J9VRw-n9EemFBtgp5W26GA" incomingEdges="_J9BvwOn9EemFBtgp5W26GA _J9RnZun9EemFBtgp5W26GA _J9SOdun9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Vertex"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Vertex"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8T-EOn9EemFBtgp5W26GA" 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="_J8VMMOn9EemFBtgp5W26GA" name="Region" tooltipText="" outgoingEdges="_J9BvwOn9EemFBtgp5W26GA" incomingEdges="_J9H2YOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Region"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Region"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8VMMen9EemFBtgp5W26GA" 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="_J8WaUOn9EemFBtgp5W26GA" name="Transition" tooltipText="" incomingEdges="_J9Tck-n9EemFBtgp5W26GA _J9VRw-n9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Transition"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Transition"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8XBYOn9EemFBtgp5W26GA" 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="_J8XBYun9EemFBtgp5W26GA" name="Statechart" tooltipText="" outgoingEdges="_J9JrkOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Statechart"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Statechart"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8XocOn9EemFBtgp5W26GA" 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="_J8YPgen9EemFBtgp5W26GA" name="Entry" tooltipText="" outgoingEdges="_J9OkEOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Entry"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Entry"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8Y2kOn9EemFBtgp5W26GA" 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']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J82JkOn9EemFBtgp5W26GA" name="Type : EntryType = Normal" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="yakindu_simplified.ecore#//Entry/Type"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="yakindu_simplified.ecore#//Entry/Type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J85M4On9EemFBtgp5W26GA" labelAlignment="LEFT" description="_J83XsOn9EemFBtgp5W26GA">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_J8ZdoOn9EemFBtgp5W26GA" name="State" tooltipText="" outgoingEdges="_J9PyMOn9EemFBtgp5W26GA _J9QZQOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8aEsOn9EemFBtgp5W26GA" 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="_J8arwOn9EemFBtgp5W26GA" name="RegularState" tooltipText="" outgoingEdges="_J9SOdun9EemFBtgp5W26GA" incomingEdges="_J9NV8-n9EemFBtgp5W26GA _J9PyMOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//RegularState"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//RegularState"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8arwen9EemFBtgp5W26GA" 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="_J8b54On9EemFBtgp5W26GA" name="CompositeElement" tooltipText="" outgoingEdges="_J9H2YOn9EemFBtgp5W26GA" incomingEdges="_J9JrkOn9EemFBtgp5W26GA _J9QZQOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//CompositeElement"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//CompositeElement"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8cg8On9EemFBtgp5W26GA" 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="_J8dvEOn9EemFBtgp5W26GA" name="Choice" tooltipText="" outgoingEdges="_J9RAU-n9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Choice"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Choice"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8eWIOn9EemFBtgp5W26GA" 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="_J8fkQOn9EemFBtgp5W26GA" name="Exit" tooltipText="" outgoingEdges="_J9PLIOn9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Exit"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Exit"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8gLUOn9EemFBtgp5W26GA" 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="_J8gyYOn9EemFBtgp5W26GA" name="FinalState" tooltipText="" outgoingEdges="_J9NV8-n9EemFBtgp5W26GA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//FinalState"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//FinalState"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8gyYen9EemFBtgp5W26GA" 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="_J8iAgOn9EemFBtgp5W26GA" name="EntryType" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EEnum" href="yakindu_simplified.ecore#//EntryType"/>
+      <semanticElements xmi:type="ecore:EEnum" href="yakindu_simplified.ecore#//EntryType"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J8iAgen9EemFBtgp5W26GA" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
+        <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%20EEnum']/@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%20EEnum']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J883QOn9EemFBtgp5W26GA" name="Normal" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/Normal"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/Normal"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J883Qen9EemFBtgp5W26GA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J883Qun9EemFBtgp5W26GA" name="History" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/History"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/History"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J883Q-n9EemFBtgp5W26GA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_J89eUOn9EemFBtgp5W26GA" name="DeepHistory" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/DeepHistory"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="yakindu_simplified.ecore#//EntryType/DeepHistory"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_J89eUen9EemFBtgp5W26GA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J9BvwOn9EemFBtgp5W26GA" name="[0..*] vertices" sourceNode="_J8VMMOn9EemFBtgp5W26GA" targetNode="_J8TXAOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Region/vertices"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Region/vertices"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9EzEOn9EemFBtgp5W26GA" description="_J9Dk8On9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9FaIen9EemFBtgp5W26GA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J9FaIOn9EemFBtgp5W26GA" 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="_J9H2YOn9EemFBtgp5W26GA" name="[0..*] regions" sourceNode="_J8b54On9EemFBtgp5W26GA" targetNode="_J8VMMOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//CompositeElement/regions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//CompositeElement/regions"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9IdcOn9EemFBtgp5W26GA" description="_J9Dk8On9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9Idcun9EemFBtgp5W26GA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J9Idcen9EemFBtgp5W26GA" 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="_J9JrkOn9EemFBtgp5W26GA" sourceNode="_J8XBYun9EemFBtgp5W26GA" targetNode="_J8b54On9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Statechart"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Statechart"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9MH0On9EemFBtgp5W26GA" 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="_J9Mu4On9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9Mu4en9EemFBtgp5W26GA" 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="_J9NV8-n9EemFBtgp5W26GA" sourceNode="_J8gyYOn9EemFBtgp5W26GA" targetNode="_J8arwOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//FinalState"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//FinalState"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9N9AOn9EemFBtgp5W26GA" 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="_J9N9Aen9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9N9Aun9EemFBtgp5W26GA" 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="_J9OkEOn9EemFBtgp5W26GA" sourceNode="_J8YPgen9EemFBtgp5W26GA" targetNode="_J8MpUOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Entry"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Entry"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9OkEen9EemFBtgp5W26GA" 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="_J9OkEun9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9OkE-n9EemFBtgp5W26GA" 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="_J9PLIOn9EemFBtgp5W26GA" sourceNode="_J8fkQOn9EemFBtgp5W26GA" targetNode="_J8MpUOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Exit"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Exit"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9PLIen9EemFBtgp5W26GA" 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="_J9PLIun9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9PLI-n9EemFBtgp5W26GA" 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="_J9PyMOn9EemFBtgp5W26GA" sourceNode="_J8ZdoOn9EemFBtgp5W26GA" targetNode="_J8arwOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9PyMen9EemFBtgp5W26GA" 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="_J9PyMun9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9PyM-n9EemFBtgp5W26GA" 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="_J9QZQOn9EemFBtgp5W26GA" sourceNode="_J8ZdoOn9EemFBtgp5W26GA" targetNode="_J8b54On9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//State"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9QZQen9EemFBtgp5W26GA" 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="_J9QZQun9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9QZQ-n9EemFBtgp5W26GA" 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="_J9RAU-n9EemFBtgp5W26GA" sourceNode="_J8dvEOn9EemFBtgp5W26GA" targetNode="_J8MpUOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Choice"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Choice"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9RnYOn9EemFBtgp5W26GA" 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="_J9RnYen9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9RnYun9EemFBtgp5W26GA" 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="_J9RnZun9EemFBtgp5W26GA" sourceNode="_J8MpUOn9EemFBtgp5W26GA" targetNode="_J8TXAOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Pseudostate"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//Pseudostate"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9SOcOn9EemFBtgp5W26GA" 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="_J9SOcen9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9SOcun9EemFBtgp5W26GA" 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="_J9SOdun9EemFBtgp5W26GA" sourceNode="_J8arwOn9EemFBtgp5W26GA" targetNode="_J8TXAOn9EemFBtgp5W26GA">
+      <target xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//RegularState"/>
+      <semanticElements xmi:type="ecore:EClass" href="yakindu_simplified.ecore#//RegularState"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9S1gOn9EemFBtgp5W26GA" 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="_J9S1gen9EemFBtgp5W26GA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J9S1gun9EemFBtgp5W26GA" 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="_J9Tck-n9EemFBtgp5W26GA" sourceNode="_J8TXAOn9EemFBtgp5W26GA" targetNode="_J8WaUOn9EemFBtgp5W26GA" beginLabel="[0..1] source" endLabel="[0..*] outgoingTransitions">
+      <target xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Vertex/outgoingTransitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Vertex/outgoingTransitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Transition/source"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9Uqs-n9EemFBtgp5W26GA" description="_J9UqsOn9EemFBtgp5W26GA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9UqtOn9EemFBtgp5W26GA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J9Uqten9EemFBtgp5W26GA" 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>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_J9VRw-n9EemFBtgp5W26GA" sourceNode="_J8TXAOn9EemFBtgp5W26GA" targetNode="_J8WaUOn9EemFBtgp5W26GA" beginLabel="[1..1] target" endLabel="[0..*] incomingTransitions">
+      <target xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Vertex/incomingTransitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Vertex/incomingTransitions"/>
+      <semanticElements xmi:type="ecore:EReference" href="yakindu_simplified.ecore#//Transition/target"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_J9V40On9EemFBtgp5W26GA" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <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='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J9V40en9EemFBtgp5W26GA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_J9V40un9EemFBtgp5W26GA" 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="_JLMDIOn9EemFBtgp5W26GA"/>
+    <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="yakindu_simplified.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.ecore b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.ecore
new file mode 100644
index 00000000..02b57252
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.ecore
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="yakindumm" nsURI="hu.bme.mit.inf.yakindumm" nsPrefix="ca.mcgill.ecse.yakindumm">
+  <eClassifiers xsi:type="ecore:EClass" name="Pseudostate" abstract="true" eSuperTypes="#//Vertex"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Vertex" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="incomingTransitions" ordered="false"
+        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/target"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingTransitions" ordered="false"
+        upperBound="-1" eType="#//Transition" containment="true" eOpposite="#//Transition/source"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Region">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="vertices" ordered="false"
+        upperBound="-1" eType="#//Vertex" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Transition">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"
+        lowerBound="1" eType="#//Vertex" eOpposite="#//Vertex/incomingTransitions"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
+        eType="#//Vertex" eOpposite="#//Vertex/outgoingTransitions"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Statechart" eSuperTypes="#//CompositeElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Entry" eSuperTypes="#//Pseudostate">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Type" lowerBound="1" eType="#//EntryType"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="State" eSuperTypes="#//RegularState #//CompositeElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="RegularState" abstract="true" eSuperTypes="#//Vertex"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CompositeElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="regions" upperBound="-1"
+        eType="#//Region" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Choice" eSuperTypes="#//Pseudostate"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Exit" eSuperTypes="#//Pseudostate"/>
+  <eClassifiers xsi:type="ecore:EClass" name="FinalState" eSuperTypes="#//RegularState"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="EntryType">
+    <eLiterals name="Normal"/>
+    <eLiterals name="History"/>
+    <eLiterals name="DeepHistory"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.genmodel b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.genmodel
new file mode 100644
index 00000000..cfbafce6
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/initialModels/yakindu/yakindu_simplified.genmodel
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/ca.mcgill.ecse.dslreasoner.vampire.test/src" modelPluginID="ca.mcgill.ecse.dslreasoner.vampire.test"
+    modelName="yakindu_simplified" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>yakindu_simplified.ecore</foreignModel>
+  <genPackages prefix="Yakindumm" basePackage="ca.mcgill.ecse.dslreasoner.vampire"
+      disposableProviderFactory="true" ecorePackage="yakindu_simplified.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="yakindu_simplified.ecore#//EntryType">
+      <genEnumLiterals ecoreEnumLiteral="yakindu_simplified.ecore#//EntryType/Normal"/>
+      <genEnumLiterals ecoreEnumLiteral="yakindu_simplified.ecore#//EntryType/History"/>
+      <genEnumLiterals ecoreEnumLiteral="yakindu_simplified.ecore#//EntryType/DeepHistory"/>
+    </genEnums>
+    <genClasses image="false" ecoreClass="yakindu_simplified.ecore#//Pseudostate"/>
+    <genClasses image="false" ecoreClass="yakindu_simplified.ecore#//Vertex">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Vertex/incomingTransitions"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Vertex/outgoingTransitions"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Region">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Region/vertices"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Transition">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Transition/target"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//Transition/source"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Statechart"/>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Entry">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute yakindu_simplified.ecore#//Entry/Type"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//State"/>
+    <genClasses image="false" ecoreClass="yakindu_simplified.ecore#//RegularState"/>
+    <genClasses image="false" ecoreClass="yakindu_simplified.ecore#//CompositeElement">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference yakindu_simplified.ecore#//CompositeElement/regions"/>
+    </genClasses>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Choice"/>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//Exit"/>
+    <genClasses ecoreClass="yakindu_simplified.ecore#//FinalState"/>
+  </genPackages>
+</genmodel:GenModel>
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
index 3109ccc2..5c3ef527 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
@@ -5,13 +5,13 @@ fof ( enumScope_FunctionType_Intermediate , axiom , ! [ A ] : ( A = eo2 <=> e_In
 fof ( enumScope_FunctionType_Leaf , axiom , ! [ A ] : ( A = eo3 <=> e_Leaf_FunctionType ( A ) ) ) .

 fof ( inheritanceHierarchyHandler , axiom , ! [ A ] : ( object ( A ) <=> ( ( t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ~ t_FAMTerminator ( A ) & ( t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

 fof ( typeScope_min_object , axiom , ! [ A ] : ( ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | ( A = o5 | ( A = o6 | ( 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 | ( A = o6 | ( A = o7 | A = o8 ) ) ) ) ) ) ) ) ) ) ) ) .

+fof ( typeScope_max_object , axiom , ! [ A ] : ( object ( A ) => ( A = eo1 | ( A = eo2 | ( A = eo3 | ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | ( A = o5 | ( A = o6 | ( A = o7 | ( A = o8 | ( A = o9 | ( A = o10 | ( A = o11 | ( A = o12 | ( A = o13 | ( A = o14 | ( A = o15 | ( A = o16 | ( A = o17 | ( A = o18 | ( A = o19 | ( A = o20 | ( A = o21 | ( A = o22 | ( A = o23 | ( A = o24 | ( A = o25 | ( A = o26 | ( A = o27 | ( A = o28 | ( A = o29 | ( A = o30 | ( A = o31 | ( A = o32 | ( A = o33 | ( A = o34 | ( A = o35 | ( A = o36 | ( A = o37 | ( A = o38 | ( A = o39 | A = o40 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

 fof ( typeScope_min_t_FunctionalInterface , axiom , ! [ A ] : ( ( A = o2 | A = o3 ) => ( t_FunctionalInterface ( A ) & object ( A ) ) ) ) .

 fof ( typeScope_min_t_Function , axiom , ! [ A ] : ( A = o4 => ( t_Function ( A ) & object ( A ) ) ) ) .

 fof ( typeScope_min_t_FunctionalOutput , axiom , ! [ A ] : ( ( A = o5 | ( A = o6 | A = o7 ) ) => ( t_FunctionalOutput ( A ) & object ( A ) ) ) ) .

-fof ( typeScope_max_t_Function , axiom , ! [ A ] : ( ( t_Function ( A ) & object ( A ) ) => ( A = o4 | A = o8 ) ) ) .

+fof ( typeScope_max_t_Function , axiom , ! [ A ] : ( ( t_Function ( A ) & object ( A ) ) => ( A = o4 | ( A = o8 | ( A = o9 | ( A = o10 | A = o11 ) ) ) ) ) ) .

 fof ( typeScope_max_t_FunctionalOutput , axiom , ! [ A ] : ( ( t_FunctionalOutput ( A ) & object ( A ) ) => ( A = o5 | ( A = o6 | ( A = o7 | A = o8 ) ) ) ) ) .

-fof ( typeUniqueness , axiom , eo1 != eo2 & ( eo1 != eo3 & ( eo2 != eo3 & ( eo1 != o1 & ( eo2 != o1 & ( eo3 != o1 & ( eo1 != o2 & ( eo2 != o2 & ( eo3 != o2 & ( o1 != o2 & ( eo1 != o3 & ( eo2 != o3 & ( eo3 != o3 & ( o1 != o3 & ( o2 != o3 & ( eo1 != o4 & ( eo2 != o4 & ( eo3 != o4 & ( o1 != o4 & ( o2 != o4 & ( o3 != o4 & ( eo1 != o5 & ( eo2 != o5 & ( eo3 != o5 & ( o1 != o5 & ( o2 != o5 & ( o3 != o5 & ( o4 != o5 & ( eo1 != o6 & ( eo2 != o6 & ( eo3 != o6 & ( o1 != o6 & ( o2 != o6 & ( o3 != o6 & ( o4 != o6 & ( o5 != o6 & ( eo1 != o7 & ( eo2 != o7 & ( eo3 != o7 & ( o1 != o7 & ( o2 != o7 & ( o3 != o7 & ( o4 != o7 & ( o5 != o7 & ( o6 != o7 & ( eo1 != o8 & ( eo2 != o8 & ( eo3 != o8 & ( o1 != o8 & ( o2 != o8 & ( o3 != o8 & ( o4 != o8 & ( o5 != o8 & ( o6 != o8 & o7 != o8 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

+fof ( typeUniqueness , axiom , eo1 != eo2 & ( eo1 != eo3 & ( eo2 != eo3 & ( eo1 != o1 & ( eo2 != o1 & ( eo3 != o1 & ( eo1 != o2 & ( eo2 != o2 & ( eo3 != o2 & ( o1 != o2 & ( eo1 != o3 & ( eo2 != o3 & ( eo3 != o3 & ( o1 != o3 & ( o2 != o3 & ( eo1 != o4 & ( eo2 != o4 & ( eo3 != o4 & ( o1 != o4 & ( o2 != o4 & ( o3 != o4 & ( eo1 != o5 & ( eo2 != o5 & ( eo3 != o5 & ( o1 != o5 & ( o2 != o5 & ( o3 != o5 & ( o4 != o5 & ( eo1 != o6 & ( eo2 != o6 & ( eo3 != o6 & ( o1 != o6 & ( o2 != o6 & ( o3 != o6 & ( o4 != o6 & ( o5 != o6 & ( eo1 != o7 & ( eo2 != o7 & ( eo3 != o7 & ( o1 != o7 & ( o2 != o7 & ( o3 != o7 & ( o4 != o7 & ( o5 != o7 & ( o6 != o7 & ( eo1 != o8 & ( eo2 != o8 & ( eo3 != o8 & ( o1 != o8 & ( o2 != o8 & ( o3 != o8 & ( o4 != o8 & ( o5 != o8 & ( o6 != o8 & ( o7 != o8 & ( eo1 != o9 & ( eo2 != o9 & ( eo3 != o9 & ( o1 != o9 & ( o2 != o9 & ( o3 != o9 & ( o4 != o9 & ( o5 != o9 & ( o6 != o9 & ( o7 != o9 & ( o8 != o9 & ( eo1 != o10 & ( eo2 != o10 & ( eo3 != o10 & ( o1 != o10 & ( o2 != o10 & ( o3 != o10 & ( o4 != o10 & ( o5 != o10 & ( o6 != o10 & ( o7 != o10 & ( o8 != o10 & ( o9 != o10 & ( eo1 != o11 & ( eo2 != o11 & ( eo3 != o11 & ( o1 != o11 & ( o2 != o11 & ( o3 != o11 & ( o4 != o11 & ( o5 != o11 & ( o6 != o11 & ( o7 != o11 & ( o8 != o11 & ( o9 != o11 & ( o10 != o11 & ( eo1 != o12 & ( eo2 != o12 & ( eo3 != o12 & ( o1 != o12 & ( o2 != o12 & ( o3 != o12 & ( o4 != o12 & ( o5 != o12 & ( o6 != o12 & ( o7 != o12 & ( o8 != o12 & ( o9 != o12 & ( o10 != o12 & ( o11 != o12 & ( eo1 != o13 & ( eo2 != o13 & ( eo3 != o13 & ( o1 != o13 & ( o2 != o13 & ( o3 != o13 & ( o4 != o13 & ( o5 != o13 & ( o6 != o13 & ( o7 != o13 & ( o8 != o13 & ( o9 != o13 & ( o10 != o13 & ( o11 != o13 & ( o12 != o13 & ( eo1 != o14 & ( eo2 != o14 & ( eo3 != o14 & ( o1 != o14 & ( o2 != o14 & ( o3 != o14 & ( o4 != o14 & ( o5 != o14 & ( o6 != o14 & ( o7 != o14 & ( o8 != o14 & ( o9 != o14 & ( o10 != o14 & ( o11 != o14 & ( o12 != o14 & ( o13 != o14 & ( eo1 != o15 & ( eo2 != o15 & ( eo3 != o15 & ( o1 != o15 & ( o2 != o15 & ( o3 != o15 & ( o4 != o15 & ( o5 != o15 & ( o6 != o15 & ( o7 != o15 & ( o8 != o15 & ( o9 != o15 & ( o10 != o15 & ( o11 != o15 & ( o12 != o15 & ( o13 != o15 & ( o14 != o15 & ( eo1 != o16 & ( eo2 != o16 & ( eo3 != o16 & ( o1 != o16 & ( o2 != o16 & ( o3 != o16 & ( o4 != o16 & ( o5 != o16 & ( o6 != o16 & ( o7 != o16 & ( o8 != o16 & ( o9 != o16 & ( o10 != o16 & ( o11 != o16 & ( o12 != o16 & ( o13 != o16 & ( o14 != o16 & ( o15 != o16 & ( eo1 != o17 & ( eo2 != o17 & ( eo3 != o17 & ( o1 != o17 & ( o2 != o17 & ( o3 != o17 & ( o4 != o17 & ( o5 != o17 & ( o6 != o17 & ( o7 != o17 & ( o8 != o17 & ( o9 != o17 & ( o10 != o17 & ( o11 != o17 & ( o12 != o17 & ( o13 != o17 & ( o14 != o17 & ( o15 != o17 & ( o16 != o17 & ( eo1 != o18 & ( eo2 != o18 & ( eo3 != o18 & ( o1 != o18 & ( o2 != o18 & ( o3 != o18 & ( o4 != o18 & ( o5 != o18 & ( o6 != o18 & ( o7 != o18 & ( o8 != o18 & ( o9 != o18 & ( o10 != o18 & ( o11 != o18 & ( o12 != o18 & ( o13 != o18 & ( o14 != o18 & ( o15 != o18 & ( o16 != o18 & ( o17 != o18 & ( eo1 != o19 & ( eo2 != o19 & ( eo3 != o19 & ( o1 != o19 & ( o2 != o19 & ( o3 != o19 & ( o4 != o19 & ( o5 != o19 & ( o6 != o19 & ( o7 != o19 & ( o8 != o19 & ( o9 != o19 & ( o10 != o19 & ( o11 != o19 & ( o12 != o19 & ( o13 != o19 & ( o14 != o19 & ( o15 != o19 & ( o16 != o19 & ( o17 != o19 & ( o18 != o19 & ( eo1 != o20 & ( eo2 != o20 & ( eo3 != o20 & ( o1 != o20 & ( o2 != o20 & ( o3 != o20 & ( o4 != o20 & ( o5 != o20 & ( o6 != o20 & ( o7 != o20 & ( o8 != o20 & ( o9 != o20 & ( o10 != o20 & ( o11 != o20 & ( o12 != o20 & ( o13 != o20 & ( o14 != o20 & ( o15 != o20 & ( o16 != o20 & ( o17 != o20 & ( o18 != o20 & ( o19 != o20 & ( eo1 != o21 & ( eo2 != o21 & ( eo3 != o21 & ( o1 != o21 & ( o2 != o21 & ( o3 != o21 & ( o4 != o21 & ( o5 != o21 & ( o6 != o21 & ( o7 != o21 & ( o8 != o21 & ( o9 != o21 & ( o10 != o21 & ( o11 != o21 & ( o12 != o21 & ( o13 != o21 & ( o14 != o21 & ( o15 != o21 & ( o16 != o21 & ( o17 != o21 & ( o18 != o21 & ( o19 != o21 & ( o20 != o21 & ( eo1 != o22 & ( eo2 != o22 & ( eo3 != o22 & ( o1 != o22 & ( o2 != o22 & ( o3 != o22 & ( o4 != o22 & ( o5 != o22 & ( o6 != o22 & ( o7 != o22 & ( o8 != o22 & ( o9 != o22 & ( o10 != o22 & ( o11 != o22 & ( o12 != o22 & ( o13 != o22 & ( o14 != o22 & ( o15 != o22 & ( o16 != o22 & ( o17 != o22 & ( o18 != o22 & ( o19 != o22 & ( o20 != o22 & ( o21 != o22 & ( eo1 != o23 & ( eo2 != o23 & ( eo3 != o23 & ( o1 != o23 & ( o2 != o23 & ( o3 != o23 & ( o4 != o23 & ( o5 != o23 & ( o6 != o23 & ( o7 != o23 & ( o8 != o23 & ( o9 != o23 & ( o10 != o23 & ( o11 != o23 & ( o12 != o23 & ( o13 != o23 & ( o14 != o23 & ( o15 != o23 & ( o16 != o23 & ( o17 != o23 & ( o18 != o23 & ( o19 != o23 & ( o20 != o23 & ( o21 != o23 & ( o22 != o23 & ( eo1 != o24 & ( eo2 != o24 & ( eo3 != o24 & ( o1 != o24 & ( o2 != o24 & ( o3 != o24 & ( o4 != o24 & ( o5 != o24 & ( o6 != o24 & ( o7 != o24 & ( o8 != o24 & ( o9 != o24 & ( o10 != o24 & ( o11 != o24 & ( o12 != o24 & ( o13 != o24 & ( o14 != o24 & ( o15 != o24 & ( o16 != o24 & ( o17 != o24 & ( o18 != o24 & ( o19 != o24 & ( o20 != o24 & ( o21 != o24 & ( o22 != o24 & ( o23 != o24 & ( eo1 != o25 & ( eo2 != o25 & ( eo3 != o25 & ( o1 != o25 & ( o2 != o25 & ( o3 != o25 & ( o4 != o25 & ( o5 != o25 & ( o6 != o25 & ( o7 != o25 & ( o8 != o25 & ( o9 != o25 & ( o10 != o25 & ( o11 != o25 & ( o12 != o25 & ( o13 != o25 & ( o14 != o25 & ( o15 != o25 & ( o16 != o25 & ( o17 != o25 & ( o18 != o25 & ( o19 != o25 & ( o20 != o25 & ( o21 != o25 & ( o22 != o25 & ( o23 != o25 & ( o24 != o25 & ( eo1 != o26 & ( eo2 != o26 & ( eo3 != o26 & ( o1 != o26 & ( o2 != o26 & ( o3 != o26 & ( o4 != o26 & ( o5 != o26 & ( o6 != o26 & ( o7 != o26 & ( o8 != o26 & ( o9 != o26 & ( o10 != o26 & ( o11 != o26 & ( o12 != o26 & ( o13 != o26 & ( o14 != o26 & ( o15 != o26 & ( o16 != o26 & ( o17 != o26 & ( o18 != o26 & ( o19 != o26 & ( o20 != o26 & ( o21 != o26 & ( o22 != o26 & ( o23 != o26 & ( o24 != o26 & ( o25 != o26 & ( eo1 != o27 & ( eo2 != o27 & ( eo3 != o27 & ( o1 != o27 & ( o2 != o27 & ( o3 != o27 & ( o4 != o27 & ( o5 != o27 & ( o6 != o27 & ( o7 != o27 & ( o8 != o27 & ( o9 != o27 & ( o10 != o27 & ( o11 != o27 & ( o12 != o27 & ( o13 != o27 & ( o14 != o27 & ( o15 != o27 & ( o16 != o27 & ( o17 != o27 & ( o18 != o27 & ( o19 != o27 & ( o20 != o27 & ( o21 != o27 & ( o22 != o27 & ( o23 != o27 & ( o24 != o27 & ( o25 != o27 & ( o26 != o27 & ( eo1 != o28 & ( eo2 != o28 & ( eo3 != o28 & ( o1 != o28 & ( o2 != o28 & ( o3 != o28 & ( o4 != o28 & ( o5 != o28 & ( o6 != o28 & ( o7 != o28 & ( o8 != o28 & ( o9 != o28 & ( o10 != o28 & ( o11 != o28 & ( o12 != o28 & ( o13 != o28 & ( o14 != o28 & ( o15 != o28 & ( o16 != o28 & ( o17 != o28 & ( o18 != o28 & ( o19 != o28 & ( o20 != o28 & ( o21 != o28 & ( o22 != o28 & ( o23 != o28 & ( o24 != o28 & ( o25 != o28 & ( o26 != o28 & ( o27 != o28 & ( eo1 != o29 & ( eo2 != o29 & ( eo3 != o29 & ( o1 != o29 & ( o2 != o29 & ( o3 != o29 & ( o4 != o29 & ( o5 != o29 & ( o6 != o29 & ( o7 != o29 & ( o8 != o29 & ( o9 != o29 & ( o10 != o29 & ( o11 != o29 & ( o12 != o29 & ( o13 != o29 & ( o14 != o29 & ( o15 != o29 & ( o16 != o29 & ( o17 != o29 & ( o18 != o29 & ( o19 != o29 & ( o20 != o29 & ( o21 != o29 & ( o22 != o29 & ( o23 != o29 & ( o24 != o29 & ( o25 != o29 & ( o26 != o29 & ( o27 != o29 & ( o28 != o29 & ( eo1 != o30 & ( eo2 != o30 & ( eo3 != o30 & ( o1 != o30 & ( o2 != o30 & ( o3 != o30 & ( o4 != o30 & ( o5 != o30 & ( o6 != o30 & ( o7 != o30 & ( o8 != o30 & ( o9 != o30 & ( o10 != o30 & ( o11 != o30 & ( o12 != o30 & ( o13 != o30 & ( o14 != o30 & ( o15 != o30 & ( o16 != o30 & ( o17 != o30 & ( o18 != o30 & ( o19 != o30 & ( o20 != o30 & ( o21 != o30 & ( o22 != o30 & ( o23 != o30 & ( o24 != o30 & ( o25 != o30 & ( o26 != o30 & ( o27 != o30 & ( o28 != o30 & ( o29 != o30 & ( eo1 != o31 & ( eo2 != o31 & ( eo3 != o31 & ( o1 != o31 & ( o2 != o31 & ( o3 != o31 & ( o4 != o31 & ( o5 != o31 & ( o6 != o31 & ( o7 != o31 & ( o8 != o31 & ( o9 != o31 & ( o10 != o31 & ( o11 != o31 & ( o12 != o31 & ( o13 != o31 & ( o14 != o31 & ( o15 != o31 & ( o16 != o31 & ( o17 != o31 & ( o18 != o31 & ( o19 != o31 & ( o20 != o31 & ( o21 != o31 & ( o22 != o31 & ( o23 != o31 & ( o24 != o31 & ( o25 != o31 & ( o26 != o31 & ( o27 != o31 & ( o28 != o31 & ( o29 != o31 & ( o30 != o31 & ( eo1 != o32 & ( eo2 != o32 & ( eo3 != o32 & ( o1 != o32 & ( o2 != o32 & ( o3 != o32 & ( o4 != o32 & ( o5 != o32 & ( o6 != o32 & ( o7 != o32 & ( o8 != o32 & ( o9 != o32 & ( o10 != o32 & ( o11 != o32 & ( o12 != o32 & ( o13 != o32 & ( o14 != o32 & ( o15 != o32 & ( o16 != o32 & ( o17 != o32 & ( o18 != o32 & ( o19 != o32 & ( o20 != o32 & ( o21 != o32 & ( o22 != o32 & ( o23 != o32 & ( o24 != o32 & ( o25 != o32 & ( o26 != o32 & ( o27 != o32 & ( o28 != o32 & ( o29 != o32 & ( o30 != o32 & ( o31 != o32 & ( eo1 != o33 & ( eo2 != o33 & ( eo3 != o33 & ( o1 != o33 & ( o2 != o33 & ( o3 != o33 & ( o4 != o33 & ( o5 != o33 & ( o6 != o33 & ( o7 != o33 & ( o8 != o33 & ( o9 != o33 & ( o10 != o33 & ( o11 != o33 & ( o12 != o33 & ( o13 != o33 & ( o14 != o33 & ( o15 != o33 & ( o16 != o33 & ( o17 != o33 & ( o18 != o33 & ( o19 != o33 & ( o20 != o33 & ( o21 != o33 & ( o22 != o33 & ( o23 != o33 & ( o24 != o33 & ( o25 != o33 & ( o26 != o33 & ( o27 != o33 & ( o28 != o33 & ( o29 != o33 & ( o30 != o33 & ( o31 != o33 & ( o32 != o33 & ( eo1 != o34 & ( eo2 != o34 & ( eo3 != o34 & ( o1 != o34 & ( o2 != o34 & ( o3 != o34 & ( o4 != o34 & ( o5 != o34 & ( o6 != o34 & ( o7 != o34 & ( o8 != o34 & ( o9 != o34 & ( o10 != o34 & ( o11 != o34 & ( o12 != o34 & ( o13 != o34 & ( o14 != o34 & ( o15 != o34 & ( o16 != o34 & ( o17 != o34 & ( o18 != o34 & ( o19 != o34 & ( o20 != o34 & ( o21 != o34 & ( o22 != o34 & ( o23 != o34 & ( o24 != o34 & ( o25 != o34 & ( o26 != o34 & ( o27 != o34 & ( o28 != o34 & ( o29 != o34 & ( o30 != o34 & ( o31 != o34 & ( o32 != o34 & ( o33 != o34 & ( eo1 != o35 & ( eo2 != o35 & ( eo3 != o35 & ( o1 != o35 & ( o2 != o35 & ( o3 != o35 & ( o4 != o35 & ( o5 != o35 & ( o6 != o35 & ( o7 != o35 & ( o8 != o35 & ( o9 != o35 & ( o10 != o35 & ( o11 != o35 & ( o12 != o35 & ( o13 != o35 & ( o14 != o35 & ( o15 != o35 & ( o16 != o35 & ( o17 != o35 & ( o18 != o35 & ( o19 != o35 & ( o20 != o35 & ( o21 != o35 & ( o22 != o35 & ( o23 != o35 & ( o24 != o35 & ( o25 != o35 & ( o26 != o35 & ( o27 != o35 & ( o28 != o35 & ( o29 != o35 & ( o30 != o35 & ( o31 != o35 & ( o32 != o35 & ( o33 != o35 & ( o34 != o35 & ( eo1 != o36 & ( eo2 != o36 & ( eo3 != o36 & ( o1 != o36 & ( o2 != o36 & ( o3 != o36 & ( o4 != o36 & ( o5 != o36 & ( o6 != o36 & ( o7 != o36 & ( o8 != o36 & ( o9 != o36 & ( o10 != o36 & ( o11 != o36 & ( o12 != o36 & ( o13 != o36 & ( o14 != o36 & ( o15 != o36 & ( o16 != o36 & ( o17 != o36 & ( o18 != o36 & ( o19 != o36 & ( o20 != o36 & ( o21 != o36 & ( o22 != o36 & ( o23 != o36 & ( o24 != o36 & ( o25 != o36 & ( o26 != o36 & ( o27 != o36 & ( o28 != o36 & ( o29 != o36 & ( o30 != o36 & ( o31 != o36 & ( o32 != o36 & ( o33 != o36 & ( o34 != o36 & ( o35 != o36 & ( eo1 != o37 & ( eo2 != o37 & ( eo3 != o37 & ( o1 != o37 & ( o2 != o37 & ( o3 != o37 & ( o4 != o37 & ( o5 != o37 & ( o6 != o37 & ( o7 != o37 & ( o8 != o37 & ( o9 != o37 & ( o10 != o37 & ( o11 != o37 & ( o12 != o37 & ( o13 != o37 & ( o14 != o37 & ( o15 != o37 & ( o16 != o37 & ( o17 != o37 & ( o18 != o37 & ( o19 != o37 & ( o20 != o37 & ( o21 != o37 & ( o22 != o37 & ( o23 != o37 & ( o24 != o37 & ( o25 != o37 & ( o26 != o37 & ( o27 != o37 & ( o28 != o37 & ( o29 != o37 & ( o30 != o37 & ( o31 != o37 & ( o32 != o37 & ( o33 != o37 & ( o34 != o37 & ( o35 != o37 & ( o36 != o37 & ( eo1 != o38 & ( eo2 != o38 & ( eo3 != o38 & ( o1 != o38 & ( o2 != o38 & ( o3 != o38 & ( o4 != o38 & ( o5 != o38 & ( o6 != o38 & ( o7 != o38 & ( o8 != o38 & ( o9 != o38 & ( o10 != o38 & ( o11 != o38 & ( o12 != o38 & ( o13 != o38 & ( o14 != o38 & ( o15 != o38 & ( o16 != o38 & ( o17 != o38 & ( o18 != o38 & ( o19 != o38 & ( o20 != o38 & ( o21 != o38 & ( o22 != o38 & ( o23 != o38 & ( o24 != o38 & ( o25 != o38 & ( o26 != o38 & ( o27 != o38 & ( o28 != o38 & ( o29 != o38 & ( o30 != o38 & ( o31 != o38 & ( o32 != o38 & ( o33 != o38 & ( o34 != o38 & ( o35 != o38 & ( o36 != o38 & ( o37 != o38 & ( eo1 != o39 & ( eo2 != o39 & ( eo3 != o39 & ( o1 != o39 & ( o2 != o39 & ( o3 != o39 & ( o4 != o39 & ( o5 != o39 & ( o6 != o39 & ( o7 != o39 & ( o8 != o39 & ( o9 != o39 & ( o10 != o39 & ( o11 != o39 & ( o12 != o39 & ( o13 != o39 & ( o14 != o39 & ( o15 != o39 & ( o16 != o39 & ( o17 != o39 & ( o18 != o39 & ( o19 != o39 & ( o20 != o39 & ( o21 != o39 & ( o22 != o39 & ( o23 != o39 & ( o24 != o39 & ( o25 != o39 & ( o26 != o39 & ( o27 != o39 & ( o28 != o39 & ( o29 != o39 & ( o30 != o39 & ( o31 != o39 & ( o32 != o39 & ( o33 != o39 & ( o34 != o39 & ( o35 != o39 & ( o36 != o39 & ( o37 != o39 & ( o38 != o39 & ( eo1 != o40 & ( eo2 != o40 & ( eo3 != o40 & ( o1 != o40 & ( o2 != o40 & ( o3 != o40 & ( o4 != o40 & ( o5 != o40 & ( o6 != o40 & ( o7 != o40 & ( o8 != o40 & ( o9 != o40 & ( o10 != o40 & ( o11 != o40 & ( o12 != o40 & ( o13 != o40 & ( o14 != o40 & ( o15 != o40 & ( o16 != o40 & ( o17 != o40 & ( o18 != o40 & ( o19 != o40 & ( o20 != o40 & ( o21 != o40 & ( o22 != o40 & ( o23 != o40 & ( o24 != o40 & ( o25 != o40 & ( o26 != o40 & ( o27 != o40 & ( o28 != o40 & ( o29 != o40 & ( o30 != o40 & ( o31 != o40 & ( o32 != o40 & ( o33 != o40 & ( o34 != o40 & ( o35 != o40 & ( o36 != o40 & ( o37 != o40 & ( o38 != o40 & o39 != o40 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

 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 ) ) ) ) .

@@ -28,12 +28,16 @@ fof ( compliance_terminator_FunctionalData , axiom , ! [ V_0 , V_1 ] : ( r_termi
 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_r_interface_FunctionalElement , axiom , ! [ A ] : ( t_FunctionalInterface ( A ) => ? [ B ] : ( t_FunctionalElement ( B ) & r_interface_FunctionalElement ( B , A ) ) ) ) .

-fof ( containment_r_rootElements_FunctionalArchitectureModel , axiom , ! [ A ] : ( t_FunctionalElement ( A ) => ? [ B ] : ( t_FunctionalArchitectureModel ( B ) & r_rootElements_FunctionalArchitectureModel ( B , A ) ) ) ) .

-fof ( containment_r_subElements_Function , axiom , ! [ A ] : ( t_FunctionalElement ( A ) => ? [ B ] : ( t_Function ( B ) & r_subElements_Function ( B , A ) ) ) ) .

-fof ( containment_r_data_FunctionalInterface , axiom , ! [ A ] : ( t_FunctionalData ( A ) => ? [ B ] : ( t_FunctionalInterface ( B ) & r_data_FunctionalInterface ( B , A ) ) ) ) .

-fof ( containment_r_outgoingLinks_FunctionalOutput , axiom , ! [ A ] : ( t_InformationLink ( A ) => ? [ B ] : ( t_FunctionalOutput ( B ) & r_outgoingLinks_FunctionalOutput ( B , A ) ) ) ) .

-fof ( containment_r_terminator_FunctionalData , axiom , ! [ A ] : ( t_FAMTerminator ( A ) => ? [ B ] : ( t_FunctionalData ( B ) & r_terminator_FunctionalData ( B , A ) ) ) ) .

+

+

+fof ( containment_r_interface_FunctionalElement , axiom , ! [ A ] : ( t_FunctionalInterface ( A ) => ? [ B ] : r_interface_FunctionalElement ( B , A ) ) ) .

+fof ( containment_r_rootElements_FunctionalArchitectureModel , axiom , ! [ A ] : ( t_FunctionalElement ( A ) => ? [ B ] : r_rootElements_FunctionalArchitectureModel ( B , A ) ) ) .

+fof ( containment_r_subElements_Function , axiom , ! [ A ] : ( t_FunctionalElement ( A ) => ? [ B ] : r_subElements_Function ( B , A ) ) ) .

+fof ( containment_r_data_FunctionalInterface , axiom , ! [ A ] : ( t_FunctionalData ( A ) => ? [ B ] : r_data_FunctionalInterface ( B , A ) ) ) .

+fof ( containment_r_outgoingLinks_FunctionalOutput , axiom , ! [ A ] : ( t_InformationLink ( A ) => ? [ B ] : r_outgoingLinks_FunctionalOutput ( B , A ) ) ) .

+fof ( containment_r_terminator_FunctionalData , axiom , ! [ A ] : ( t_FAMTerminator ( A ) => ? [ B ] : r_terminator_FunctionalData ( B , A ) ) ) .

+

+

 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 ) ) ) .

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/VampireTest/vampireProblem.tptp b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/VampireTest/vampireProblem.tptp
deleted file mode 100644
index 4c368859..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/VampireTest/vampireProblem.tptp
+++ /dev/null
@@ -1,7 +0,0 @@
-% This is an initial Test Comment

-fof ( typeDef_oldRPS , axiom , ! [ A ] : ( t_oldRPS ( A ) <=> ( e_Rock_oldRPS ( A ) | ( e_Paper_oldRPS ( A ) | e_Scissor_oldRPS ( A ) ) ) ) ) .

-fof ( hierarchyHandler , axiom , ! [ A ] : ( object ( A ) <=> t_oldRPS ( A ) ) ) .

-fof ( typeScope , axiom , ! [ A ] : ( object ( A ) <=> ( A = o1 | ( A = o2 | ( A = o3 | A = o4 ) ) ) ) ) .

-fof ( typeUniqueness , axiom , o1 != o2 & ( o1 != o3 & ( o2 != o3 & ( o1 != o4 & ( o2 != o4 & o3 != o4 ) ) ) ) ) .

-fof ( compliance_beats2 , axiom , ! [ Var_0 , Var_1 ] : ( rel_beats2 ( Var_0 , Var_1 ) => ( t_oldRPS ( Var_0 ) & t_oldRPS ( Var_1 ) ) ) ) .

-fof ( assertion1 , axiom , ! [ Var_x ] : ( t_oldRPS ( Var_x ) => ? [ Var_y ] : ( t_oldRPS ( Var_y ) & ( rel_beats2 ( Var_x , Var_y ) & ( Var_x != Var_y & ~ rel_beats2 ( Var_y , Var_x ) ) ) ) ) ) .

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
index 86c9092a..1559ee3f 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
@@ -4,11 +4,11 @@ import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory

 import functionalarchitecture.Function

+import functionalarchitecture.FunctionalInterface

+import functionalarchitecture.FunctionalOutput

 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

 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.logiclanguage.Type

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult

@@ -30,8 +30,7 @@ import org.eclipse.emf.ecore.EReference
 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

 import org.eclipse.viatra.query.runtime.api.IQueryGroup

-import org.eclipse.emf.ecore.EClassifier

-import functionalarchitecture.FunctionalOutput

+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

 

 class GeneralTest {

         def static String createAndSolveProblem(EcoreMetamodelDescriptor metamodel, List<EObject> partialModel,

@@ -67,7 +66,7 @@ class GeneralTest {
                         list2MapMin.get(Function.simpleName)

                 ), 1)

                 typeMapMin.put(ecore2Logic.TypeofEClass(modelGenerationProblem.trace, 

-                        list2MapMin.get(functionalarchitecture.FunctionalInterface.simpleName)

+                        list2MapMin.get(FunctionalInterface.simpleName)

                 ), 2)

                 typeMapMin.put(ecore2Logic.TypeofEClass(modelGenerationProblem.trace, 

                         list2MapMin.get(FunctionalOutput.simpleName)

@@ -80,7 +79,7 @@ class GeneralTest {
                 ), 5)

                 typeMapMax.put(ecore2Logic.TypeofEClass(

                         modelGenerationProblem.trace,

-                        list2MapMax.get(functionalarchitecture.FunctionalInterface.simpleName)

+                        list2MapMax.get(FunctionalInterface.simpleName)

                 ), 2)

                 typeMapMax.put(ecore2Logic.TypeofEClass(

                         modelGenerationProblem.trace,

@@ -92,7 +91,7 @@ class GeneralTest {
                         // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

                         it.typeScopes.minNewElements = 6

-                        it.typeScopes.maxNewElements = 8

+                        it.typeScopes.maxNewElements = 40

                         it.typeScopes.minNewElementsByType = typeMapMin

                         it.typeScopes.maxNewElementsByType = typeMapMax

                 ]

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTestAlloy.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTestAlloy.xtend
new file mode 100644
index 00000000..b0af3f64
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTestAlloy.xtend
@@ -0,0 +1,190 @@
+package ca.mcgill.ecse.dslreasoner.vampire.icse
+
+import ca.mcgill.ecse.dslreasoner.vampire.queries.Patterns
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage
+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolver
+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolverConfiguration
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.IntStatisticEntry
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.StringStatisticEntry
+import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
+import java.io.PrintWriter
+import java.text.SimpleDateFormat
+import java.util.Date
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl.ModelResultImpl
+
+class YakinduTestAlloy {
+        def static void main(String[] args) {
+                val Ecore2Logic ecore2Logic = new Ecore2Logic
+                val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)
+                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)
+                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic
+
+                // Workspace setup
+                val Date date = new Date(System.currentTimeMillis)
+                val SimpleDateFormat format = new SimpleDateFormat("dd-HHmm");
+                val formattedDate = format.format(date)
+
+                val inputs = new FileSystemWorkspace('''initialModels/''', "")
+                val dataWorkspace = new FileSystemWorkspace('''output/YakinduTest/''', "")
+                val workspace = new FileSystemWorkspace('''output/YakinduTest/''' + formattedDate + '''/''', "")
+                workspace.initAndClear
+
+                // Logicproblem writing setup
+                val reg = Resource.Factory.Registry.INSTANCE
+                val map = reg.extensionToFactoryMap
+                map.put("logicproblem", new XMIResourceFactoryImpl)
+
+                println("Input and output workspaces are created")
+
+                val metamodel = GeneralTest.loadMetamodel(YakindummPackage.eINSTANCE)
+                val partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/Yakindu.xmi")
+                val queries = GeneralTest.loadQueries(metamodel, Patterns.instance)
+//              val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE)
+//              val partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi")
+//              val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance)
+//              val queries = null
+                println("DSL loaded")
+
+                var SZ_TOP = 100
+                var SZ_BOT = 100
+                var INC = 20
+                var REPS = 25
+
+                val RUNTIME = 300
+
+                var solverTimes = newArrayList
+                var transformationTimes = newArrayList
+                var LogicResult solution = null
+                var solver = "Alloy"
+
+                for (var k = 0; k < 1; k++) {
+
+                        for (var i = SZ_BOT; i <= SZ_TOP; i += INC) {
+                                var writer = new PrintWriter(
+                                        dataWorkspace.workspaceURI + "//_alloy" + i + "x" + REPS + "-" + formattedDate + ".csv")
+                                writer.append("solver,size,TransformatonTime,sat?,kodkodTime,model?,modelTime\n")
+
+                                val num = (i - SZ_BOT) / INC
+                                println()
+                                println("SOLVER: " + solver + ", SIZE=" + i)
+                                println()
+
+                                solverTimes.clear
+                                transformationTimes.clear
+                                for (var j = 0; j < REPS; j++) {
+                                        val Date date2 = new Date(System.currentTimeMillis)
+                                        val formattedDate2 = format.format(date2)
+                                        println(formattedDate2)
+                                        println("<<Run number " + j + ">> :")
+
+                                        val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel,
+                                                new Ecore2LogicConfiguration())
+                                        var modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel)
+                                        var validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem,
+                                                new Viatra2LogicConfiguration)
+
+                                        var problem = modelGenerationProblem.output
+//                              workspace.writeModel(problem, "Yakindu.logicproblem")
+//                               println("Problem created")
+//                               Start Time
+                                        var startTime = System.currentTimeMillis
+
+                                        var AlloySolver reasoner
+                                        // *
+                                        reasoner = new AlloySolver
+
+                                        // /////////////////////////////////////////////////////
+                                        // Define Config File           
+                                        val size = i
+                                        val inc = INC
+                                        val iter = j
+                                        val solverConfig = new AlloySolverConfiguration => [
+                                                // add configuration things, in config file first
+                                                it.documentationLevel = DocumentationLevel::FULL
+//                                              it.iteration = iter
+                                                it.runtimeLimit = RUNTIME
+//                                      it.typeScopes.maxNewElements = size
+                                                it.typeScopes.minNewElements = size
+                                                it.typeScopes.maxNewElements = size
+                                        ]
+                                        solution = reasoner.solve(problem, solverConfig, workspace)
+//                              print((solution as ModelResult).representation.get(0))
+//                              val soln = ((solution as ModelResult).representation.get(0) as VampireModel)
+//                              println(soln.confirmations)
+//                              println((solution as ModelResult).representation)
+//                              modelFound = !soln.confirmations.filter [
+//                                      class == VLSFiniteModelImpl
+//                              ].isEmpty
+//      ADD TO CSV
+                                        writer.append(solver + ",")
+                                        writer.append(size + ",")
+                                        writer.append(solution.statistics.transformationTime / 1000.0 + ",")
+
+//                                      val satOut = (solution.statistics.entries.filter[name == "satOut"].get(0) as StringStatisticEntry).
+//                                              value
+                                        val kodKodTime = (solution.statistics.entries.filter[name == "Alloy2KodKodTransformationTime"].
+                                                get(0) as IntStatisticEntry).value
+//                                              print(solution.class)
+                                        val modOut = if(solution.class == ModelResultImpl) "FiniteModel" else "no"
+                                        val mod = solution.statistics.entries.filter[name == "Answer0Time"]
+                                        var modTime = 0.0
+                                        if (!mod.isEmpty) {
+                                                modTime = (mod.get(0) as IntStatisticEntry).value / 1000.0
+
+                                        }
+                                        writer.append("-,")
+                                        writer.append(kodKodTime.toString + ",")
+                                        writer.append(modOut + ",")
+                                        writer.append(modTime.toString + "")
+                                        writer.append("\n")
+
+                                        println("->" + modOut + " ... " + modTime)
+
+                                        // Run Garbage Collector
+                                        val Runtime r = Runtime.getRuntime();
+                                        r.gc();
+                                        r.gc();
+                                        r.gc();
+                                        Thread.sleep(3000)
+
+//                              print("(" + tTime + "/" + sTime + "s)..")
+//                              solverTimes.add(sTime)
+//                              transformationTimes.add(tTime)
+//                              } else {
+//                                      writer.append("MNF" + ",")
+////                                    print("MNF")
+//                              }
+                                // println("Problem solved")
+                                // visualisation, see 
+//                              var interpretations = reasoner.getInterpretations(solution as ModelResult)
+//                       for (interpretation : interpretations) {
+//                       val model = logic2Ecore.transformInterpretation(interpretation, modelGenerationProblem.trace)
+//                       workspace.writeModel(model, "model.xmi")
+//                      }
+//                       var totalTimeMin = (System.currentTimeMillis - startTime) / 60000
+//                       var totalTimeSec = ((System.currentTimeMillis - startTime) / 1000) % 60
+//                       println("Problem solved")
+//                       println("Time was: " + totalTimeMin + ":" + totalTimeSec)
+                                }
+//                      println()
+//                      var solverMed = solverTimes.sort.get(REPS / 2)
+//                      var transformationMed = transformationTimes.sort.get(REPS / 2)
+//                      writer.append(solverMed.toString + "," + transformationMed.toString)
+                                writer.close
+                        }
+
+                }
+
+        }
+
+}
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTestViatra.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTestViatra.xtend
new file mode 100644
index 00000000..dbc90e97
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTestViatra.xtend
@@ -0,0 +1,182 @@
+package ca.mcgill.ecse.dslreasoner.vampire.icse
+
+import ca.mcgill.ecse.dslreasoner.vampire.queries.Patterns
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage
+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolver
+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolverConfiguration
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.IntStatisticEntry
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.StringStatisticEntry
+import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
+import java.io.PrintWriter
+import java.text.SimpleDateFormat
+import java.util.Date
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl.ModelResultImpl
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration
+
+class YakinduTestViatra {
+        def static void main(String[] args) {
+                val Ecore2Logic ecore2Logic = new Ecore2Logic
+                val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)
+                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)
+                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic
+
+                // Workspace setup
+                val Date date = new Date(System.currentTimeMillis)
+                val SimpleDateFormat format = new SimpleDateFormat("dd-HHmm");
+                val formattedDate = format.format(date)
+
+                val inputs = new FileSystemWorkspace('''initialModels/''', "")
+                val dataWorkspace = new FileSystemWorkspace('''output/YakinduTest/''', "")
+                val workspace = new FileSystemWorkspace('''output/YakinduTest/''' + formattedDate + '''/''', "")
+                workspace.initAndClear
+
+                // Logicproblem writing setup
+                val reg = Resource.Factory.Registry.INSTANCE
+                val map = reg.extensionToFactoryMap
+                map.put("logicproblem", new XMIResourceFactoryImpl)
+
+                println("Input and output workspaces are created")
+
+                val metamodel = GeneralTest.loadMetamodel(YakindummPackage.eINSTANCE)
+                val partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/Yakindu.xmi")
+                val queries = GeneralTest.loadQueries(metamodel, Patterns.instance)
+//              val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE)
+//              val partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi")
+//              val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance)
+//              val queries = null
+                println("DSL loaded")
+
+                var SZ_TOP =  20
+                var SZ_BOT = 20
+                var INC = 20
+                var REPS = 5
+
+                val RUNTIME = 300
+
+                var solverTimes = newArrayList
+                var transformationTimes = newArrayList
+                var LogicResult solution = null
+                var solver = "Viatra"
+                var index = 2
+
+                for (var i = SZ_BOT; i <= SZ_TOP; i += INC*index) {
+                        index*=2
+                        var writer = new PrintWriter(
+                                        dataWorkspace.workspaceURI + "//_viatra" + i + "x" + REPS + "-" + formattedDate + ".csv")
+                        writer.append("solver,size,TransformatonTime,sat?,kodkodTime,model?,modelTime\n")
+
+                        val num = (i - SZ_BOT) / INC
+                        println()
+                        println("SOLVER: " + solver + ", SIZE=" + i)
+                        println()
+
+                        solverTimes.clear
+                        transformationTimes.clear
+                        for (var j = 0; j < REPS; j++) {
+
+                                println("<<Run number " + j + ">> :")
+
+                                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())
+                                var modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel)
+                                var validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem,
+                                        new Viatra2LogicConfiguration)
+
+                                var problem = modelGenerationProblem.output
+                                workspace.writeModel(problem, "Yakindu.logicproblem")
+//                               println("Problem created")
+//                               Start Time
+                                var startTime = System.currentTimeMillis
+
+                                var ViatraReasoner reasoner
+                                // *
+                                reasoner = new ViatraReasoner
+
+                                // /////////////////////////////////////////////////////
+                                // Define Config File           
+                                val size = i
+                                val inc = INC
+                                val iter = j
+                                val solverConfig = new ViatraReasonerConfiguration => [
+                                        // add configuration things, in config file first
+//                                              it.documentationLevel = DocumentationLevel::FULL
+//                                              it.iteration = iter
+                                        it.runtimeLimit = RUNTIME
+                                        it.typeScopes.maxNewElements = size
+                                        it.typeScopes.minNewElements = size
+                                ]
+
+                                solution = reasoner.solve(problem, solverConfig, workspace)
+//                              print((solution as ModelResult).representation.get(0))
+//                              val soln = ((solution as ModelResult).representation.get(0) as VampireModel)
+//                              println(soln.confirmations)
+//                              println((solution as ModelResult).representation)
+//                              modelFound = !soln.confirmations.filter [
+//                                      class == VLSFiniteModelImpl
+//                              ].isEmpty
+//      ADD TO CSV
+                                writer.append(solver + ",")
+                                writer.append(size + ",")
+                                writer.append(solution.statistics.transformationTime / 1000.0 + ",")
+
+//                                      val satOut = (solution.statistics.entries.filter[name == "satOut"].get(0) as StringStatisticEntry).
+//                                              value
+                                val modOut = if(solution.class == ModelResultImpl) "FiniteModel" else "no"
+//                                      val modTime = (solution.statistics.entries.filter[name.contains("Answer")].
+//                                              get(0) as StringStatisticEntry).value
+                                val modTime = solution.statistics.solverTime / 1000.0
+
+                                writer.append("-,")
+                                writer.append("-,")
+                                writer.append(modOut + ",")
+                                writer.append(modTime.toString + "")
+                                writer.append("\n")
+
+                                println("->" + modOut + " ... " + modTime)
+
+                                // Run Garbage Collector
+                                val Runtime r = Runtime.getRuntime();
+                                r.gc();
+                                r.gc();
+                                r.gc();
+                                Thread.sleep(3000)
+
+//                              print("(" + tTime + "/" + sTime + "s)..")
+//                              solverTimes.add(sTime)
+//                              transformationTimes.add(tTime)
+//                              } else {
+//                                      writer.append("MNF" + ",")
+////                                    print("MNF")
+//                              }
+                        // println("Problem solved")
+                        // visualisation, see 
+//                              var interpretations = reasoner.getInterpretations(solution as ModelResult)
+//                       for (interpretation : interpretations) {
+//                       val model = logic2Ecore.transformInterpretation(interpretation, modelGenerationProblem.trace)
+//                       workspace.writeModel(model, "model.xmi")
+//                      }
+//                       var totalTimeMin = (System.currentTimeMillis - startTime) / 60000
+//                       var totalTimeSec = ((System.currentTimeMillis - startTime) / 1000) % 60
+//                       println("Problem solved")
+//                       println("Time was: " + totalTimeMin + ":" + totalTimeSec)
+                        }
+//                      println()
+//                      var solverMed = solverTimes.sort.get(REPS / 2)
+//                      var transformationMed = transformationTimes.sort.get(REPS / 2)
+//                      writer.append(solverMed.toString + "," + transformationMed.toString)
+                        writer.close
+                }
+
+        }
+
+}
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/tester.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/tester.xtend
new file mode 100644
index 00000000..2bf0c4cc
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/tester.xtend
@@ -0,0 +1,35 @@
+package ca.mcgill.ecse.dslreasoner.vampire.icse
+
+import java.io.BufferedReader
+import java.io.FileInputStream
+import java.io.InputStream
+import java.io.InputStreamReader
+
+class tester {
+        def static void main(String[] args) {
+                val InputStream is = new FileInputStream("C://Users//Aren Babikian//git//VIATRA-Generator//Tests//ca.mcgill.ecse.dslreasoner.vampire.test//src//ca//mcgill//ecse//dslreasoner//vampire//icse//90-110Z3.txt");
+                val BufferedReader buf = new BufferedReader(new InputStreamReader(is));
+                var String line = buf.readLine();
+                val StringBuilder sb = new StringBuilder();
+                while (line != null) {
+                        sb.append(line);
+                        line = buf.readLine();
+                }
+                val String str = sb.toString();
+                
+                val satArray = str.split("Model")
+                
+                val satTimes = newArrayList
+                
+                for(sat : satArray.subList(1, satArray.length)) {
+                        satTimes.add(sat.substring(2, 8))
+                }
+                
+                for(t : satTimes) {
+                        println(t)
+                }
+                
+                
+
+        }
+}
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icseTests/FAMTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icseTests/FAMTest.xtend
deleted file mode 100644
index a8b4dcfb..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icseTests/FAMTest.xtend
+++ /dev/null
@@ -1,103 +0,0 @@
-package ca.mcgill.ecse.dslreasoner.vampire.test

-

-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.LogicReasoner

-import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult

-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 DslTest {

-        def static void main(String[] args) {

-                val inputs = new FileSystemWorkspace('''initialModels/''', "")

-                val workspace = new FileSystemWorkspace('''outputDslModels/''', "")

-                workspace.initAndClear

-

-                println("Input and output workspaces are created")

-

-                val metamodel = loadMetamodel()

-                val partialModel = loadPartialModel(inputs)

-//              val queries = loadQueries(metamodel)

-

-                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 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

-                        it.writeToFile = false

-                ]

-                

-                solution = reasoner.solve(logicProblem, vampireConfig,  workspace)

-                

-                println("Problem solved")

-                

-                

-        }

-

-        def private static loadMetamodel() {

-                //FAM

-                val pckg = FunctionalarchitecturePackage.eINSTANCE

-                val List<EClass> classes = pckg.EClassifiers.filter(EClass).toList

-                val List<EEnum> enums = pckg.EClassifiers.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)

-        }

-

-        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,"FAM.xmi").eResource.allContents.toList

-        }

-

-//      def private static loadQueries(EcoreMetamodelDescriptor metamodel) {

-//              val i = hu.bme.mit.inf.dslreasoner.domains.transima.fam.patterns.Pattern.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/queries/YakinduPatterns.txt b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/queries/YakinduPatterns.txt
new file mode 100644
index 00000000..8c2b9033
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/queries/YakinduPatterns.txt
@@ -0,0 +1,227 @@
+package ca.mcgill.ecse.dslreasoner.vampire.queries
+
+import epackage 
+
+/////////
+// Entry
+/////////
+
+pattern entryInRegion(r1 : Region, e1 : Entry) {
+        Region.vertices(r1, e1);
+}
+
+@Constraint(severity="error", message="error", key = {r1})
+pattern noEntryInRegion(r1 : Region) {
+        neg find entryInRegion(r1, _);
+}
+
+@Constraint(severity="error", message="error", key = {r})
+pattern multipleEntryInRegion(r : Region) {
+        find entryInRegion(r, e1);
+        find entryInRegion(r, e2);
+        e1 != e2;
+}
+
+pattern transition(t : Transition, src : Vertex, trg : Vertex) {
+        Transition.source(t, src);
+        Transition.target(t, trg);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern incomingToEntry(t : Transition, e : Entry) {
+        find transition(t, _, e);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern noOutgoingTransitionFromEntry(e : Entry) {
+        neg find transition(_, e, _);
+}
+
+@Constraint(severity="error", message="error", key = {e})
+pattern multipleTransitionFromEntry(e : Entry, t1 : Transition, t2: Transition) {
+        Entry.outgoingTransitions(e,t1);
+        Entry.outgoingTransitions(e,t2);
+        t1!=t2;
+}
+
+/////////
+// Exit
+/////////
+
+@Constraint(severity="error", message="error", key = {e})
+pattern outgoingFromExit(t : Transition, e : Exit) {
+        Exit.outgoingTransitions(e,t);
+}
+
+/////////
+// Final
+/////////
+
+@Constraint(severity="error", message="error", key = {f})
+pattern outgoingFromFinal(t : Transition, f : FinalState) {
+        FinalState.outgoingTransitions(f,t);
+}
+
+/////////
+// State vs Region
+/////////
+
+@Constraint(severity="error", message="error", key = {region})
+pattern noStateInRegion(region: Region) {
+        neg find StateInRegion(region,_);
+}
+pattern StateInRegion(region: Region, state: State) {
+        Region.vertices(region,state);
+}
+
+/////////
+// Choice
+/////////
+
+@Constraint(severity="error", message="error", key = {c})
+pattern choiceHasNoOutgoing(c : Choice) {
+        neg find transition(_, c, _);
+}
+
+@Constraint(severity="error", message="error", key = {c})
+pattern choiceHasNoIncoming(c: Choice) {
+        neg find transition(_, _, c);
+}
+
+///////////
+//// Synchronization
+///////////
+//
+//@Constraint(severity="error", message="error", key = {s})
+//pattern synchHasNoOutgoing(s : Synchronization) {
+//      neg find transition(_, s, _);
+//}
+//
+//@Constraint(severity="error", message="error", key = {s})
+//pattern synchHasNoIncoming(s : Synchronization) {
+//      neg find transition(_, _, s);
+//}
+//
+//@Constraint(severity="error", message="error", key = {s})
+//pattern SynchronizedIncomingInSameRegion(s : Synchronization, v1 : Vertex, v2 : Vertex) {
+//      find transition(t1, v1, s);
+//      find transition(t2, v2, s);
+//      t1!=t2;
+//      Region.vertices(r, v1);
+//      Region.vertices(r, v2);
+//} or {
+//      find transition(t1, s, v1);
+//      find transition(t2, s, v2);
+//      t1!=t2;
+//      Region.vertices(r, v1);
+//      Region.vertices(r, v2);
+//}
+//
+//@Constraint(severity="error", message="error", key = {s})
+//pattern notSynchronizingStates(s : Synchronization) {
+//      neg find hasMultipleOutgoingTrainsition(s);
+//      neg find hasMultipleIncomingTrainsition(s);
+//}
+//
+//pattern hasMultipleOutgoingTrainsition(v : Synchronization) {
+//      find transition(_, v, trg1);
+//      find transition(_, v, trg2);
+//      trg1 != trg2;
+//}
+//
+//pattern hasMultipleIncomingTrainsition(v : Synchronization) {
+//      find transition(_, src1, v);
+//      find transition(_, src2, v);
+//      src1 != src2;
+//}
+//
+//@Constraint(severity="error", message="error", key = {s})
+//pattern SynchronizedRegionsAreNotSiblings(s : Synchronization, v1 : Vertex, v2 : Vertex) {
+//      find transition(_, v1, s);
+//      find transition(_, v2, s);
+//      CompositeElement.regions.vertices(r1, v1);
+//      CompositeElement.regions.vertices(r2, v2);
+//      r1 != r2;
+//} or {
+//      find transition(_, s, v1);
+//      find transition(_, s, v2);
+//      CompositeElement.regions.vertices(r1, v1);
+//      CompositeElement.regions.vertices(r2, v2);
+//      r1 != r2;
+//}
+
+///////////////////////////////
+// Extra
+//
+//@Constraint(severity="error", message="error", key = {s})
+//pattern SynchronizedRegionDoesNotHaveParent(s : Synchronization, v : Vertex) {
+//      find transition(_, v, s);
+//      neg find child(_,v);
+//} or {
+//      find transition(_, s, v);
+//      neg find child(_,v);
+//}
+
+pattern child(parent: CompositeElement, child: Vertex) {
+        CompositeElement.regions.vertices(parent, child);
+}
+
+@Constraint(severity="error", message="error", key = {s})
+pattern SynchronizedRegionDoesNotHaveMultipleRegions(s : Synchronization, v : Vertex) {
+        find transition(_, v, s);
+        find child(c,v);
+        neg find hasMultipleRegions(c);
+} or {
+        find transition(_, s, v);
+        find child(c,v);
+        neg find hasMultipleRegions(c);
+}
+
+
+pattern hasMultipleRegions(composite: CompositeElement) {
+        CompositeElement.regions(composite,region1);
+        CompositeElement.regions(composite,region2);
+        region1 != region2;
+}
+
+/**
+ * Simplifying model generation
+ */
+@Constraint(severity="error", message="error", key = {s})
+pattern synchThree(s: Synchronization) {
+        Transition.target(t1,s);
+        Transition.target(t2,s);
+        Transition.target(t3,s);
+        t1!=t2;
+        t2!=t3;
+        t1!=t3;
+} or {
+        Transition.source(t1,s);
+        Transition.source(t2,s);
+        Transition.source(t3,s);
+        t1!=t2;
+        t2!=t3;
+        t1!=t3;
+}
+
+/**
+ * Simplifying model generation
+ */
+@Constraint(severity="error", message="error", key = {s1,s2})
+pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {
+        Synchronization(s1);
+        Synchronization(s2);
+        s1 != s2;
+}
+
+/**
+ * Model generation task: at least one synch
+ */
+//@Constraint(severity="error", message="error", key = {s})
+//pattern noSynch(s:Statechart) {
+//      Statechart(s);
+//      neg find synch(_);
+//}
+//pattern synch(s:Synchronization) {
+//      Synchronization(s);
+//}
\ No newline at end of file
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Choice.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Choice.java
new file mode 100644
index 00000000..8cd339c5
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Choice.java
@@ -0,0 +1,17 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Choice</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getChoice()
+ * @model
+ * @generated
+ */
+public interface Choice extends Pseudostate {
+} // Choice
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/CompositeElement.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/CompositeElement.java
new file mode 100644
index 00000000..cf2949d8
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/CompositeElement.java
@@ -0,0 +1,42 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Composite Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement#getRegions <em>Regions</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getCompositeElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CompositeElement extends EObject {
+        /**
+         * Returns the value of the '<em><b>Regions</b></em>' containment reference list.
+         * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Regions</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Regions</em>' containment reference list.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getCompositeElement_Regions()
+         * @model containment="true"
+         * @generated
+         */
+        EList<Region> getRegions();
+
+} // CompositeElement
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Entry.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Entry.java
new file mode 100644
index 00000000..57ecb460
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Entry.java
@@ -0,0 +1,52 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Entry</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getEntry()
+ * @model
+ * @generated
+ */
+public interface Entry extends Pseudostate {
+        /**
+         * Returns the value of the '<em><b>Type</b></em>' attribute.
+         * The literals are from the enumeration {@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Type</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Type</em>' attribute.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType
+         * @see #setType(EntryType)
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getEntry_Type()
+         * @model required="true"
+         * @generated
+         */
+        EntryType getType();
+
+        /**
+         * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry#getType <em>Type</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Type</em>' attribute.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType
+         * @see #getType()
+         * @generated
+         */
+        void setType(EntryType value);
+
+} // Entry
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/EntryType.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/EntryType.java
new file mode 100644
index 00000000..40072da6
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/EntryType.java
@@ -0,0 +1,239 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Entry Type</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getEntryType()
+ * @model
+ * @generated
+ */
+public enum EntryType implements Enumerator {
+        /**
+         * The '<em><b>Normal</b></em>' literal object.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #NORMAL_VALUE
+         * @generated
+         * @ordered
+         */
+        NORMAL(0, "Normal", "Normal"),
+
+        /**
+         * The '<em><b>History</b></em>' literal object.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #HISTORY_VALUE
+         * @generated
+         * @ordered
+         */
+        HISTORY(0, "History", "History"),
+
+        /**
+         * The '<em><b>Deep History</b></em>' literal object.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #DEEP_HISTORY_VALUE
+         * @generated
+         * @ordered
+         */
+        DEEP_HISTORY(0, "DeepHistory", "DeepHistory");
+
+        /**
+         * The '<em><b>Normal</b></em>' literal value.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of '<em><b>Normal</b></em>' literal object isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @see #NORMAL
+         * @model name="Normal"
+         * @generated
+         * @ordered
+         */
+        public static final int NORMAL_VALUE = 0;
+
+        /**
+         * The '<em><b>History</b></em>' literal value.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of '<em><b>History</b></em>' literal object isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @see #HISTORY
+         * @model name="History"
+         * @generated
+         * @ordered
+         */
+        public static final int HISTORY_VALUE = 0;
+
+        /**
+         * The '<em><b>Deep History</b></em>' literal value.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of '<em><b>Deep History</b></em>' literal object isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @see #DEEP_HISTORY
+         * @model name="DeepHistory"
+         * @generated
+         * @ordered
+         */
+        public static final int DEEP_HISTORY_VALUE = 0;
+
+        /**
+         * An array of all the '<em><b>Entry Type</b></em>' enumerators.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private static final EntryType[] VALUES_ARRAY =
+                new EntryType[] {
+                        NORMAL,
+                        HISTORY,
+                        DEEP_HISTORY,
+                };
+
+        /**
+         * A public read-only list of all the '<em><b>Entry Type</b></em>' enumerators.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static final List<EntryType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+        /**
+         * Returns the '<em><b>Entry Type</b></em>' literal with the specified literal value.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param literal the literal.
+         * @return the matching enumerator or <code>null</code>.
+         * @generated
+         */
+        public static EntryType get(String literal) {
+                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+                        EntryType result = VALUES_ARRAY[i];
+                        if (result.toString().equals(literal)) {
+                                return result;
+                        }
+                }
+                return null;
+        }
+
+        /**
+         * Returns the '<em><b>Entry Type</b></em>' literal with the specified name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param name the name.
+         * @return the matching enumerator or <code>null</code>.
+         * @generated
+         */
+        public static EntryType getByName(String name) {
+                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+                        EntryType result = VALUES_ARRAY[i];
+                        if (result.getName().equals(name)) {
+                                return result;
+                        }
+                }
+                return null;
+        }
+
+        /**
+         * Returns the '<em><b>Entry Type</b></em>' literal with the specified integer value.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the integer value.
+         * @return the matching enumerator or <code>null</code>.
+         * @generated
+         */
+        public static EntryType get(int value) {
+                switch (value) {
+                        case NORMAL_VALUE: return NORMAL;
+                }
+                return null;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private final int value;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private final String name;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private final String literal;
+
+        /**
+         * Only this class can construct instances.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EntryType(int value, String name, String literal) {
+                this.value = value;
+                this.name = name;
+                this.literal = literal;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getValue() {
+          return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+          return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getLiteral() {
+          return literal;
+        }
+
+        /**
+         * Returns the literal value of the enumerator, which is its string representation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                return literal;
+        }
+        
+} //EntryType
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Exit.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Exit.java
new file mode 100644
index 00000000..961a2aec
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Exit.java
@@ -0,0 +1,17 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Exit</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getExit()
+ * @model
+ * @generated
+ */
+public interface Exit extends Pseudostate {
+} // Exit
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java
new file mode 100644
index 00000000..bcc20dfd
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java
@@ -0,0 +1,17 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Final State</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getFinalState()
+ * @model
+ * @generated
+ */
+public interface FinalState extends RegularState {
+} // FinalState
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java
new file mode 100644
index 00000000..f938d5b3
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java
@@ -0,0 +1,17 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Pseudostate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getPseudostate()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Pseudostate extends Vertex {
+} // Pseudostate
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Region.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Region.java
new file mode 100644
index 00000000..ce361dce
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Region.java
@@ -0,0 +1,42 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Region</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region#getVertices <em>Vertices</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getRegion()
+ * @model
+ * @generated
+ */
+public interface Region extends EObject {
+        /**
+         * Returns the value of the '<em><b>Vertices</b></em>' containment reference list.
+         * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Vertices</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Vertices</em>' containment reference list.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getRegion_Vertices()
+         * @model containment="true" ordered="false"
+         * @generated
+         */
+        EList<Vertex> getVertices();
+
+} // Region
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/RegularState.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/RegularState.java
new file mode 100644
index 00000000..e5b552cd
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/RegularState.java
@@ -0,0 +1,17 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Regular State</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getRegularState()
+ * @model abstract="true"
+ * @generated
+ */
+public interface RegularState extends Vertex {
+} // RegularState
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/State.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/State.java
new file mode 100644
index 00000000..2cee971c
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/State.java
@@ -0,0 +1,17 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>State</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getState()
+ * @model
+ * @generated
+ */
+public interface State extends RegularState, CompositeElement {
+} // State
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Statechart.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Statechart.java
new file mode 100644
index 00000000..4d32fd53
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Statechart.java
@@ -0,0 +1,17 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Statechart</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getStatechart()
+ * @model
+ * @generated
+ */
+public interface Statechart extends CompositeElement {
+} // Statechart
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Transition.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Transition.java
new file mode 100644
index 00000000..0518bfdb
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Transition.java
@@ -0,0 +1,81 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Transition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getTarget <em>Target</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getSource <em>Source</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getTransition()
+ * @model
+ * @generated
+ */
+public interface Transition extends EObject {
+        /**
+         * Returns the value of the '<em><b>Target</b></em>' reference.
+         * It is bidirectional and its opposite is '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getIncomingTransitions <em>Incoming Transitions</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Target</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Target</em>' reference.
+         * @see #setTarget(Vertex)
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getTransition_Target()
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getIncomingTransitions
+         * @model opposite="incomingTransitions" required="true" ordered="false"
+         * @generated
+         */
+        Vertex getTarget();
+
+        /**
+         * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getTarget <em>Target</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Target</em>' reference.
+         * @see #getTarget()
+         * @generated
+         */
+        void setTarget(Vertex value);
+
+        /**
+         * Returns the value of the '<em><b>Source</b></em>' container reference.
+         * It is bidirectional and its opposite is '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getOutgoingTransitions <em>Outgoing Transitions</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Source</em>' container reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Source</em>' container reference.
+         * @see #setSource(Vertex)
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getTransition_Source()
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getOutgoingTransitions
+         * @model opposite="outgoingTransitions" transient="false" ordered="false"
+         * @generated
+         */
+        Vertex getSource();
+
+        /**
+         * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getSource <em>Source</em>}' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Source</em>' container reference.
+         * @see #getSource()
+         * @generated
+         */
+        void setSource(Vertex value);
+
+} // Transition
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Vertex.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Vertex.java
new file mode 100644
index 00000000..43db469b
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Vertex.java
@@ -0,0 +1,63 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Vertex</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getIncomingTransitions <em>Incoming Transitions</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getOutgoingTransitions <em>Outgoing Transitions</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getVertex()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Vertex extends EObject {
+        /**
+         * Returns the value of the '<em><b>Incoming Transitions</b></em>' reference list.
+         * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition}.
+         * It is bidirectional and its opposite is '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getTarget <em>Target</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Incoming Transitions</em>' reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Incoming Transitions</em>' reference list.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getVertex_IncomingTransitions()
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getTarget
+         * @model opposite="target" ordered="false"
+         * @generated
+         */
+        EList<Transition> getIncomingTransitions();
+
+        /**
+         * Returns the value of the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition}.
+         * It is bidirectional and its opposite is '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getSource <em>Source</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Outgoing Transitions</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Outgoing Transitions</em>' containment reference list.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#getVertex_OutgoingTransitions()
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getSource
+         * @model opposite="source" containment="true" ordered="false"
+         * @generated
+         */
+        EList<Transition> getOutgoingTransitions();
+
+} // Vertex
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/YakindummFactory.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/YakindummFactory.java
new file mode 100644
index 00000000..a530e71f
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/YakindummFactory.java
@@ -0,0 +1,105 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage
+ * @generated
+ */
+public interface YakindummFactory extends EFactory {
+        /**
+         * The singleton instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        YakindummFactory eINSTANCE = ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummFactoryImpl.init();
+
+        /**
+         * Returns a new object of class '<em>Region</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Region</em>'.
+         * @generated
+         */
+        Region createRegion();
+
+        /**
+         * Returns a new object of class '<em>Transition</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Transition</em>'.
+         * @generated
+         */
+        Transition createTransition();
+
+        /**
+         * Returns a new object of class '<em>Statechart</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Statechart</em>'.
+         * @generated
+         */
+        Statechart createStatechart();
+
+        /**
+         * Returns a new object of class '<em>Entry</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Entry</em>'.
+         * @generated
+         */
+        Entry createEntry();
+
+        /**
+         * Returns a new object of class '<em>State</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>State</em>'.
+         * @generated
+         */
+        State createState();
+
+        /**
+         * Returns a new object of class '<em>Choice</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Choice</em>'.
+         * @generated
+         */
+        Choice createChoice();
+
+        /**
+         * Returns a new object of class '<em>Exit</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Exit</em>'.
+         * @generated
+         */
+        Exit createExit();
+
+        /**
+         * Returns a new object of class '<em>Final State</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Final State</em>'.
+         * @generated
+         */
+        FinalState createFinalState();
+
+        /**
+         * Returns the package supported by this factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the package supported by this factory.
+         * @generated
+         */
+        YakindummPackage getYakindummPackage();
+
+} //YakindummFactory
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/YakindummPackage.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/YakindummPackage.java
new file mode 100644
index 00000000..f70e851a
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/YakindummPackage.java
@@ -0,0 +1,1032 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface YakindummPackage extends EPackage {
+        /**
+         * The package name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNAME = "yakindumm";
+
+        /**
+         * The package namespace URI.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_URI = "hu.bme.mit.inf.yakindumm";
+
+        /**
+         * The package namespace name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_PREFIX = "ca.mcgill.ecse.yakindumm";
+
+        /**
+         * The singleton instance of the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        YakindummPackage eINSTANCE = ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl.init();
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.VertexImpl <em>Vertex</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.VertexImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getVertex()
+         * @generated
+         */
+        int VERTEX = 1;
+
+        /**
+         * The feature id for the '<em><b>Incoming Transitions</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int VERTEX__INCOMING_TRANSITIONS = 0;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int VERTEX__OUTGOING_TRANSITIONS = 1;
+
+        /**
+         * The number of structural features of the '<em>Vertex</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int VERTEX_FEATURE_COUNT = 2;
+
+        /**
+         * The number of operations of the '<em>Vertex</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int VERTEX_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.PseudostateImpl <em>Pseudostate</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.PseudostateImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getPseudostate()
+         * @generated
+         */
+        int PSEUDOSTATE = 0;
+
+        /**
+         * The feature id for the '<em><b>Incoming Transitions</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int PSEUDOSTATE__INCOMING_TRANSITIONS = VERTEX__INCOMING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int PSEUDOSTATE__OUTGOING_TRANSITIONS = VERTEX__OUTGOING_TRANSITIONS;
+
+        /**
+         * The number of structural features of the '<em>Pseudostate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int PSEUDOSTATE_FEATURE_COUNT = VERTEX_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Pseudostate</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int PSEUDOSTATE_OPERATION_COUNT = VERTEX_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegionImpl <em>Region</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegionImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getRegion()
+         * @generated
+         */
+        int REGION = 2;
+
+        /**
+         * The feature id for the '<em><b>Vertices</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REGION__VERTICES = 0;
+
+        /**
+         * The number of structural features of the '<em>Region</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REGION_FEATURE_COUNT = 1;
+
+        /**
+         * The number of operations of the '<em>Region</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REGION_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.TransitionImpl <em>Transition</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.TransitionImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getTransition()
+         * @generated
+         */
+        int TRANSITION = 3;
+
+        /**
+         * The feature id for the '<em><b>Target</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRANSITION__TARGET = 0;
+
+        /**
+         * The feature id for the '<em><b>Source</b></em>' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRANSITION__SOURCE = 1;
+
+        /**
+         * The number of structural features of the '<em>Transition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRANSITION_FEATURE_COUNT = 2;
+
+        /**
+         * The number of operations of the '<em>Transition</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRANSITION_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.CompositeElementImpl <em>Composite Element</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.CompositeElementImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getCompositeElement()
+         * @generated
+         */
+        int COMPOSITE_ELEMENT = 8;
+
+        /**
+         * The feature id for the '<em><b>Regions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPOSITE_ELEMENT__REGIONS = 0;
+
+        /**
+         * The number of structural features of the '<em>Composite Element</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPOSITE_ELEMENT_FEATURE_COUNT = 1;
+
+        /**
+         * The number of operations of the '<em>Composite Element</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMPOSITE_ELEMENT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StatechartImpl <em>Statechart</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StatechartImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getStatechart()
+         * @generated
+         */
+        int STATECHART = 4;
+
+        /**
+         * The feature id for the '<em><b>Regions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STATECHART__REGIONS = COMPOSITE_ELEMENT__REGIONS;
+
+        /**
+         * The number of structural features of the '<em>Statechart</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STATECHART_FEATURE_COUNT = COMPOSITE_ELEMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Statechart</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STATECHART_OPERATION_COUNT = COMPOSITE_ELEMENT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.EntryImpl <em>Entry</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.EntryImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getEntry()
+         * @generated
+         */
+        int ENTRY = 5;
+
+        /**
+         * The feature id for the '<em><b>Incoming Transitions</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENTRY__INCOMING_TRANSITIONS = PSEUDOSTATE__INCOMING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENTRY__OUTGOING_TRANSITIONS = PSEUDOSTATE__OUTGOING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Type</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENTRY__TYPE = PSEUDOSTATE_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Entry</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENTRY_FEATURE_COUNT = PSEUDOSTATE_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Entry</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENTRY_OPERATION_COUNT = PSEUDOSTATE_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegularStateImpl <em>Regular State</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegularStateImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getRegularState()
+         * @generated
+         */
+        int REGULAR_STATE = 7;
+
+        /**
+         * The feature id for the '<em><b>Incoming Transitions</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REGULAR_STATE__INCOMING_TRANSITIONS = VERTEX__INCOMING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REGULAR_STATE__OUTGOING_TRANSITIONS = VERTEX__OUTGOING_TRANSITIONS;
+
+        /**
+         * The number of structural features of the '<em>Regular State</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REGULAR_STATE_FEATURE_COUNT = VERTEX_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Regular State</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REGULAR_STATE_OPERATION_COUNT = VERTEX_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StateImpl <em>State</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StateImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getState()
+         * @generated
+         */
+        int STATE = 6;
+
+        /**
+         * The feature id for the '<em><b>Incoming Transitions</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STATE__INCOMING_TRANSITIONS = REGULAR_STATE__INCOMING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STATE__OUTGOING_TRANSITIONS = REGULAR_STATE__OUTGOING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Regions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STATE__REGIONS = REGULAR_STATE_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>State</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STATE_FEATURE_COUNT = REGULAR_STATE_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>State</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STATE_OPERATION_COUNT = REGULAR_STATE_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.ChoiceImpl <em>Choice</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.ChoiceImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getChoice()
+         * @generated
+         */
+        int CHOICE = 9;
+
+        /**
+         * The feature id for the '<em><b>Incoming Transitions</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CHOICE__INCOMING_TRANSITIONS = PSEUDOSTATE__INCOMING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CHOICE__OUTGOING_TRANSITIONS = PSEUDOSTATE__OUTGOING_TRANSITIONS;
+
+        /**
+         * The number of structural features of the '<em>Choice</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CHOICE_FEATURE_COUNT = PSEUDOSTATE_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Choice</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CHOICE_OPERATION_COUNT = PSEUDOSTATE_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.ExitImpl <em>Exit</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.ExitImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getExit()
+         * @generated
+         */
+        int EXIT = 10;
+
+        /**
+         * The feature id for the '<em><b>Incoming Transitions</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EXIT__INCOMING_TRANSITIONS = PSEUDOSTATE__INCOMING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EXIT__OUTGOING_TRANSITIONS = PSEUDOSTATE__OUTGOING_TRANSITIONS;
+
+        /**
+         * The number of structural features of the '<em>Exit</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EXIT_FEATURE_COUNT = PSEUDOSTATE_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Exit</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int EXIT_OPERATION_COUNT = PSEUDOSTATE_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.FinalStateImpl <em>Final State</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.FinalStateImpl
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getFinalState()
+         * @generated
+         */
+        int FINAL_STATE = 11;
+
+        /**
+         * The feature id for the '<em><b>Incoming Transitions</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int FINAL_STATE__INCOMING_TRANSITIONS = REGULAR_STATE__INCOMING_TRANSITIONS;
+
+        /**
+         * The feature id for the '<em><b>Outgoing Transitions</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int FINAL_STATE__OUTGOING_TRANSITIONS = REGULAR_STATE__OUTGOING_TRANSITIONS;
+
+        /**
+         * The number of structural features of the '<em>Final State</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int FINAL_STATE_FEATURE_COUNT = REGULAR_STATE_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Final State</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int FINAL_STATE_OPERATION_COUNT = REGULAR_STATE_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType <em>Entry Type</em>}' enum.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getEntryType()
+         * @generated
+         */
+        int ENTRY_TYPE = 12;
+
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Pseudostate <em>Pseudostate</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Pseudostate</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Pseudostate
+         * @generated
+         */
+        EClass getPseudostate();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex <em>Vertex</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Vertex</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex
+         * @generated
+         */
+        EClass getVertex();
+
+        /**
+         * Returns the meta object for the reference list '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getIncomingTransitions <em>Incoming Transitions</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference list '<em>Incoming Transitions</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getIncomingTransitions()
+         * @see #getVertex()
+         * @generated
+         */
+        EReference getVertex_IncomingTransitions();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getOutgoingTransitions <em>Outgoing Transitions</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Outgoing Transitions</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex#getOutgoingTransitions()
+         * @see #getVertex()
+         * @generated
+         */
+        EReference getVertex_OutgoingTransitions();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region <em>Region</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Region</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region
+         * @generated
+         */
+        EClass getRegion();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region#getVertices <em>Vertices</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Vertices</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region#getVertices()
+         * @see #getRegion()
+         * @generated
+         */
+        EReference getRegion_Vertices();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition <em>Transition</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Transition</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition
+         * @generated
+         */
+        EClass getTransition();
+
+        /**
+         * Returns the meta object for the reference '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getTarget <em>Target</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Target</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getTarget()
+         * @see #getTransition()
+         * @generated
+         */
+        EReference getTransition_Target();
+
+        /**
+         * Returns the meta object for the container reference '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getSource <em>Source</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the container reference '<em>Source</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition#getSource()
+         * @see #getTransition()
+         * @generated
+         */
+        EReference getTransition_Source();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Statechart <em>Statechart</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Statechart</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Statechart
+         * @generated
+         */
+        EClass getStatechart();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry <em>Entry</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Entry</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry
+         * @generated
+         */
+        EClass getEntry();
+
+        /**
+         * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry#getType <em>Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Type</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry#getType()
+         * @see #getEntry()
+         * @generated
+         */
+        EAttribute getEntry_Type();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.State <em>State</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>State</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.State
+         * @generated
+         */
+        EClass getState();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.RegularState <em>Regular State</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Regular State</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.RegularState
+         * @generated
+         */
+        EClass getRegularState();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement <em>Composite Element</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Composite Element</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement
+         * @generated
+         */
+        EClass getCompositeElement();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement#getRegions <em>Regions</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Regions</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement#getRegions()
+         * @see #getCompositeElement()
+         * @generated
+         */
+        EReference getCompositeElement_Regions();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Choice <em>Choice</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Choice</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Choice
+         * @generated
+         */
+        EClass getChoice();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Exit <em>Exit</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Exit</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Exit
+         * @generated
+         */
+        EClass getExit();
+
+        /**
+         * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.FinalState <em>Final State</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Final State</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.FinalState
+         * @generated
+         */
+        EClass getFinalState();
+
+        /**
+         * Returns the meta object for enum '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType <em>Entry Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for enum '<em>Entry Type</em>'.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType
+         * @generated
+         */
+        EEnum getEntryType();
+
+        /**
+         * Returns the factory that creates the instances of the model.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the factory that creates the instances of the model.
+         * @generated
+         */
+        YakindummFactory getYakindummFactory();
+
+        /**
+         * <!-- begin-user-doc -->
+         * Defines literals for the meta objects that represent
+         * <ul>
+         *   <li>each class,</li>
+         *   <li>each feature of each class,</li>
+         *   <li>each operation of each class,</li>
+         *   <li>each enum,</li>
+         *   <li>and each data type</li>
+         * </ul>
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        interface Literals {
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.PseudostateImpl <em>Pseudostate</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.PseudostateImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getPseudostate()
+                 * @generated
+                 */
+                EClass PSEUDOSTATE = eINSTANCE.getPseudostate();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.VertexImpl <em>Vertex</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.VertexImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getVertex()
+                 * @generated
+                 */
+                EClass VERTEX = eINSTANCE.getVertex();
+
+                /**
+                 * The meta object literal for the '<em><b>Incoming Transitions</b></em>' reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference VERTEX__INCOMING_TRANSITIONS = eINSTANCE.getVertex_IncomingTransitions();
+
+                /**
+                 * The meta object literal for the '<em><b>Outgoing Transitions</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference VERTEX__OUTGOING_TRANSITIONS = eINSTANCE.getVertex_OutgoingTransitions();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegionImpl <em>Region</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegionImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getRegion()
+                 * @generated
+                 */
+                EClass REGION = eINSTANCE.getRegion();
+
+                /**
+                 * The meta object literal for the '<em><b>Vertices</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference REGION__VERTICES = eINSTANCE.getRegion_Vertices();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.TransitionImpl <em>Transition</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.TransitionImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getTransition()
+                 * @generated
+                 */
+                EClass TRANSITION = eINSTANCE.getTransition();
+
+                /**
+                 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference TRANSITION__TARGET = eINSTANCE.getTransition_Target();
+
+                /**
+                 * The meta object literal for the '<em><b>Source</b></em>' container reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference TRANSITION__SOURCE = eINSTANCE.getTransition_Source();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StatechartImpl <em>Statechart</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StatechartImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getStatechart()
+                 * @generated
+                 */
+                EClass STATECHART = eINSTANCE.getStatechart();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.EntryImpl <em>Entry</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.EntryImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getEntry()
+                 * @generated
+                 */
+                EClass ENTRY = eINSTANCE.getEntry();
+
+                /**
+                 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute ENTRY__TYPE = eINSTANCE.getEntry_Type();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StateImpl <em>State</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StateImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getState()
+                 * @generated
+                 */
+                EClass STATE = eINSTANCE.getState();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegularStateImpl <em>Regular State</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegularStateImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getRegularState()
+                 * @generated
+                 */
+                EClass REGULAR_STATE = eINSTANCE.getRegularState();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.CompositeElementImpl <em>Composite Element</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.CompositeElementImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getCompositeElement()
+                 * @generated
+                 */
+                EClass COMPOSITE_ELEMENT = eINSTANCE.getCompositeElement();
+
+                /**
+                 * The meta object literal for the '<em><b>Regions</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference COMPOSITE_ELEMENT__REGIONS = eINSTANCE.getCompositeElement_Regions();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.ChoiceImpl <em>Choice</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.ChoiceImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getChoice()
+                 * @generated
+                 */
+                EClass CHOICE = eINSTANCE.getChoice();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.ExitImpl <em>Exit</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.ExitImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getExit()
+                 * @generated
+                 */
+                EClass EXIT = eINSTANCE.getExit();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.FinalStateImpl <em>Final State</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.FinalStateImpl
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getFinalState()
+                 * @generated
+                 */
+                EClass FINAL_STATE = eINSTANCE.getFinalState();
+
+                /**
+                 * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType <em>Entry Type</em>}' enum.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType
+                 * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.YakindummPackageImpl#getEntryType()
+                 * @generated
+                 */
+                EEnum ENTRY_TYPE = eINSTANCE.getEntryType();
+
+        }
+
+} //YakindummPackage
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/ChoiceImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/ChoiceImpl.java
new file mode 100644
index 00000000..379d4a29
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/ChoiceImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Choice;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Choice</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ChoiceImpl extends PseudostateImpl implements Choice {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ChoiceImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.CHOICE;
+        }
+
+} //ChoiceImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/CompositeElementImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/CompositeElementImpl.java
new file mode 100644
index 00000000..067a5ee3
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/CompositeElementImpl.java
@@ -0,0 +1,152 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Composite Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.CompositeElementImpl#getRegions <em>Regions</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container implements CompositeElement {
+        /**
+         * The cached value of the '{@link #getRegions() <em>Regions</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRegions()
+         * @generated
+         * @ordered
+         */
+        protected EList<Region> regions;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CompositeElementImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.COMPOSITE_ELEMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Region> getRegions() {
+                if (regions == null) {
+                        regions = new EObjectContainmentEList<Region>(Region.class, this, YakindummPackage.COMPOSITE_ELEMENT__REGIONS);
+                }
+                return regions;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case YakindummPackage.COMPOSITE_ELEMENT__REGIONS:
+                                return ((InternalEList<?>)getRegions()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case YakindummPackage.COMPOSITE_ELEMENT__REGIONS:
+                                return getRegions();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case YakindummPackage.COMPOSITE_ELEMENT__REGIONS:
+                                getRegions().clear();
+                                getRegions().addAll((Collection<? extends Region>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.COMPOSITE_ELEMENT__REGIONS:
+                                getRegions().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.COMPOSITE_ELEMENT__REGIONS:
+                                return regions != null && !regions.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //CompositeElementImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/EntryImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/EntryImpl.java
new file mode 100644
index 00000000..0ad87100
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/EntryImpl.java
@@ -0,0 +1,163 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Entry</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.EntryImpl#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EntryImpl extends PseudostateImpl implements Entry {
+        /**
+         * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getType()
+         * @generated
+         * @ordered
+         */
+        protected static final EntryType TYPE_EDEFAULT = EntryType.NORMAL;
+
+        /**
+         * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getType()
+         * @generated
+         * @ordered
+         */
+        protected EntryType type = TYPE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected EntryImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.ENTRY;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EntryType getType() {
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setType(EntryType newType) {
+                EntryType oldType = type;
+                type = newType == null ? TYPE_EDEFAULT : newType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, YakindummPackage.ENTRY__TYPE, oldType, type));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case YakindummPackage.ENTRY__TYPE:
+                                return getType();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case YakindummPackage.ENTRY__TYPE:
+                                setType((EntryType)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.ENTRY__TYPE:
+                                setType(TYPE_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.ENTRY__TYPE:
+                                return type != TYPE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (Type: ");
+                result.append(type);
+                result.append(')');
+                return result.toString();
+        }
+
+} //EntryImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/ExitImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/ExitImpl.java
new file mode 100644
index 00000000..ae360e68
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/ExitImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Exit;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Exit</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExitImpl extends PseudostateImpl implements Exit {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExitImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.EXIT;
+        }
+
+} //ExitImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/FinalStateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/FinalStateImpl.java
new file mode 100644
index 00000000..ccb19763
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/FinalStateImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.FinalState;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Final State</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class FinalStateImpl extends RegularStateImpl implements FinalState {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FinalStateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.FINAL_STATE;
+        }
+
+} //FinalStateImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/PseudostateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/PseudostateImpl.java
new file mode 100644
index 00000000..b8c76c27
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/PseudostateImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Pseudostate;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Pseudostate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class PseudostateImpl extends VertexImpl implements Pseudostate {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected PseudostateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.PSEUDOSTATE;
+        }
+
+} //PseudostateImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/RegionImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/RegionImpl.java
new file mode 100644
index 00000000..440c389c
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/RegionImpl.java
@@ -0,0 +1,152 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Region</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.RegionImpl#getVertices <em>Vertices</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
+        /**
+         * The cached value of the '{@link #getVertices() <em>Vertices</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getVertices()
+         * @generated
+         * @ordered
+         */
+        protected EList<Vertex> vertices;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RegionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.REGION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Vertex> getVertices() {
+                if (vertices == null) {
+                        vertices = new EObjectContainmentEList<Vertex>(Vertex.class, this, YakindummPackage.REGION__VERTICES);
+                }
+                return vertices;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case YakindummPackage.REGION__VERTICES:
+                                return ((InternalEList<?>)getVertices()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case YakindummPackage.REGION__VERTICES:
+                                return getVertices();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case YakindummPackage.REGION__VERTICES:
+                                getVertices().clear();
+                                getVertices().addAll((Collection<? extends Vertex>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.REGION__VERTICES:
+                                getVertices().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.REGION__VERTICES:
+                                return vertices != null && !vertices.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //RegionImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/RegularStateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/RegularStateImpl.java
new file mode 100644
index 00000000..2ada6da9
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/RegularStateImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.RegularState;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Regular State</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class RegularStateImpl extends VertexImpl implements RegularState {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RegularStateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.REGULAR_STATE;
+        }
+
+} //RegularStateImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StateImpl.java
new file mode 100644
index 00000000..080bed16
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StateImpl.java
@@ -0,0 +1,183 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.State;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>State</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.StateImpl#getRegions <em>Regions</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StateImpl extends RegularStateImpl implements State {
+        /**
+         * The cached value of the '{@link #getRegions() <em>Regions</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRegions()
+         * @generated
+         * @ordered
+         */
+        protected EList<Region> regions;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected StateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.STATE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Region> getRegions() {
+                if (regions == null) {
+                        regions = new EObjectContainmentEList<Region>(Region.class, this, YakindummPackage.STATE__REGIONS);
+                }
+                return regions;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case YakindummPackage.STATE__REGIONS:
+                                return ((InternalEList<?>)getRegions()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case YakindummPackage.STATE__REGIONS:
+                                return getRegions();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case YakindummPackage.STATE__REGIONS:
+                                getRegions().clear();
+                                getRegions().addAll((Collection<? extends Region>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.STATE__REGIONS:
+                                getRegions().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.STATE__REGIONS:
+                                return regions != null && !regions.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+                if (baseClass == CompositeElement.class) {
+                        switch (derivedFeatureID) {
+                                case YakindummPackage.STATE__REGIONS: return YakindummPackage.COMPOSITE_ELEMENT__REGIONS;
+                                default: return -1;
+                        }
+                }
+                return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+                if (baseClass == CompositeElement.class) {
+                        switch (baseFeatureID) {
+                                case YakindummPackage.COMPOSITE_ELEMENT__REGIONS: return YakindummPackage.STATE__REGIONS;
+                                default: return -1;
+                        }
+                }
+                return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        }
+
+} //StateImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StatechartImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StatechartImpl.java
new file mode 100644
index 00000000..0b48e8d8
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StatechartImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Statechart;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Statechart</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class StatechartImpl extends CompositeElementImpl implements Statechart {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected StatechartImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.STATECHART;
+        }
+
+} //StatechartImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/TransitionImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/TransitionImpl.java
new file mode 100644
index 00000000..875964a2
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/TransitionImpl.java
@@ -0,0 +1,284 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Transition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.TransitionImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.TransitionImpl#getSource <em>Source</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TransitionImpl extends MinimalEObjectImpl.Container implements Transition {
+        /**
+         * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTarget()
+         * @generated
+         * @ordered
+         */
+        protected Vertex target;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TransitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.TRANSITION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Vertex getTarget() {
+                if (target != null && target.eIsProxy()) {
+                        InternalEObject oldTarget = (InternalEObject)target;
+                        target = (Vertex)eResolveProxy(oldTarget);
+                        if (target != oldTarget) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, YakindummPackage.TRANSITION__TARGET, oldTarget, target));
+                        }
+                }
+                return target;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Vertex basicGetTarget() {
+                return target;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetTarget(Vertex newTarget, NotificationChain msgs) {
+                Vertex oldTarget = target;
+                target = newTarget;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, YakindummPackage.TRANSITION__TARGET, oldTarget, newTarget);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setTarget(Vertex newTarget) {
+                if (newTarget != target) {
+                        NotificationChain msgs = null;
+                        if (target != null)
+                                msgs = ((InternalEObject)target).eInverseRemove(this, YakindummPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);
+                        if (newTarget != null)
+                                msgs = ((InternalEObject)newTarget).eInverseAdd(this, YakindummPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);
+                        msgs = basicSetTarget(newTarget, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, YakindummPackage.TRANSITION__TARGET, newTarget, newTarget));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Vertex getSource() {
+                if (eContainerFeatureID() != YakindummPackage.TRANSITION__SOURCE) return null;
+                return (Vertex)eInternalContainer();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetSource(Vertex newSource, NotificationChain msgs) {
+                msgs = eBasicSetContainer((InternalEObject)newSource, YakindummPackage.TRANSITION__SOURCE, msgs);
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setSource(Vertex newSource) {
+                if (newSource != eInternalContainer() || (eContainerFeatureID() != YakindummPackage.TRANSITION__SOURCE && newSource != null)) {
+                        if (EcoreUtil.isAncestor(this, newSource))
+                                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                        NotificationChain msgs = null;
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        if (newSource != null)
+                                msgs = ((InternalEObject)newSource).eInverseAdd(this, YakindummPackage.VERTEX__OUTGOING_TRANSITIONS, Vertex.class, msgs);
+                        msgs = basicSetSource(newSource, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, YakindummPackage.TRANSITION__SOURCE, newSource, newSource));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case YakindummPackage.TRANSITION__TARGET:
+                                if (target != null)
+                                        msgs = ((InternalEObject)target).eInverseRemove(this, YakindummPackage.VERTEX__INCOMING_TRANSITIONS, Vertex.class, msgs);
+                                return basicSetTarget((Vertex)otherEnd, msgs);
+                        case YakindummPackage.TRANSITION__SOURCE:
+                                if (eInternalContainer() != null)
+                                        msgs = eBasicRemoveFromContainer(msgs);
+                                return basicSetSource((Vertex)otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case YakindummPackage.TRANSITION__TARGET:
+                                return basicSetTarget(null, msgs);
+                        case YakindummPackage.TRANSITION__SOURCE:
+                                return basicSetSource(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+                switch (eContainerFeatureID()) {
+                        case YakindummPackage.TRANSITION__SOURCE:
+                                return eInternalContainer().eInverseRemove(this, YakindummPackage.VERTEX__OUTGOING_TRANSITIONS, Vertex.class, msgs);
+                }
+                return super.eBasicRemoveFromContainerFeature(msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case YakindummPackage.TRANSITION__TARGET:
+                                if (resolve) return getTarget();
+                                return basicGetTarget();
+                        case YakindummPackage.TRANSITION__SOURCE:
+                                return getSource();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case YakindummPackage.TRANSITION__TARGET:
+                                setTarget((Vertex)newValue);
+                                return;
+                        case YakindummPackage.TRANSITION__SOURCE:
+                                setSource((Vertex)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.TRANSITION__TARGET:
+                                setTarget((Vertex)null);
+                                return;
+                        case YakindummPackage.TRANSITION__SOURCE:
+                                setSource((Vertex)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.TRANSITION__TARGET:
+                                return target != null;
+                        case YakindummPackage.TRANSITION__SOURCE:
+                                return getSource() != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //TransitionImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/VertexImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/VertexImpl.java
new file mode 100644
index 00000000..66871f3f
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/VertexImpl.java
@@ -0,0 +1,206 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Vertex</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.VertexImpl#getIncomingTransitions <em>Incoming Transitions</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl.VertexImpl#getOutgoingTransitions <em>Outgoing Transitions</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class VertexImpl extends MinimalEObjectImpl.Container implements Vertex {
+        /**
+         * The cached value of the '{@link #getIncomingTransitions() <em>Incoming Transitions</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getIncomingTransitions()
+         * @generated
+         * @ordered
+         */
+        protected EList<Transition> incomingTransitions;
+
+        /**
+         * The cached value of the '{@link #getOutgoingTransitions() <em>Outgoing Transitions</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOutgoingTransitions()
+         * @generated
+         * @ordered
+         */
+        protected EList<Transition> outgoingTransitions;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected VertexImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakindummPackage.Literals.VERTEX;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Transition> getIncomingTransitions() {
+                if (incomingTransitions == null) {
+                        incomingTransitions = new EObjectWithInverseResolvingEList<Transition>(Transition.class, this, YakindummPackage.VERTEX__INCOMING_TRANSITIONS, YakindummPackage.TRANSITION__TARGET);
+                }
+                return incomingTransitions;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Transition> getOutgoingTransitions() {
+                if (outgoingTransitions == null) {
+                        outgoingTransitions = new EObjectContainmentWithInverseEList<Transition>(Transition.class, this, YakindummPackage.VERTEX__OUTGOING_TRANSITIONS, YakindummPackage.TRANSITION__SOURCE);
+                }
+                return outgoingTransitions;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case YakindummPackage.VERTEX__INCOMING_TRANSITIONS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getIncomingTransitions()).basicAdd(otherEnd, msgs);
+                        case YakindummPackage.VERTEX__OUTGOING_TRANSITIONS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getOutgoingTransitions()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case YakindummPackage.VERTEX__INCOMING_TRANSITIONS:
+                                return ((InternalEList<?>)getIncomingTransitions()).basicRemove(otherEnd, msgs);
+                        case YakindummPackage.VERTEX__OUTGOING_TRANSITIONS:
+                                return ((InternalEList<?>)getOutgoingTransitions()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case YakindummPackage.VERTEX__INCOMING_TRANSITIONS:
+                                return getIncomingTransitions();
+                        case YakindummPackage.VERTEX__OUTGOING_TRANSITIONS:
+                                return getOutgoingTransitions();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case YakindummPackage.VERTEX__INCOMING_TRANSITIONS:
+                                getIncomingTransitions().clear();
+                                getIncomingTransitions().addAll((Collection<? extends Transition>)newValue);
+                                return;
+                        case YakindummPackage.VERTEX__OUTGOING_TRANSITIONS:
+                                getOutgoingTransitions().clear();
+                                getOutgoingTransitions().addAll((Collection<? extends Transition>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.VERTEX__INCOMING_TRANSITIONS:
+                                getIncomingTransitions().clear();
+                                return;
+                        case YakindummPackage.VERTEX__OUTGOING_TRANSITIONS:
+                                getOutgoingTransitions().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case YakindummPackage.VERTEX__INCOMING_TRANSITIONS:
+                                return incomingTransitions != null && !incomingTransitions.isEmpty();
+                        case YakindummPackage.VERTEX__OUTGOING_TRANSITIONS:
+                                return outgoingTransitions != null && !outgoingTransitions.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //VertexImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/YakindummFactoryImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/YakindummFactoryImpl.java
new file mode 100644
index 00000000..d4be344f
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/YakindummFactoryImpl.java
@@ -0,0 +1,223 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFactory {
+        /**
+         * Creates the default factory implementation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static YakindummFactory init() {
+                try {
+                        YakindummFactory theYakindummFactory = (YakindummFactory)EPackage.Registry.INSTANCE.getEFactory(YakindummPackage.eNS_URI);
+                        if (theYakindummFactory != null) {
+                                return theYakindummFactory;
+                        }
+                }
+                catch (Exception exception) {
+                        EcorePlugin.INSTANCE.log(exception);
+                }
+                return new YakindummFactoryImpl();
+        }
+
+        /**
+         * Creates an instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public YakindummFactoryImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EObject create(EClass eClass) {
+                switch (eClass.getClassifierID()) {
+                        case YakindummPackage.REGION: return createRegion();
+                        case YakindummPackage.TRANSITION: return createTransition();
+                        case YakindummPackage.STATECHART: return createStatechart();
+                        case YakindummPackage.ENTRY: return createEntry();
+                        case YakindummPackage.STATE: return createState();
+                        case YakindummPackage.CHOICE: return createChoice();
+                        case YakindummPackage.EXIT: return createExit();
+                        case YakindummPackage.FINAL_STATE: return createFinalState();
+                        default:
+                                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object createFromString(EDataType eDataType, String initialValue) {
+                switch (eDataType.getClassifierID()) {
+                        case YakindummPackage.ENTRY_TYPE:
+                                return createEntryTypeFromString(eDataType, initialValue);
+                        default:
+                                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String convertToString(EDataType eDataType, Object instanceValue) {
+                switch (eDataType.getClassifierID()) {
+                        case YakindummPackage.ENTRY_TYPE:
+                                return convertEntryTypeToString(eDataType, instanceValue);
+                        default:
+                                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Region createRegion() {
+                RegionImpl region = new RegionImpl();
+                return region;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Transition createTransition() {
+                TransitionImpl transition = new TransitionImpl();
+                return transition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Statechart createStatechart() {
+                StatechartImpl statechart = new StatechartImpl();
+                return statechart;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Entry createEntry() {
+                EntryImpl entry = new EntryImpl();
+                return entry;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public State createState() {
+                StateImpl state = new StateImpl();
+                return state;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Choice createChoice() {
+                ChoiceImpl choice = new ChoiceImpl();
+                return choice;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Exit createExit() {
+                ExitImpl exit = new ExitImpl();
+                return exit;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FinalState createFinalState() {
+                FinalStateImpl finalState = new FinalStateImpl();
+                return finalState;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EntryType createEntryTypeFromString(EDataType eDataType, String initialValue) {
+                EntryType result = EntryType.get(initialValue);
+                if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+                return result;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String convertEntryTypeToString(EDataType eDataType, Object instanceValue) {
+                return instanceValue == null ? null : instanceValue.toString();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public YakindummPackage getYakindummPackage() {
+                return (YakindummPackage)getEPackage();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @deprecated
+         * @generated
+         */
+        @Deprecated
+        public static YakindummPackage getPackage() {
+                return YakindummPackage.eINSTANCE;
+        }
+
+} //YakindummFactoryImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/YakindummPackageImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/YakindummPackageImpl.java
new file mode 100644
index 00000000..b95dc3ea
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/YakindummPackageImpl.java
@@ -0,0 +1,511 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Choice;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.EntryType;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Exit;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.FinalState;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Pseudostate;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.RegularState;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.State;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Statechart;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummFactory;
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class YakindummPackageImpl extends EPackageImpl implements YakindummPackage {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass pseudostateEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass vertexEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass regionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass transitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass statechartEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass entryEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass stateEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass regularStateEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass compositeElementEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass choiceEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass exitEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass finalStateEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EEnum entryTypeEEnum = null;
+
+        /**
+         * Creates an instance of the model <b>Package</b>, registered with
+         * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+         * package URI value.
+         * <p>Note: the correct way to create the package is via the static
+         * factory method {@link #init init()}, which also performs
+         * initialization of the package, or returns the registered package,
+         * if one already exists.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.emf.ecore.EPackage.Registry
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage#eNS_URI
+         * @see #init()
+         * @generated
+         */
+        private YakindummPackageImpl() {
+                super(eNS_URI, YakindummFactory.eINSTANCE);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private static boolean isInited = false;
+
+        /**
+         * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+         *
+         * <p>This method is used to initialize {@link YakindummPackage#eINSTANCE} when that field is accessed.
+         * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #eNS_URI
+         * @see #createPackageContents()
+         * @see #initializePackageContents()
+         * @generated
+         */
+        public static YakindummPackage init() {
+                if (isInited) return (YakindummPackage)EPackage.Registry.INSTANCE.getEPackage(YakindummPackage.eNS_URI);
+
+                // Obtain or create and register package
+                Object registeredYakindummPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+                YakindummPackageImpl theYakindummPackage = registeredYakindummPackage instanceof YakindummPackageImpl ? (YakindummPackageImpl)registeredYakindummPackage : new YakindummPackageImpl();
+
+                isInited = true;
+
+                // Create package meta-data objects
+                theYakindummPackage.createPackageContents();
+
+                // Initialize created meta-data
+                theYakindummPackage.initializePackageContents();
+
+                // Mark meta-data to indicate it can't be changed
+                theYakindummPackage.freeze();
+
+                // Update the registry and return the package
+                EPackage.Registry.INSTANCE.put(YakindummPackage.eNS_URI, theYakindummPackage);
+                return theYakindummPackage;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getPseudostate() {
+                return pseudostateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getVertex() {
+                return vertexEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getVertex_IncomingTransitions() {
+                return (EReference)vertexEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getVertex_OutgoingTransitions() {
+                return (EReference)vertexEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRegion() {
+                return regionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getRegion_Vertices() {
+                return (EReference)regionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTransition() {
+                return transitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTransition_Target() {
+                return (EReference)transitionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTransition_Source() {
+                return (EReference)transitionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getStatechart() {
+                return statechartEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getEntry() {
+                return entryEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getEntry_Type() {
+                return (EAttribute)entryEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getState() {
+                return stateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRegularState() {
+                return regularStateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getCompositeElement() {
+                return compositeElementEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getCompositeElement_Regions() {
+                return (EReference)compositeElementEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getChoice() {
+                return choiceEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExit() {
+                return exitEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getFinalState() {
+                return finalStateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EEnum getEntryType() {
+                return entryTypeEEnum;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public YakindummFactory getYakindummFactory() {
+                return (YakindummFactory)getEFactoryInstance();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isCreated = false;
+
+        /**
+         * Creates the meta-model objects for the package.  This method is
+         * guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void createPackageContents() {
+                if (isCreated) return;
+                isCreated = true;
+
+                // Create classes and their features
+                pseudostateEClass = createEClass(PSEUDOSTATE);
+
+                vertexEClass = createEClass(VERTEX);
+                createEReference(vertexEClass, VERTEX__INCOMING_TRANSITIONS);
+                createEReference(vertexEClass, VERTEX__OUTGOING_TRANSITIONS);
+
+                regionEClass = createEClass(REGION);
+                createEReference(regionEClass, REGION__VERTICES);
+
+                transitionEClass = createEClass(TRANSITION);
+                createEReference(transitionEClass, TRANSITION__TARGET);
+                createEReference(transitionEClass, TRANSITION__SOURCE);
+
+                statechartEClass = createEClass(STATECHART);
+
+                entryEClass = createEClass(ENTRY);
+                createEAttribute(entryEClass, ENTRY__TYPE);
+
+                stateEClass = createEClass(STATE);
+
+                regularStateEClass = createEClass(REGULAR_STATE);
+
+                compositeElementEClass = createEClass(COMPOSITE_ELEMENT);
+                createEReference(compositeElementEClass, COMPOSITE_ELEMENT__REGIONS);
+
+                choiceEClass = createEClass(CHOICE);
+
+                exitEClass = createEClass(EXIT);
+
+                finalStateEClass = createEClass(FINAL_STATE);
+
+                // Create enums
+                entryTypeEEnum = createEEnum(ENTRY_TYPE);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isInitialized = false;
+
+        /**
+         * Complete the initialization of the package and its meta-model.  This
+         * method is guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void initializePackageContents() {
+                if (isInitialized) return;
+                isInitialized = true;
+
+                // Initialize package
+                setName(eNAME);
+                setNsPrefix(eNS_PREFIX);
+                setNsURI(eNS_URI);
+
+                // Create type parameters
+
+                // Set bounds for type parameters
+
+                // Add supertypes to classes
+                pseudostateEClass.getESuperTypes().add(this.getVertex());
+                statechartEClass.getESuperTypes().add(this.getCompositeElement());
+                entryEClass.getESuperTypes().add(this.getPseudostate());
+                stateEClass.getESuperTypes().add(this.getRegularState());
+                stateEClass.getESuperTypes().add(this.getCompositeElement());
+                regularStateEClass.getESuperTypes().add(this.getVertex());
+                choiceEClass.getESuperTypes().add(this.getPseudostate());
+                exitEClass.getESuperTypes().add(this.getPseudostate());
+                finalStateEClass.getESuperTypes().add(this.getRegularState());
+
+                // Initialize classes, features, and operations; add parameters
+                initEClass(pseudostateEClass, Pseudostate.class, "Pseudostate", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(vertexEClass, Vertex.class, "Vertex", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getVertex_IncomingTransitions(), this.getTransition(), this.getTransition_Target(), "incomingTransitions", null, 0, -1, Vertex.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+                initEReference(getVertex_OutgoingTransitions(), this.getTransition(), this.getTransition_Source(), "outgoingTransitions", null, 0, -1, Vertex.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+                initEClass(regionEClass, Region.class, "Region", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getRegion_Vertices(), this.getVertex(), null, "vertices", null, 0, -1, Region.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+                initEClass(transitionEClass, Transition.class, "Transition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getTransition_Target(), this.getVertex(), this.getVertex_IncomingTransitions(), "target", null, 1, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+                initEReference(getTransition_Source(), this.getVertex(), this.getVertex_OutgoingTransitions(), "source", null, 0, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+                initEClass(statechartEClass, Statechart.class, "Statechart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(entryEClass, Entry.class, "Entry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getEntry_Type(), this.getEntryType(), "Type", null, 1, 1, Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(stateEClass, State.class, "State", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(regularStateEClass, RegularState.class, "RegularState", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(compositeElementEClass, CompositeElement.class, "CompositeElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getCompositeElement_Regions(), this.getRegion(), null, "regions", null, 0, -1, CompositeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(choiceEClass, Choice.class, "Choice", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(exitEClass, Exit.class, "Exit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(finalStateEClass, FinalState.class, "FinalState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                // Initialize enums and add enum literals
+                initEEnum(entryTypeEEnum, EntryType.class, "EntryType");
+                addEEnumLiteral(entryTypeEEnum, EntryType.NORMAL);
+                addEEnumLiteral(entryTypeEEnum, EntryType.HISTORY);
+                addEEnumLiteral(entryTypeEEnum, EntryType.DEEP_HISTORY);
+
+                // Create resource
+                createResource(eNS_URI);
+        }
+
+} //YakindummPackageImpl
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/util/YakindummAdapterFactory.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/util/YakindummAdapterFactory.java
new file mode 100644
index 00000000..b3373dfd
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/util/YakindummAdapterFactory.java
@@ -0,0 +1,318 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.*;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage
+ * @generated
+ */
+public class YakindummAdapterFactory extends AdapterFactoryImpl {
+        /**
+         * The cached model package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static YakindummPackage modelPackage;
+
+        /**
+         * Creates an instance of the adapter factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public YakindummAdapterFactory() {
+                if (modelPackage == null) {
+                        modelPackage = YakindummPackage.eINSTANCE;
+                }
+        }
+
+        /**
+         * Returns whether this factory is applicable for the type of the object.
+         * <!-- begin-user-doc -->
+         * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+         * <!-- end-user-doc -->
+         * @return whether this factory is applicable for the type of the object.
+         * @generated
+         */
+        @Override
+        public boolean isFactoryForType(Object object) {
+                if (object == modelPackage) {
+                        return true;
+                }
+                if (object instanceof EObject) {
+                        return ((EObject)object).eClass().getEPackage() == modelPackage;
+                }
+                return false;
+        }
+
+        /**
+         * The switch that delegates to the <code>createXXX</code> methods.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected YakindummSwitch<Adapter> modelSwitch =
+                new YakindummSwitch<Adapter>() {
+                        @Override
+                        public Adapter casePseudostate(Pseudostate object) {
+                                return createPseudostateAdapter();
+                        }
+                        @Override
+                        public Adapter caseVertex(Vertex object) {
+                                return createVertexAdapter();
+                        }
+                        @Override
+                        public Adapter caseRegion(Region object) {
+                                return createRegionAdapter();
+                        }
+                        @Override
+                        public Adapter caseTransition(Transition object) {
+                                return createTransitionAdapter();
+                        }
+                        @Override
+                        public Adapter caseStatechart(Statechart object) {
+                                return createStatechartAdapter();
+                        }
+                        @Override
+                        public Adapter caseEntry(Entry object) {
+                                return createEntryAdapter();
+                        }
+                        @Override
+                        public Adapter caseState(State object) {
+                                return createStateAdapter();
+                        }
+                        @Override
+                        public Adapter caseRegularState(RegularState object) {
+                                return createRegularStateAdapter();
+                        }
+                        @Override
+                        public Adapter caseCompositeElement(CompositeElement object) {
+                                return createCompositeElementAdapter();
+                        }
+                        @Override
+                        public Adapter caseChoice(Choice object) {
+                                return createChoiceAdapter();
+                        }
+                        @Override
+                        public Adapter caseExit(Exit object) {
+                                return createExitAdapter();
+                        }
+                        @Override
+                        public Adapter caseFinalState(FinalState object) {
+                                return createFinalStateAdapter();
+                        }
+                        @Override
+                        public Adapter defaultCase(EObject object) {
+                                return createEObjectAdapter();
+                        }
+                };
+
+        /**
+         * Creates an adapter for the <code>target</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param target the object to adapt.
+         * @return the adapter for the <code>target</code>.
+         * @generated
+         */
+        @Override
+        public Adapter createAdapter(Notifier target) {
+                return modelSwitch.doSwitch((EObject)target);
+        }
+
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Pseudostate <em>Pseudostate</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Pseudostate
+         * @generated
+         */
+        public Adapter createPseudostateAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex <em>Vertex</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Vertex
+         * @generated
+         */
+        public Adapter createVertexAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region <em>Region</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Region
+         * @generated
+         */
+        public Adapter createRegionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition <em>Transition</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Transition
+         * @generated
+         */
+        public Adapter createTransitionAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Statechart <em>Statechart</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Statechart
+         * @generated
+         */
+        public Adapter createStatechartAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry <em>Entry</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Entry
+         * @generated
+         */
+        public Adapter createEntryAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.State <em>State</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.State
+         * @generated
+         */
+        public Adapter createStateAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.RegularState <em>Regular State</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.RegularState
+         * @generated
+         */
+        public Adapter createRegularStateAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement <em>Composite Element</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.CompositeElement
+         * @generated
+         */
+        public Adapter createCompositeElementAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Choice <em>Choice</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Choice
+         * @generated
+         */
+        public Adapter createChoiceAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Exit <em>Exit</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.Exit
+         * @generated
+         */
+        public Adapter createExitAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampire.yakindumm.FinalState <em>Final State</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.FinalState
+         * @generated
+         */
+        public Adapter createFinalStateAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for the default case.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @generated
+         */
+        public Adapter createEObjectAdapter() {
+                return null;
+        }
+
+} //YakindummAdapterFactory
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/util/YakindummSwitch.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/util/YakindummSwitch.java
new file mode 100644
index 00000000..422565c2
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/util/YakindummSwitch.java
@@ -0,0 +1,355 @@
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util;
+
+import ca.mcgill.ecse.dslreasoner.vampire.yakindumm.*;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see ca.mcgill.ecse.dslreasoner.vampire.yakindumm.YakindummPackage
+ * @generated
+ */
+public class YakindummSwitch<T> extends Switch<T> {
+        /**
+         * The cached model package
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static YakindummPackage modelPackage;
+
+        /**
+         * Creates an instance of the switch.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public YakindummSwitch() {
+                if (modelPackage == null) {
+                        modelPackage = YakindummPackage.eINSTANCE;
+                }
+        }
+
+        /**
+         * Checks whether this is a switch for the given package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param ePackage the package in question.
+         * @return whether this is a switch for the given package.
+         * @generated
+         */
+        @Override
+        protected boolean isSwitchFor(EPackage ePackage) {
+                return ePackage == modelPackage;
+        }
+
+        /**
+         * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the first non-null result returned by a <code>caseXXX</code> call.
+         * @generated
+         */
+        @Override
+        protected T doSwitch(int classifierID, EObject theEObject) {
+                switch (classifierID) {
+                        case YakindummPackage.PSEUDOSTATE: {
+                                Pseudostate pseudostate = (Pseudostate)theEObject;
+                                T result = casePseudostate(pseudostate);
+                                if (result == null) result = caseVertex(pseudostate);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.VERTEX: {
+                                Vertex vertex = (Vertex)theEObject;
+                                T result = caseVertex(vertex);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.REGION: {
+                                Region region = (Region)theEObject;
+                                T result = caseRegion(region);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.TRANSITION: {
+                                Transition transition = (Transition)theEObject;
+                                T result = caseTransition(transition);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.STATECHART: {
+                                Statechart statechart = (Statechart)theEObject;
+                                T result = caseStatechart(statechart);
+                                if (result == null) result = caseCompositeElement(statechart);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.ENTRY: {
+                                Entry entry = (Entry)theEObject;
+                                T result = caseEntry(entry);
+                                if (result == null) result = casePseudostate(entry);
+                                if (result == null) result = caseVertex(entry);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.STATE: {
+                                State state = (State)theEObject;
+                                T result = caseState(state);
+                                if (result == null) result = caseRegularState(state);
+                                if (result == null) result = caseCompositeElement(state);
+                                if (result == null) result = caseVertex(state);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.REGULAR_STATE: {
+                                RegularState regularState = (RegularState)theEObject;
+                                T result = caseRegularState(regularState);
+                                if (result == null) result = caseVertex(regularState);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.COMPOSITE_ELEMENT: {
+                                CompositeElement compositeElement = (CompositeElement)theEObject;
+                                T result = caseCompositeElement(compositeElement);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.CHOICE: {
+                                Choice choice = (Choice)theEObject;
+                                T result = caseChoice(choice);
+                                if (result == null) result = casePseudostate(choice);
+                                if (result == null) result = caseVertex(choice);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.EXIT: {
+                                Exit exit = (Exit)theEObject;
+                                T result = caseExit(exit);
+                                if (result == null) result = casePseudostate(exit);
+                                if (result == null) result = caseVertex(exit);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case YakindummPackage.FINAL_STATE: {
+                                FinalState finalState = (FinalState)theEObject;
+                                T result = caseFinalState(finalState);
+                                if (result == null) result = caseRegularState(finalState);
+                                if (result == null) result = caseVertex(finalState);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        default: return defaultCase(theEObject);
+                }
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Pseudostate</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Pseudostate</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T casePseudostate(Pseudostate object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Vertex</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Vertex</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseVertex(Vertex object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Region</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Region</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseRegion(Region object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Transition</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Transition</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseTransition(Transition object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Statechart</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Statechart</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseStatechart(Statechart object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Entry</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Entry</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseEntry(Entry object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>State</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>State</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseState(State object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Regular State</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Regular State</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseRegularState(RegularState object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Composite Element</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Composite Element</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseCompositeElement(CompositeElement object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Choice</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Choice</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseChoice(Choice object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Exit</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Exit</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseExit(Exit object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Final State</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Final State</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseFinalState(FinalState object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch, but this is the last case anyway.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+         * @generated
+         */
+        @Override
+        public T defaultCase(EObject object) {
+                return null;
+        }
+
+} //YakindummSwitch
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 57fe8c2d..99a457d4 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 41284af1..e8451eb9 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 36f2c6e1..73c6ab49 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 ce6042ea..b6cabaa6 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 270ac043..ae6fb160 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/GeneralTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
index 13a0e74a..80cec4b9 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
@@ -108,7 +108,7 @@ public class GeneralTest {
         final Procedure1<VampireSolverConfiguration> _function_2 = (VampireSolverConfiguration it) -> {

           it.documentationLevel = DocumentationLevel.FULL;

           it.typeScopes.minNewElements = 6;

-          it.typeScopes.maxNewElements = 8;

+          it.typeScopes.maxNewElements = 40;

           it.typeScopes.minNewElementsByType = typeMapMin;

           it.typeScopes.maxNewElementsByType = typeMapMax;

         };

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icseTest/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icseTest/.gitignore
deleted file mode 100644
index f3e21798..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icseTest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.FAMTest.java._trace
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.DslTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.DslTest.xtendbin
deleted file mode 100644
index 59f57d8b..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.DslTest.xtendbin
+++ /dev/null
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 693ee01d..6cae3219 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 7e61c0ef..22dda149 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 8a554a42..857ee2e7 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
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/FAMTest.java
deleted file mode 100644
index 7b4849e1..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/FAMTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package ca.mcgill.ecse.dslreasoner.vampire.test;

-

-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;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;

-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.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;

-

-@SuppressWarnings("all")

-public class DslTest {

-  public static void main(final String[] args) {

-    try {

-      StringConcatenation _builder = new StringConcatenation();

-      _builder.append("initialModels/");

-      final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

-      StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("outputDslModels/");

-      final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

-      workspace.initAndClear();

-      InputOutput.<String>println("Input and output workspaces are created");

-      final EcoreMetamodelDescriptor metamodel = DslTest.loadMetamodel();

-      final List<EObject> partialModel = DslTest.loadPartialModel(inputs);

-      InputOutput.<String>println("DSL loaded");

-      final Ecore2Logic ecore2Logic = new Ecore2Logic();

-      final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic);

-      final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);

-      final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();

-      Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

-      final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

-      final LogicProblem logicProblem = modelGenerationProblem.getOutput();

-      InputOutput.<String>println("Problem created");

-      LogicResult solution = null;

-      LogicReasoner reasoner = null;

-      VampireSolver _vampireSolver = new VampireSolver();

-      reasoner = _vampireSolver;

-      VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

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

-        it.writeToFile = false;

-      };

-      final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

-      solution = reasoner.solve(logicProblem, vampireConfig, workspace);

-      InputOutput.<String>println("Problem solved");

-    } catch (Throwable _e) {

-      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, "FunctionalArchitectureModel.xmi").eResource().getAllContents());

-    }

-    return _xblockexpression;

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/hu/bme/mit/inf/dslreasoner/run/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/hu/bme/mit/inf/dslreasoner/run/.gitignore
deleted file mode 100644
index 2c8a0d43..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/hu/bme/mit/inf/dslreasoner/run/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.SimpleRun.java._trace
-/.MedicalSystem.java._trace
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/.project b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.project
index 85d1308e..1701c3ba 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.trace.logic2vampire/.project
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/.project
@@ -1,29 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-        <name>ca.mcgill.ecse.dslreasoner.trace.logic2vampire</name>

-        <comment></comment>

-        <projects>

-        </projects>

-        <buildSpec>

-                <buildCommand>

-                        <name>org.eclipse.jdt.core.javabuilder</name>

-                        <arguments>

-                        </arguments>

-                </buildCommand>

-                <buildCommand>

-                        <name>org.eclipse.pde.ManifestBuilder</name>

-                        <arguments>

-                        </arguments>

-                </buildCommand>

-                <buildCommand>

-                        <name>org.eclipse.pde.SchemaBuilder</name>

-                        <arguments>

-                        </arguments>

-                </buildCommand>

-        </buildSpec>

-        <natures>

-                <nature>org.eclipse.sirius.nature.modelingproject</nature>

-                <nature>org.eclipse.jdt.core.javanature</nature>

-                <nature>org.eclipse.pde.PluginNature</nature>

-        </natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>ca.mcgill.ecse.dslreasoner.yakindu.test</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.ManifestBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.SchemaBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+        </buildSpec>
+        <natures>
+                <nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+                <nature>org.eclipse.viatra.query.projectnature</nature>
+        </natures>
+</projectDescription>
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin
new file mode 100644
index 00000000..d0f61cf1
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/.gitignore
new file mode 100644
index 00000000..5d3de4ba
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/.gitignore
@@ -0,0 +1 @@
+/.YakinduTest.java._trace
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.xtend
new file mode 100644
index 00000000..b6aae6ab
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/bin/ca/mcgill/ecse/dslreasoner/yakindu/test/YakinduTest.xtend
@@ -0,0 +1,178 @@
+package ca.mcgill.ecse.dslreasoner.yakindu.test
+
+import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage
+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.LogicProblemBuilder
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicStructureBuilder
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult
+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.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
+import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
+import java.util.LinkedList
+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.EPackage
+import org.eclipse.emf.ecore.EReference
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolutionScope
+
+class YakinduTest {
+
+        static String inWS = "input"
+        static String outWS = "output"
+        static String imName = "Yakindu.xmi"
+
+        def static void main(String[] args) {
+                val Ecore2Logic ecore2Logic = new Ecore2Logic
+                val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)
+                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)
+                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic
+
+                // Workspace setup
+                val inputs = new FileSystemWorkspace(inWS + '''/''', "")
+                val workspace = new FileSystemWorkspace(outWS + '''/''', "")
+                workspace.initAndClear
+
+                // Logicproblem writing setup
+                val reg = Resource.Factory.Registry.INSTANCE
+                val map = reg.extensionToFactoryMap
+                map.put("logicproblem", new XMIResourceFactoryImpl)
+
+                println("Input and output workspaces are created")
+
+                //loading the modeling environment
+                val metamodel = loadMetamodel(YakindummPackage.eINSTANCE) // TODO
+                val partialModel = loadPartialModel(inputs, imName)
+//              val queries = loadQueries(metamodel, Patterns.instance)
+                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())
+                var modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel)
+//              var validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem, new Viatra2LogicConfiguration)
+                var problem = modelExtensionProblem.output
+                
+                println("Modelling environment Loaded")
+                
+
+                val ss = new SolutionScope()
+                ss.numberOfRequiredSolution = 5
+                
+                var reasoner = new ViatraReasoner
+                val vampireConfig = new ViatraReasonerConfiguration => [
+                        // add configuration things, in config file first
+//                      it.documentationLevel = DocumentationLevel::FULL
+                        it.solutionScope = ss
+                        it.typeScopes.maxNewElements = 10
+                        it.typeScopes.minNewElements = 5
+                ]
+                
+                println("Problem Ready")
+
+                var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace)
+                
+                println("Problem solved")
+                
+                val interpretations = reasoner.getInterpretations(solution as ModelResult)
+                val models = new LinkedList
+                for (interpretation : interpretations) {
+//                      val extension b = new LogicStructureBuilder
+//                      val extension a = new LogicProblemBuilder
+
+                        val instanceModel = logic2Ecore.transformInterpretation(interpretation, modelGenerationProblem.trace)
+                        models += instanceModel
+                }
+
+                solution.writeSolution(workspace, models)
+//                              print((solution as ModelResult).representation.get(0))
+//                              val soln = ((solution as ModelResult).representation.get(0) as VampireModel)
+//                              println(soln.confirmations)
+//                              println((solution as ModelResult).representation)
+//                              modelFound = !soln.confirmations.filter [
+//                                      class == VLSFiniteModelImpl
+//                              ].isEmpty
+        }
+
+//      def static Map<Type, Integer> getTypeMap(Map<Class, Integer> classMap, EcoreMetamodelDescriptor metamodel,
+//              Ecore2Logic e2l, Ecore2Logic_Trace trace) {
+//              val typeMap = new HashMap<Type, Integer>
+//              val listMap = metamodel.classes.toMap[s|s.name]
+//
+//              for (Class  elem : classMap.keySet) {
+//                      typeMap.put(e2l.TypeofEClass(
+//                              trace,
+//                              listMap.get(elem.simpleName)
+//                      ), classMap.get(elem))
+//              }
+//              return typeMap
+//      }
+        def static loadMetamodel(EPackage pckg) {
+                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)
+        }
+
+        def static loadPartialModel(ReasonerWorkspace inputs, String path) {
+                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl())
+                inputs.readModel(EObject, path).eResource.contents
+//              inputs.readModel(EObject,"FamInstance.xmi").eResource.allContents.toList
+        }
+
+//      def static loadQueries(EcoreMetamodelDescriptor metamodel, IQueryGroup i) {
+//              val patterns = i.specifications.toList
+//              val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name == "Constraint"]].toSet
+//              val derivedFeatures = emptyMap
+//              // NO DERIVED FEATURES
+////            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
+//      }
+
+def static writeSolution(LogicResult solution, ReasonerWorkspace workspace, List<EObject> models) {
+                if(solution instanceof ModelResult) {
+                        val representations = solution.representation
+                        
+                        for(representationIndex : 0..<representations.size) {
+                                val representation = representations.get(representationIndex)
+                                val representationNumber = representationIndex + 1
+                                if(representation instanceof PartialInterpretation) {
+//                                      workspace.writeModel(representation, '''solution«representationNumber».partialinterpretation''')
+                                        val partialInterpretation2GML = new PartialInterpretation2Gml
+                                        val gml = partialInterpretation2GML.transform(representation)
+                                                //ecore2GML.transform(root)
+                                                workspace.writeText('''solution«representationNumber»Visualisation.gml''',gml)
+                                                
+                                } else {
+                                        workspace.writeText('''solution«representationNumber».txt''',representation.toString)
+                                }
+                        }
+                        
+                        for(modelIndex : 0..<models.size) {
+                                val model = models.get(modelIndex)
+                                val representationNumber = modelIndex + 1
+                                workspace.writeModel(model,'''model«representationNumber».xmi''')
+                        }
+                        println("Solution saved and visualised")
+                } 
+        }
+}
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.java._trace b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.java._trace
new file mode 100644
index 00000000..c90daf88
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.java._trace
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.classpath b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.classpath
index 1c96fe2f..2b46fc9b 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.classpath
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.classpath
@@ -4,5 +4,6 @@
         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

         <classpathentry kind="src" path="src"/>

         <classpathentry kind="src" path="xtend-gen"/>

+        <classpathentry kind="src" path="src-gen/"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/META-INF/MANIFEST.MF b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/META-INF/MANIFEST.MF
index 4e3222f9..d32b92ce 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/META-INF/MANIFEST.MF
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/META-INF/MANIFEST.MF
@@ -1,15 +1,14 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: FAMTest

-Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.application.FAMTest;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.application.FAMTest

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: com.google.guava,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.xtend.lib,

- org.eclipse.xtend.lib.macro,

- hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0",

- org.junit;bundle-version="4.12.0",

- org.eclipse.collections;bundle-version="7.1.1"

-

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: FAMTest
+Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.application.FAMTest;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: com.google.guava,
+  org.eclipse.xtext.xbase.lib,
+  org.eclipse.xtend.lib,
+  org.eclipse.xtend.lib.macro,
+  hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0",
+  org.junit;bundle-version="4.12.0",
+  org.eclipse.collections;bundle-version="7.1.1"
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.application.FAMTest
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/build.properties b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/build.properties
index 41eb6ade..aed85a48 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/build.properties
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/build.properties
@@ -1,4 +1,5 @@
-source.. = src/

-output.. = bin/

 bin.includes = META-INF/,\

                .

+source.. = src/,\

+           src-gen/

+output.. = bin/