1 files changed, 21 insertions, 25 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.java
index 81cae109..e1a1ca6e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.java
@@ -6,6 +6,8 @@ import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;
 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_TypeMapper_FilteredTypes;

+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Vampire2LogicMapper;

+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.VampireHandler;

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

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

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicModelInterpretation;

@@ -17,10 +19,8 @@ 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.logic.model.logicresult.ModelResult;

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

-import java.io.PrintWriter;

 import java.util.List;

 import org.eclipse.xtend2.lib.StringConcatenation;

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

 

 @SuppressWarnings("all")

 public class VampireSolver extends LogicReasoner {

@@ -32,32 +32,28 @@ public class VampireSolver extends LogicReasoner {
   

   private final Logic2VampireLanguageMapper forwardMapper = new Logic2VampireLanguageMapper(new Logic2VampireLanguageMapper_TypeMapper_FilteredTypes());

   

-  private final String fileName = "problem.tptp";

+  private final Vampire2LogicMapper backwardMapper = new Vampire2LogicMapper();

+  

+  private final VampireHandler handler = new VampireHandler();

+  

+  private final String fileName = "vampireProblem.tptp";

   

   @Override

-  public LogicResult solve(final LogicProblem problem, final LogicSolverConfiguration configuration, final ReasonerWorkspace workspace) throws LogicReasonerException {

-    try {

-      final VampireSolverConfiguration vampireConfig = this.asConfig(configuration);

-      final long transformationStart = System.currentTimeMillis();

-      final TracedOutput<VampireModel, Logic2VampireLanguageMapperTrace> result = this.forwardMapper.transformProblem(problem, vampireConfig);

-      final VampireModel vampireProblem = result.getOutput();

-      final Logic2VampireLanguageMapperTrace forwardTrace = result.getTrace();

-      String fileURI = null;

-      String vampireCode = null;

-      if (vampireConfig.writeToFile) {

-        fileURI = workspace.writeModel(vampireProblem, this.fileName).toFileString();

-      } else {

-        vampireCode = workspace.writeModelToString(vampireProblem, this.fileName);

-      }

-      long _currentTimeMillis = System.currentTimeMillis();

-      final long transformationTime = (_currentTimeMillis - transformationStart);

-      final PrintWriter out = new PrintWriter("output/files/vampireCode.tptp");

-      out.println(vampireCode);

-      out.close();

-      return null;

-    } catch (Throwable _e) {

-      throw Exceptions.sneakyThrow(_e);

+  public LogicResult solve(final LogicProblem problem, final LogicSolverConfiguration config, final ReasonerWorkspace workspace) throws LogicReasonerException {

+    final VampireSolverConfiguration vampireConfig = this.asConfig(config);

+    final long transformationStart = System.currentTimeMillis();

+    final TracedOutput<VampireModel, Logic2VampireLanguageMapperTrace> result = this.forwardMapper.transformProblem(problem, vampireConfig);

+    final VampireModel vampireProblem = result.getOutput();

+    final Logic2VampireLanguageMapperTrace forwardTrace = result.getTrace();

+    String fileURI = null;

+    String vampireCode = null;

+    vampireCode = workspace.writeModelToString(vampireProblem, this.fileName);

+    if (vampireConfig.writeToFile) {

+      fileURI = workspace.writeModel(vampireProblem, this.fileName).toFileString();

     }

+    long _currentTimeMillis = System.currentTimeMillis();

+    final long transformationTime = (_currentTimeMillis - transformationStart);

+    return null;

   }

   

   public VampireSolverConfiguration asConfig(final LogicSolverConfiguration configuration) {