VAMPIRE: last commit

11 files changed, 81 insertions, 40 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
index f86a2f3c..48991faa 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>

 <language:LogicProblem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/ecore2logicannotation" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem" xmlns:language_1="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language">

   <types xsi:type="language_1:TypeDeclaration" name="FunctionalElement class" subtypes="//@types.2" isAbstract="true"/>

-  <types xsi:type="language_1:TypeDeclaration" name="FunctionalArchitectureModel class" subtypes="//@types.10 //@types.11" isAbstract="true"/>

+  <types xsi:type="language_1:TypeDeclaration" name="FunctionalArchitectureModel class"/>

   <types xsi:type="language_1:TypeDeclaration" name="Function class" supertypes="//@types.0"/>

   <types xsi:type="language_1:TypeDeclaration" name="FAMTerminator class"/>

   <types xsi:type="language_1:TypeDeclaration" name="InformationLink class"/>

@@ -10,8 +10,6 @@
   <types xsi:type="language_1:TypeDeclaration" name="FunctionalOutput class" supertypes="//@types.8"/>

   <types xsi:type="language_1:TypeDeclaration" name="FunctionalData class" subtypes="//@types.6 //@types.7" isAbstract="true"/>

   <types xsi:type="language_1:TypeDefinition" name="FunctionType enum" elements="//@elements.0 //@elements.1 //@elements.2"/>

-  <types xsi:type="language_1:TypeDefinition" name="FunctionalArchitectureModel class DefinedPart" supertypes="//@types.1" elements="//@elements.3"/>

-  <types xsi:type="language_1:TypeDeclaration" name="FunctionalArchitectureModel class UndefinedPart" supertypes="//@types.1"/>

   <assertions name="upperMultiplicity interface FunctionalElement" annotations="//@annotations.0">

     <value xsi:type="language_1:Forall">

       <quantifiedVariables name="src">

@@ -496,6 +494,55 @@
       </expression>

     </value>

   </assertions>

+  <assertions name="lowerMultiplicity value FunctionalData" annotations="//@annotations.19">

+    <value xsi:type="language_1:Forall">

+      <quantifiedVariables name="src">

+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>

+      </quantifiedVariables>

+      <expression xsi:type="language_1:Exists">

+        <quantifiedVariables name="trg 1">

+          <range xsi:type="language_1:IntTypeReference"/>

+        </quantifiedVariables>

+        <expression xsi:type="language_1:And">

+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">

+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.19/@value/@quantifiedVariables.0"/>

+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.19/@value/@expression/@quantifiedVariables.0"/>

+          </operands>

+        </expression>

+      </expression>

+    </value>

+  </assertions>

+  <assertions name="upperMultiplicity value FunctionalData" annotations="//@annotations.20">

+    <value xsi:type="language_1:Forall">

+      <quantifiedVariables name="src">

+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>

+      </quantifiedVariables>

+      <quantifiedVariables name="trg 1">

+        <range xsi:type="language_1:IntTypeReference"/>

+      </quantifiedVariables>

+      <quantifiedVariables name="trg 2">

+        <range xsi:type="language_1:IntTypeReference"/>

+      </quantifiedVariables>

+      <expression xsi:type="language_1:Impl">

+        <leftOperand xsi:type="language_1:And">

+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">

+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.0"/>

+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.1"/>

+          </operands>

+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">

+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.0"/>

+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.2"/>

+          </operands>

+        </leftOperand>

+        <rightOperand xsi:type="language_1:Not">

+          <operand xsi:type="language_1:Distinct">

+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.1"/>

+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.2"/>

+          </operand>

+        </rightOperand>

+      </expression>

+    </value>

+  </assertions>

   <relations xsi:type="language_1:RelationDeclaration" name="interface reference FunctionalElement">

     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>

     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>

@@ -556,11 +603,14 @@
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>

     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>

   </relations>

+  <relations xsi:type="language_1:RelationDeclaration" name="value attribute FunctionalData">

+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>

+    <parameters xsi:type="language_1:IntTypeReference"/>

+  </relations>

   <elements name="Root literal FunctionType" definedInType="//@types.9"/>

   <elements name="Intermediate literal FunctionType" definedInType="//@types.9"/>

   <elements name="Leaf literal FunctionType" definedInType="//@types.9"/>

