Fix FAM Test. Begin Grammar Fix.

7 files changed, 24 insertions, 14 deletions

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;

           };