diff options
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test')
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 @@ | |||
2 | /.SimpleRun.java._trace | 2 | /.SimpleRun.java._trace |
3 | /.DslTest.java._trace | 3 | /.DslTest.java._trace |
4 | /.MedicalSystem.java._trace | 4 | /.MedicalSystem.java._trace |
5 | /.DslTest.xtendbin | ||
6 | /.MedicalSystem.xtendbin | ||
7 | /.SimpleRun.xtendbin | ||
8 | /.VampireTest.xtendbin | ||
9 | /DslTest.java | ||
10 | /MedicalSystem.java | ||
11 | /VampireTest.java | ||
12 | /.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 { | |||
29 | try { | 29 | try { |
30 | MedicalSystem.init(); | 30 | MedicalSystem.init(); |
31 | StringConcatenation _builder = new StringConcatenation(); | 31 | StringConcatenation _builder = new StringConcatenation(); |
32 | _builder.append("outputModels/"); | 32 | _builder.append("output/MedicalSystem/"); |
33 | final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder.toString(), ""); | 33 | final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder.toString(), ""); |
34 | workspace.initAndClear(); | 34 | workspace.initAndClear(); |
35 | final LogicProblem root = MedicalSystem.load(); | 35 | final LogicProblem root = MedicalSystem.load(); |
@@ -40,7 +40,7 @@ public class MedicalSystem { | |||
40 | reasoner = _vampireSolver; | 40 | reasoner = _vampireSolver; |
41 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); | 41 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); |
42 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { | 42 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { |
43 | it.writeToFile = false; | 43 | it.writeToFile = true; |
44 | }; | 44 | }; |
45 | final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function); | 45 | final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function); |
46 | solution = reasoner.solve(root, vampireConfig, workspace); | 46 | 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; | |||
11 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Assertion; | 11 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Assertion; |
12 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration; | 12 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration; |
13 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement; | 13 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement; |
14 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Distinct; | ||
14 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Exists; | 15 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Exists; |
15 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Iff; | 16 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Iff; |
16 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Not; | 17 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Not; |
@@ -25,12 +26,9 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage; | |||
25 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; | 26 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; |
26 | import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage; | 27 | import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage; |
27 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; | 28 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; |
28 | import java.util.Collections; | ||
29 | import java.util.Map; | 29 | import java.util.Map; |
30 | import org.eclipse.emf.common.util.EList; | 30 | import org.eclipse.emf.common.util.EList; |
31 | import org.eclipse.emf.common.util.URI; | ||
32 | import org.eclipse.emf.ecore.resource.Resource; | 31 | import org.eclipse.emf.ecore.resource.Resource; |
33 | import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; | ||
34 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; | 32 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; |
35 | import org.eclipse.xtend2.lib.StringConcatenation; | 33 | import org.eclipse.xtend2.lib.StringConcatenation; |
36 | import org.eclipse.xtext.xbase.lib.Exceptions; | 34 | import org.eclipse.xtext.xbase.lib.Exceptions; |
@@ -56,16 +54,13 @@ public class VampireTest { | |||
56 | map.put("logicproblem", _xMIResourceFactoryImpl); | 54 | map.put("logicproblem", _xMIResourceFactoryImpl); |
57 | VampireLanguageStandaloneSetup.doSetup(); | 55 | VampireLanguageStandaloneSetup.doSetup(); |
58 | StringConcatenation _builder = new StringConcatenation(); | 56 | StringConcatenation _builder = new StringConcatenation(); |
59 | _builder.append("output/models/"); | 57 | _builder.append("output/VampireTest"); |
60 | final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder.toString(), ""); | 58 | final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder.toString(), ""); |
61 | workspace.initAndClear(); | 59 | workspace.initAndClear(); |
62 | final ResourceSetImpl rs = new ResourceSetImpl(); | 60 | final String filename = "problem.logicproblem"; |
63 | final URI logicURI = URI.createFileURI("output/files/logProb.logicproblem"); | ||
64 | final Resource logRes = rs.createResource(logicURI); | ||
65 | LogicProblem problem = VampireTest.builder.createProblem(); | 61 | LogicProblem problem = VampireTest.builder.createProblem(); |
66 | VampireTest.rockPaperScisors(problem); | 62 | VampireTest.rockPaperScisors(problem); |
67 | logRes.getContents().add(problem); | 63 | workspace.writeModel(problem, filename); |
68 | logRes.save(Collections.EMPTY_MAP); | ||
69 | InputOutput.<String>println("Problem Created"); | 64 | InputOutput.<String>println("Problem Created"); |
70 | LogicResult solution = null; | 65 | LogicResult solution = null; |
71 | LogicReasoner reasoner = null; | 66 | LogicReasoner reasoner = null; |
@@ -73,7 +68,7 @@ public class VampireTest { | |||
73 | reasoner = _vampireSolver; | 68 | reasoner = _vampireSolver; |
74 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); | 69 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); |
75 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { | 70 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { |
76 | it.writeToFile = false; | 71 | it.writeToFile = true; |
77 | }; | 72 | }; |
78 | final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function); | 73 | final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function); |
79 | solution = reasoner.solve(problem, vampireConfig, workspace); | 74 | solution = reasoner.solve(problem, vampireConfig, workspace); |
@@ -83,6 +78,10 @@ public class VampireTest { | |||
83 | } | 78 | } |
84 | } | 79 | } |
85 | 80 | ||
81 | public String name() { | ||
82 | return this.getClass().getSimpleName(); | ||
83 | } | ||
84 | |||
86 | public static Assertion deMorgan(final LogicProblem problem) { | 85 | public static Assertion deMorgan(final LogicProblem problem) { |
87 | Assertion _xblockexpression = null; | 86 | Assertion _xblockexpression = null; |
88 | { | 87 | { |
@@ -120,10 +119,13 @@ public class VampireTest { | |||
120 | { | 119 | { |
121 | final Variable x = it.addVar("x", oldRPS); | 120 | final Variable x = it.addVar("x", oldRPS); |
122 | final Function1<VariableContext, TermDescription> _function_1 = (VariableContext it_1) -> { | 121 | final Function1<VariableContext, TermDescription> _function_1 = (VariableContext it_1) -> { |
123 | SymbolicValue _xblockexpression_2 = null; | 122 | And _xblockexpression_2 = null; |
124 | { | 123 | { |
125 | final Variable y = it_1.addVar("y", oldRPS); | 124 | final Variable y = it_1.addVar("y", oldRPS); |
126 | _xblockexpression_2 = VampireTest.builder.call(beats2, x, y); | 125 | SymbolicValue _call = VampireTest.builder.call(beats2, x, y); |
126 | Distinct _notEquals = VampireTest.builder.operator_notEquals(x, y); | ||
127 | _xblockexpression_2 = VampireTest.builder.And(_call, _notEquals, | ||
128 | VampireTest.builder.Not(VampireTest.builder.call(beats2, y, x))); | ||
127 | } | 129 | } |
128 | return _xblockexpression_2; | 130 | return _xblockexpression_2; |
129 | }; | 131 | }; |