-  <elements name="o 1" definedInType="//@types.10"/>

-  <containmentHierarchies typesOrderedInHierarchy="//@types.4 //@types.5 //@types.2 //@types.3 //@types.7 //@types.6 //@types.8 //@types.0 //@types.1 //@types.10 //@types.11" containmentRelations="//@relations.0 //@relations.3 //@relations.4 //@relations.8 //@relations.11 //@relations.12"/>

+  <containmentHierarchies typesOrderedInHierarchy="//@types.2 //@types.3 //@types.4 //@types.7 //@types.0 //@types.6 //@types.1 //@types.5 //@types.8" containmentRelations="//@relations.0 //@relations.3 //@relations.4 //@relations.8 //@relations.11 //@relations.12"/>

   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.0" upper="1"/>

   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.1" relation="//@relations.1" lower="1"/>

   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.2" relation="//@relations.1" upper="1"/>

@@ -580,4 +630,6 @@
   <annotations xsi:type="ecore2logicannotations:InverseRelationAssertion" target="//@assertions.16" inverseA="//@relations.8" inverseB="//@relations.13"/>

   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.17" relation="//@relations.14" lower="1"/>

   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.18" relation="//@relations.14" upper="1"/>

+  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.19" relation="//@relations.15" lower="1"/>

+  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.20" relation="//@relations.15" upper="1"/>

 </language:LogicProblem>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
index a7da818c..17f9ae5e 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
@@ -1,5 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.BackendSolver

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration

 import functionalarchitecture.FAMTerminator

@@ -8,7 +9,6 @@ import functionalarchitecture.FunctionalArchitectureModel
 import functionalarchitecture.FunctionalInterface

 import functionalarchitecture.FunctionalOutput

 import functionalarchitecture.FunctionalarchitecturePackage

-//import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns

 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

@@ -16,7 +16,6 @@ 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.viatra2logic.Viatra2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2PartialInterpretation

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace

@@ -46,7 +45,7 @@ class FAMTest {
 

                 // Load DSL

                 val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE)

-                val partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi")

+//              val partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi")

 //              val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance)

                 val queries = null

 

@@ -54,7 +53,7 @@ class FAMTest {
 

                 val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())

                 var problem = modelGenerationProblem.output

-                problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

+//              problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

 //              problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output

                 workspace.writeModel(problem, "Fam.logicproblem")

 

@@ -96,6 +95,7 @@ class FAMTest {
                         it.typeScopes.maxNewElements = 10//25

 //                      if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

 //                      if(typeMapMax.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

+                        it.solver = BackendSolver::LOCVAMP

                         it.contCycleLevel = 5

                         it.uniquenessDuplicates = false

                 ]

