Fix FAM Test. Begin Grammar Fix.

19 files changed, 360 insertions, 14 deletions

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
new file mode 100644
index 00000000..cf5c79b4
--- /dev/null
+++ 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
new file mode 100644
index 00000000..33fae225
--- /dev/null
+++ 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
new file mode 100644
index 00000000..56144b8f
--- /dev/null
+++ 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
new file mode 100644
index 00000000..29d89e94
--- /dev/null
+++ 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
new file mode 100644
index 00000000..c0d35b2f
--- /dev/null
+++ 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/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.gitignore
new file mode 100644
index 00000000..1b426999
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.gitignore
@@ -0,0 +1,6 @@
+/.FAMTest.java._trace
+/.YakinduTest.java._trace
+/.EcoreTest.java._trace
+/.fileSystemTest.java._trace
+/.FileSystemTest.java._trace
+/.GeneralTest.java._trace
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
new file mode 100644
index 00000000..f3dc8572
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
@@ -0,0 +1,116 @@
+package ca.mcgill.ecse.dslreasoner.vampire.icse;

+

+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 EcoreTest {

+  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("output/FAMTest/");

+      final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

+      workspace.initAndClear();

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

+      final EcoreMetamodelDescriptor metamodel = EcoreTest.loadMetamodel();

+      final List<EObject> partialModel = EcoreTest.loadPartialModel(inputs);

+      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 TracedOutput<LogicProblem, Ecore2Logic_Trace> modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel);

+      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 = true;

+      };

+      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, "FamInstance.xmi").eResource().getAllContents());

+    }

+    return _xblockexpression;

+  }

+  

+  private static Object loadQueries(final EcoreMetamodelDescriptor metamodel) {

+    return null;

+  }

+}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
new file mode 100644
index 00000000..92803b7f
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
@@ -0,0 +1,38 @@
+package ca.mcgill.ecse.dslreasoner.vampire.icse;

+

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

+import functionalarchitecture.FunctionalarchitecturePackage;

+import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns;

+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;

+import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;

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

+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;

+import org.eclipse.xtext.xbase.lib.InputOutput;

+

+@SuppressWarnings("all")

+public class FAMTest {

+  public static void main(final String[] args) {

+    StringConcatenation _builder = new StringConcatenation();

+    _builder.append("initialModels/");

+    final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

+    StringConcatenation _builder_1 = new StringConcatenation();

+    _builder_1.append("output/FAMTest/");

+    final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

+    workspace.initAndClear();

+    final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;

+    final Map<String, Object> map = reg.getExtensionToFactoryMap();

+    XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

+    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, "FunctionalArchitectureModel.xmi");

+    final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance());

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

+    GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace);

+  }

+}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
new file mode 100644
index 00000000..5994b4b4
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
@@ -0,0 +1,38 @@
+package ca.mcgill.ecse.dslreasoner.vampire.icse;

+

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

+import functionalarchitecture.FunctionalarchitecturePackage;

+import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns;

+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;

+import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;

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

+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;

+import org.eclipse.xtext.xbase.lib.InputOutput;

+

+@SuppressWarnings("all")

+public class FileSystemTest {

+  public static void main(final String[] args) {

+    StringConcatenation _builder = new StringConcatenation();

+    _builder.append("initialModels/");

+    final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

+    StringConcatenation _builder_1 = new StringConcatenation();

+    _builder_1.append("output/FAMTest/");

+    final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

+    workspace.initAndClear();

+    final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;

+    final Map<String, Object> map = reg.getExtensionToFactoryMap();

+    XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

+    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, "FunctionalArchitectureModel.xmi");

+    final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance());

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

+    GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace);

+  }

+}

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
new file mode 100644
index 00000000..92cf666c
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
@@ -0,0 +1,127 @@
+package ca.mcgill.ecse.dslreasoner.vampire.icse;

+

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

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

+import com.google.common.base.Objects;

+import com.google.common.collect.Iterables;

