diff options
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner')
4 files changed, 9 insertions, 10 deletions
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 { | |||
50 | it.documentationLevel = DocumentationLevel::FULL | 50 | it.documentationLevel = DocumentationLevel::FULL |
51 | ] | 51 | ] |
52 | 52 | ||
53 | solution = reasoner.solve(logicProblem, vampireConfig, workspace) | 53 | solution = reasoner.solve(logicProblem, vampireConfig, workspace, "ECO") |
54 | 54 | ||
55 | println("Problem solved") | 55 | println("Problem solved") |
56 | 56 | ||
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 { | |||
56 | //Start Time | 56 | //Start Time |
57 | var startTime = System.currentTimeMillis | 57 | var startTime = System.currentTimeMillis |
58 | 58 | ||
59 | var LogicReasoner reasoner | 59 | var VampireSolver reasoner |
60 | // * | 60 | // * |
61 | reasoner = new VampireSolver | 61 | reasoner = new VampireSolver |
62 | 62 | ||
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 @@ | |||
1 | package ca.mcgill.ecse.dslreasoner.vampire.icse | 1 | package ca.mcgill.ecse.dslreasoner.vampire.icse |
2 | 2 | ||
3 | import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.Dir | ||
4 | import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.File | ||
3 | import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage | 5 | import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage |
4 | import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns | ||
5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver | 6 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver |
6 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration | 7 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration |
7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic | 8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic |
8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration | 9 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration |
9 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel | 10 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel |
10 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner | ||
11 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult | 11 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult |
12 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic | 12 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic |
13 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic | 13 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic |
@@ -15,7 +15,6 @@ import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace | |||
15 | import java.util.HashMap | 15 | import java.util.HashMap |
16 | import org.eclipse.emf.ecore.resource.Resource | 16 | import org.eclipse.emf.ecore.resource.Resource |
17 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | 17 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl |
18 | import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.* | ||
19 | 18 | ||
20 | class FileSystemTest { | 19 | class FileSystemTest { |
21 | def static void main(String[] args) { | 20 | def static void main(String[] args) { |
@@ -38,7 +37,7 @@ class FileSystemTest { | |||
38 | 37 | ||
39 | val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE) | 38 | val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE) |
40 | val partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi") | 39 | val partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi") |
41 | val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance) | 40 | // val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance) |
42 | 41 | ||
43 | println("DSL loaded") | 42 | println("DSL loaded") |
44 | 43 | ||
@@ -53,7 +52,7 @@ class FileSystemTest { | |||
53 | // Start Time | 52 | // Start Time |
54 | var startTime = System.currentTimeMillis | 53 | var startTime = System.currentTimeMillis |
55 | 54 | ||
56 | var LogicReasoner reasoner | 55 | var VampireSolver reasoner |
57 | // * | 56 | // * |
58 | reasoner = new VampireSolver | 57 | reasoner = new VampireSolver |
59 | 58 | ||
@@ -87,7 +86,7 @@ class FileSystemTest { | |||
87 | it.uniquenessDuplicates = false | 86 | it.uniquenessDuplicates = false |
88 | ] | 87 | ] |
89 | 88 | ||
90 | var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace) | 89 | var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace, "FS") |
91 | 90 | ||
92 | /*/ | 91 | /*/ |
93 | * | 92 | * |
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 { | |||
53 | // Start Time | 53 | // Start Time |
54 | var startTime = System.currentTimeMillis | 54 | var startTime = System.currentTimeMillis |
55 | 55 | ||
56 | var LogicReasoner reasoner | 56 | var VampireSolver reasoner |
57 | // * | 57 | // * |
58 | reasoner = new VampireSolver | 58 | reasoner = new VampireSolver |
59 | 59 | ||
@@ -85,7 +85,7 @@ class YakinduTest { | |||
85 | it.uniquenessDuplicates = false | 85 | it.uniquenessDuplicates = false |
86 | ] | 86 | ] |
87 | 87 | ||
88 | var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace) | 88 | var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace, "YAK") |
89 | 89 | ||
90 | /*/ | 90 | /*/ |
91 | * | 91 | * |