@@ -110,25 +110,25 @@ class FAMTest {
 //                      Literal(modelGenerationProblem.trace, ecore2Logic.allLiteralsInScope(modelGenerationProblem.trace).get(0) )

 //              )

 //              println((ecore2Logic.allAttributesInScope(modelGenerationProblem.trace)).get(0).EAttributeType)

-                print(interpretations.class)

-                for (interpretation : interpretations) {

-                        val model = logic2Ecore.transformInterpretation(interpretation, modelGenerationProblem.trace)

-                        workspace.writeModel(model, "model.xmi")

-

-//                      val representation = im2pi.transform(modelGenerationProblem, model.eAllContents.toList, false)//solution.representation.get(0) // TODO: fix for multiple represenations

-//                      if (representation instanceof PartialInterpretation) {

-//                              val vis1 = new PartialInterpretation2Gml

-//                              val gml = vis1.transform(representation)

-//                              workspace.writeText("model.gml", gml)

+//              print(interpretations.class)

+//              for (interpretation : interpretations) {

+//                      val model = logic2Ecore.transformInterpretation(interpretation, modelGenerationProblem.trace)

+//                      workspace.writeModel(model, "model.xmi")

 //

-//                              val vis2 = new GraphvizVisualiser

-//                              val dot = vis2.visualiseConcretization(representation)

-//                              dot.writeToFile(workspace, "model.png")

-//                      } else {

-//                              println("ERROR")

-//                      }

-// look here: hu.bme.mit.inf.dslreasoner.application.execution.GenerationTaskExecutor

-                }

+////                    val representation = im2pi.transform(modelGenerationProblem, model.eAllContents.toList, false)//solution.representation.get(0) // TODO: fix for multiple represenations

+////                    if (representation instanceof PartialInterpretation) {

+////                            val vis1 = new PartialInterpretation2Gml

+////                            val gml = vis1.transform(representation)

+////                            workspace.writeText("model.gml", gml)

+////

+////                            val vis2 = new GraphvizVisualiser

+////                            val dot = vis2.visualiseConcretization(representation)

+////                            dot.writeToFile(workspace, "model.png")

+////                    } else {

+////                            println("ERROR")

+////                    }

+//// look here: hu.bme.mit.inf.dslreasoner.application.execution.GenerationTaskExecutor

+//              }

 

 // transform interpretation to ecore, and it is easy from there

                 /*/

@@ -147,7 +147,6 @@ class FAMTest {
                 var totalTimeMin = (System.currentTimeMillis - startTime) / 60000

                 var totalTimeSec = ((System.currentTimeMillis - startTime) / 1000) % 60

 

-                println("Problem solved")

                 println("Time was: " + totalTimeMin + ":" + totalTimeSec)

         }

 

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 197ef5c9..7ccbe59f 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 52c819c4..b03f527f 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 b3b15fba..6bc303df 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 03bcbad7..a34d7d3b 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 0f06a39a..a8c5f173 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/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
index 8cd08fd8..cd9ba3c1 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
@@ -1,6 +1,7 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

 import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.BackendSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

 import functionalarchitecture.FAMTerminator;

@@ -27,8 +28,6 @@ import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

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

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

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

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

 import org.eclipse.xtend2.lib.StringConcatenation;

@@ -59,13 +58,11 @@ public class FAMTest {
       map.put("logicproblem", _xMIResourceFactoryImpl);

       InputOutput.<String>println("Input and output workspaces are created");

       final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE);

-      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi");

       final Object queries = null;

       InputOutput.<String>println("DSL loaded");

       Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

       final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

       LogicProblem problem = modelGenerationProblem.getOutput();

-      problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput();

       workspace.writeModel(problem, "Fam.logicproblem");

       InputOutput.<String>println("Problem created");

       long startTime = System.currentTimeMillis();

@@ -86,6 +83,7 @@ public class FAMTest {
         it.documentationLevel = DocumentationLevel.FULL;

         it.typeScopes.minNewElements = 8;

         it.typeScopes.maxNewElements = 10;

+        it.solver = BackendSolver.LOCVAMP;

         it.contCycleLevel = 5;

         it.uniquenessDuplicates = false;

       };

@@ -93,13 +91,6 @@ public class FAMTest {
       LogicResult solution = reasoner.solve(problem, vampireConfig, workspace);

       InputOutput.<String>println("Problem solved");

       List<? extends LogicModelInterpretation> interpretations = reasoner.getInterpretations(((ModelResult) solution));

-      InputOutput.<Class<? extends List>>print(interpretations.getClass());

-      for (final LogicModelInterpretation interpretation : interpretations) {

-        {

-          final EObject model = logic2Ecore.transformInterpretation(interpretation, modelGenerationProblem.getTrace());

-          workspace.writeModel(model, "model.xmi");

-        }

-      }

       long _currentTimeMillis = System.currentTimeMillis();

       long _minus = (_currentTimeMillis - startTime);

       long totalTimeMin = (_minus / 60000);

@@ -107,7 +98,6 @@ public class FAMTest {
       long _minus_1 = (_currentTimeMillis_1 - startTime);

       long _divide = (_minus_1 / 1000);

       long totalTimeSec = (_divide % 60);

-      InputOutput.<String>println("Problem solved");

       InputOutput.<String>println(((("Time was: " + Long.valueOf(totalTimeMin)) + ":") + Long.valueOf(totalTimeSec)));

     } catch (Throwable _e) {

       throw Exceptions.sneakyThrow(_e);

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 5dcd3133..9a2c84d7 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 68ade593..f39505b0 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 80e7ebe0..51d32da7 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