implement http requests for the TPTP server

2 files changed, 7 insertions, 4 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
index df3cfd82..39862c65 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
@@ -25,8 +25,7 @@ class Logic2VampireLanguageMapper_ScopeMapper {
 

         def dispatch public void transformScope(List<Type> types, VampireSolverConfiguration config,

                 Logic2VampireLanguageMapperTrace trace) {

-                val ABSOLUTE_MIN = 0

-                val ABSOLUTE_MAX = Integer.MAX_VALUE

+                

 

 //              TODO HANDLE ERRORS RELATED TO MAX > MIN

 //              TODO HANDLE ERROR RELATED TO SUM(MIN TYPES)+1(for root) > MAX OBJECTS

@@ -40,6 +39,8 @@ class Logic2VampireLanguageMapper_ScopeMapper {
                 // Number of defined non-abstract elements that are not enum elements

                 // Equals the number of elements in te initial model

                 var elemsInIM = trace.definedElement2String.size

+                val ABSOLUTE_MIN = 0

+                val ABSOLUTE_MAX = -1-elemsInIM

 //              var elemsInIM = 0

 //              

 //              for(t : types.filter(TypeDefinition).filter[!isIsAbstract]) {

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireHandler.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireHandler.xtend
index c1eb3382..47eae807 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireHandler.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireHandler.xtend
@@ -52,8 +52,10 @@ class VampireHandler {
 

                 val CMD = "cmd /c "

                 val TEMPNAME = "TEMP.tptp"

-                val SOLNNAME = "solution" + configuration.solver.toString + "_" + configuration.typeScopes.maxNewElements +

-                        "_" + configuration.iteration + ".tptp"

+//              val SOLNNAME = "solution" + configuration.solver.toString + "_" + configuration.typeScopes.maxNewElements +

+//                      "_" + configuration.iteration + ".tptp"

+                val SOLNNAME = "solution" + "_" + configuration.typeScopes.maxNewElements + "_" + configuration.iteration +

+                        ".tptp"

                 val PATH = "C:/cygwin64/bin"

 

                 val wsURI = workspace.workspaceURI