+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.viatra2logic.Viatra2LogicConfiguration;

+import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;

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

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

+import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace;

+import java.util.Collections;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+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.EPackage;

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

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

+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.viatra.query.runtime.api.IQuerySpecification;

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

+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.ListExtensions;

+import org.eclipse.xtext.xbase.lib.ObjectExtensions;

+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

+

+@SuppressWarnings("all")

+public class GeneralTest {

+  public static String createAndSolveProblem(final EcoreMetamodelDescriptor metamodel, final List<EObject> partialModel, final ViatraQuerySetDescriptor queries, final FileSystemWorkspace workspace) {

+    try {

+      String _xblockexpression = null;

+      {

+        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);

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

+        Viatra2LogicConfiguration _viatra2LogicConfiguration = new Viatra2LogicConfiguration();

+        problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, _viatra2LogicConfiguration).getOutput();

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

+        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 = true;

+        };

+        final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

+        solution = reasoner.solve(problem, vampireConfig, workspace);

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

+      }

+      return _xblockexpression;

+    } catch (Throwable _e) {

+      throw Exceptions.sneakyThrow(_e);

+    }

+  }

+  

+  public static EcoreMetamodelDescriptor loadMetamodel(final EPackage pckg) {

+    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);

+  }

+  

+  public static EList<EObject> loadPartialModel(final ReasonerWorkspace inputs, final String path) {

+    EList<EObject> _xblockexpression = null;

+    {

+      Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();

+      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

+      _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);

+      _xblockexpression = inputs.<EObject>readModel(EObject.class, path).eResource().getContents();

+    }

+    return _xblockexpression;

+  }

+  

+  public static ViatraQuerySetDescriptor loadQueries(final EcoreMetamodelDescriptor metamodel, final IQueryGroup i) {

+    final List<IQuerySpecification<?>> patterns = IterableExtensions.<IQuerySpecification<?>>toList(i.getSpecifications());

+    final Function1<IQuerySpecification<?>, Boolean> _function = (IQuerySpecification<?> it) -> {

+      final Function1<PAnnotation, Boolean> _function_1 = (PAnnotation it_1) -> {

+        String _name = it_1.getName();

+        return Boolean.valueOf(Objects.equal(_name, "Constraint"));

+      };

+      return Boolean.valueOf(IterableExtensions.<PAnnotation>exists(it.getAllAnnotations(), _function_1));

+    };

+    final Set<IQuerySpecification<?>> wfPatterns = IterableExtensions.<IQuerySpecification<?>>toSet(IterableExtensions.<IQuerySpecification<?>>filter(patterns, _function));

+    final Map<IQuerySpecification<?>, EStructuralFeature> derivedFeatures = CollectionLiterals.<IQuerySpecification<?>, EStructuralFeature>emptyMap();

+    final ViatraQuerySetDescriptor res = new ViatraQuerySetDescriptor(patterns, wfPatterns, derivedFeatures);

+    return res;

+  }

+}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
new file mode 100644
index 00000000..fa4ef6b9
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
@@ -0,0 +1,10 @@
+package ca.mcgill.ecse.dslreasoner.vampire.icse;

+

+@SuppressWarnings("all")

+public class YakinduTest {

+  public static void main(final String[] args) {

+    throw new Error("Unresolved compilation problems:"

+      + "\nmissing \')\' at \'GeneralTest\'"

+      + "\nType mismatch: cannot convert from String to IQueryGroup");

+  }

+}

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
new file mode 100644
index 00000000..f3e21798
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icseTest/.gitignore
@@ -0,0 +1 @@
+/.FAMTest.java._trace
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 01664d90..fe447779 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 6a36d4d4..8e57f5e7 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 93a2e4f4..9d12dab4 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/.gitignore b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.gitignore
index 15b5afc4..2760bac4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.gitignore
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.gitignore
@@ -2,3 +2,11 @@
 /.SimpleRun.java._trace
 /.DslTest.java._trace
 /.MedicalSystem.java._trace
