From 4c34e22d23197ca6b03827a24e9339f88f82df5f Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Wed, 28 Aug 2019 05:56:34 -0400 Subject: VAMPIRE: integrate local Vampire executeable #32 --- .../ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend | 2 +- .../src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend | 2 +- .../mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend | 11 +++++------ .../ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse') diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend index 35b76350..70ded02d 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend @@ -50,7 +50,7 @@ class EcoreTest { it.documentationLevel = DocumentationLevel::FULL ] - solution = reasoner.solve(logicProblem, vampireConfig, workspace) + solution = reasoner.solve(logicProblem, vampireConfig, workspace, "ECO") println("Problem solved") 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 3c24abf9..4625bfbf 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 @@ -56,7 +56,7 @@ class FAMTest { //Start Time var startTime = System.currentTimeMillis - var LogicReasoner reasoner + var VampireSolver reasoner // * reasoner = new VampireSolver diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend index ba7ff028..2495ab77 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend @@ -1,13 +1,13 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse +import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.Dir +import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.File import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage -import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration 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 -import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic @@ -15,7 +15,6 @@ import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace import java.util.HashMap import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl -import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.* class FileSystemTest { def static void main(String[] args) { @@ -38,7 +37,7 @@ class FileSystemTest { val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE) val partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi") - val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance) +// val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance) println("DSL loaded") @@ -53,7 +52,7 @@ class FileSystemTest { // Start Time var startTime = System.currentTimeMillis - var LogicReasoner reasoner + var VampireSolver reasoner // * reasoner = new VampireSolver @@ -87,7 +86,7 @@ class FileSystemTest { it.uniquenessDuplicates = false ] - var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace) + var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace, "FS") /*/ * diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend index 76ac727a..fb1bdb59 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend @@ -53,7 +53,7 @@ class YakinduTest { // Start Time var startTime = System.currentTimeMillis - var LogicReasoner reasoner + var VampireSolver reasoner // * reasoner = new VampireSolver @@ -85,7 +85,7 @@ class YakinduTest { it.uniquenessDuplicates = false ] - var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace) + var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace, "YAK") /*/ * -- cgit v1.2.3-54-g00ecf