+/.DslTest.xtendbin
+/.MedicalSystem.xtendbin
+/.SimpleRun.xtendbin
+/.VampireTest.xtendbin
+/DslTest.java
+/MedicalSystem.java
+/VampireTest.java
+/.FAMTest.java._trace
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/DslTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/FAMTest.java
index 7b4849e1..7b4849e1 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/DslTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/FAMTest.java
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/MedicalSystem.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/MedicalSystem.java
index d4f53d65..ece0a9bb 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/MedicalSystem.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/MedicalSystem.java
@@ -29,7 +29,7 @@ public class MedicalSystem {
     try {

       MedicalSystem.init();

       StringConcatenation _builder = new StringConcatenation();

-      _builder.append("outputModels/");

+      _builder.append("output/MedicalSystem/");

       final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder.toString(), "");

       workspace.initAndClear();

       final LogicProblem root = MedicalSystem.load();

@@ -40,7 +40,7 @@ public class MedicalSystem {
       reasoner = _vampireSolver;

       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

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

-        it.writeToFile = false;

+        it.writeToFile = true;

       };

       final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

       solution = reasoner.solve(root, vampireConfig, workspace);

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
index d02174f7..74f117f2 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
@@ -11,6 +11,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.And;
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Assertion;

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

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

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Distinct;

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

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

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

@@ -25,12 +26,9 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

 import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage;

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

-import java.util.Collections;

 import java.util.Map;

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

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

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

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

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

 import org.eclipse.xtend2.lib.StringConcatenation;

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

@@ -56,16 +54,13 @@ public class VampireTest {
       map.put("logicproblem", _xMIResourceFactoryImpl);

       VampireLanguageStandaloneSetup.doSetup();

       StringConcatenation _builder = new StringConcatenation();

-      _builder.append("output/models/");

+      _builder.append("output/VampireTest");

       final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder.toString(), "");

       workspace.initAndClear();

-      final ResourceSetImpl rs = new ResourceSetImpl();

-      final URI logicURI = URI.createFileURI("output/files/logProb.logicproblem");

-      final Resource logRes = rs.createResource(logicURI);

+      final String filename = "problem.logicproblem";

       LogicProblem problem = VampireTest.builder.createProblem();

       VampireTest.rockPaperScisors(problem);

-      logRes.getContents().add(problem);

-      logRes.save(Collections.EMPTY_MAP);

+      workspace.writeModel(problem, filename);

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

       LogicResult solution = null;

       LogicReasoner reasoner = null;

@@ -73,7 +68,7 @@ public class VampireTest {
       reasoner = _vampireSolver;

       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

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

-        it.writeToFile = false;

+        it.writeToFile = true;

       };

       final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

       solution = reasoner.solve(problem, vampireConfig, workspace);

@@ -83,6 +78,10 @@ public class VampireTest {
     }

   }

   

+  public String name() {

+    return this.getClass().getSimpleName();

+  }

+  

   public static Assertion deMorgan(final LogicProblem problem) {

     Assertion _xblockexpression = null;

     {

@@ -120,10 +119,13 @@ public class VampireTest {
         {

           final Variable x = it.addVar("x", oldRPS);

           final Function1<VariableContext, TermDescription> _function_1 = (VariableContext it_1) -> {

-            SymbolicValue _xblockexpression_2 = null;

+            And _xblockexpression_2 = null;

             {

               final Variable y = it_1.addVar("y", oldRPS);

-              _xblockexpression_2 = VampireTest.builder.call(beats2, x, y);

+              SymbolicValue _call = VampireTest.builder.call(beats2, x, y);

+              Distinct _notEquals = VampireTest.builder.operator_notEquals(x, y);

+              _xblockexpression_2 = VampireTest.builder.And(_call, _notEquals, 

+                VampireTest.builder.Not(VampireTest.builder.call(beats2, y, x)));

             }

             return _xblockexpression_2;

           };