diff options
Diffstat (limited to 'Tests')
11 files changed, 63 insertions, 61 deletions
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF index b786abfb..0af80e6c 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF | |||
@@ -7,47 +7,47 @@ Bundle-ClassPath: . | |||
7 | Bundle-Vendor: %providerName | 7 | Bundle-Vendor: %providerName |
8 | Bundle-Localization: plugin | 8 | Bundle-Localization: plugin |
9 | Export-Package: ca.mcgill.ecse.dslreasoner.vamipre.yakindumm, | 9 | Export-Package: ca.mcgill.ecse.dslreasoner.vamipre.yakindumm, |
10 | ca.mcgill.ecse.dslreasoner.vamipre.yakindumm.impl, | 10 | ca.mcgill.ecse.dslreasoner.vamipre.yakindumm.impl, |
11 | ca.mcgill.ecse.dslreasoner.vamipre.yakindumm.util, | 11 | ca.mcgill.ecse.dslreasoner.vamipre.yakindumm.util, |
12 | ca.mcgill.ecse.dslreasoner.vampire.queries, | 12 | ca.mcgill.ecse.dslreasoner.vampire.queries, |
13 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm, | 13 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm, |
14 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl, | 14 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl, |
15 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util, | 15 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util, |
16 | yakindumm, | 16 | yakindumm, |
17 | yakindumm.impl, | 17 | yakindumm.impl, |
18 | yakindumm.util, | 18 | yakindumm.util, |
19 | yakindumm.yakindumm, | 19 | yakindumm.yakindumm, |
20 | yakindumm.yakindumm.impl, | 20 | yakindumm.yakindumm.impl, |
21 | yakindumm.yakindumm.util | 21 | yakindumm.yakindumm.util |
22 | Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime, | 22 | Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime, |
23 | org.eclipse.core.runtime, | 23 | org.eclipse.core.runtime, |
24 | org.eclipse.emf.ecore;visibility:=reexport, | 24 | org.eclipse.emf.ecore;visibility:=reexport, |
25 | org.eclipse.viatra.query.runtime.rete, | 25 | org.eclipse.viatra.query.runtime.rete, |
26 | org.eclipse.viatra.query.runtime.localsearch, | 26 | org.eclipse.viatra.query.runtime.localsearch, |
27 | com.google.guava, | 27 | com.google.guava, |
28 | org.eclipse.xtext.xbase.lib, | 28 | org.eclipse.xtext.xbase.lib, |
29 | org.eclipse.xtend.lib, | 29 | org.eclipse.xtend.lib, |
30 | org.eclipse.xtend.lib.macro, | 30 | org.eclipse.xtend.lib.macro, |
31 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", | 31 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", |
32 | hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", | 32 | hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", |
33 | ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0", | 33 | ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0", |
34 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", | 34 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", |
35 | hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0", | 35 | hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0", |
36 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0", | 36 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0", |
37 | hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0", | 37 | hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0", |
38 | hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0", | 38 | hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0", |
39 | hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0", | 39 | hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0", |
40 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0", | 40 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0", |
41 | hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0", | 41 | hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0", |
42 | hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0", | 42 | hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0", |
43 | ModelGenExampleFAM_plugin;bundle-version="1.0.0", | 43 | ModelGenExampleFAM_plugin;bundle-version="1.0.0", |
44 | ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1", | 44 | ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1", |
45 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0", | 45 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0", |
46 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1", | 46 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1", |
47 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", | 47 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", |
48 | org.eclipse.collections;bundle-version="9.2.0", | 48 | org.eclipse.collections;bundle-version="9.2.0", |
49 | hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0", | 49 | hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0", |
50 | ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0" | 50 | ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0" |
51 | Import-Package: org.apache.log4j | 51 | Import-Package: org.apache.log4j |
52 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.test | 52 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.test |
53 | Bundle-ActivationPolicy: lazy | 53 | Bundle-ActivationPolicy: lazy |
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 cc7f4809..28e3e685 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 | |||
@@ -54,17 +54,17 @@ class YakinduTest { | |||
54 | // val queries = null | 54 | // val queries = null |
55 | println("DSL loaded") | 55 | println("DSL loaded") |
56 | 56 | ||
57 | var MAX = 150 | 57 | var MAX = 80 |
58 | var START = 10 | 58 | var START = 79 |
59 | var INC = 20 | 59 | var INC = 1 |
60 | var REPS = 1 | 60 | var REPS = 3 |
61 | 61 | ||
62 | val EXACT = 50 | 62 | val EXACT = 130 |
63 | if (EXACT != -1) { | 63 | if (EXACT != -1) { |
64 | MAX = EXACT | 64 | MAX = EXACT |
65 | START = EXACT | 65 | START = EXACT |
66 | INC = 1 | 66 | INC = 5 |
67 | REPS = 3 | 67 | REPS = 1 |
68 | } | 68 | } |
69 | 69 | ||
70 | var writer = new PrintWriter(workspace.workspaceURI + "//_yakinduStats.csv") | 70 | var writer = new PrintWriter(workspace.workspaceURI + "//_yakinduStats.csv") |
@@ -93,7 +93,7 @@ class YakinduTest { | |||
93 | var validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem, | 93 | var validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem, |
94 | new Viatra2LogicConfiguration) | 94 | new Viatra2LogicConfiguration) |
95 | 95 | ||
96 | var problem = validModelExtensionProblem.output | 96 | var problem = modelGenerationProblem.output |
97 | workspace.writeModel(problem, "Yakindu.logicproblem") | 97 | workspace.writeModel(problem, "Yakindu.logicproblem") |
98 | 98 | ||
99 | // println("Problem created") | 99 | // println("Problem created") |
@@ -125,9 +125,10 @@ class YakinduTest { | |||
125 | // add configuration things, in config file first | 125 | // add configuration things, in config file first |
126 | it.documentationLevel = DocumentationLevel::FULL | 126 | it.documentationLevel = DocumentationLevel::FULL |
127 | it.iteration = iter | 127 | it.iteration = iter |
128 | 128 | it.runtimeLimit = 60 | |
129 | it.typeScopes.minNewElements = size - inc | ||
130 | it.typeScopes.maxNewElements = size | 129 | it.typeScopes.maxNewElements = size |
130 | it.typeScopes.minNewElements = size - 5 | ||
131 | |||
131 | // if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin | 132 | // if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin |
132 | // if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax | 133 | // if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax |
133 | it.contCycleLevel = 5 | 134 | it.contCycleLevel = 5 |
@@ -167,8 +168,8 @@ class YakinduTest { | |||
167 | // println("Time was: " + totalTimeMin + ":" + totalTimeSec) | 168 | // println("Time was: " + totalTimeMin + ":" + totalTimeSec) |
168 | } | 169 | } |
169 | println() | 170 | println() |
170 | var solverMed = solverTimes.sort.get(REPS/2) | 171 | var solverMed = solverTimes.sort.get(REPS / 2) |
171 | var transformationMed = transformationTimes.sort.get(REPS/2) | 172 | var transformationMed = transformationTimes.sort.get(REPS / 2) |
172 | writer.append(solverMed.toString + "," + transformationMed.toString) | 173 | writer.append(solverMed.toString + "," + transformationMed.toString) |
173 | writer.append("\n") | 174 | writer.append("\n") |
174 | } | 175 | } |
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin index 1d9db781..084503b5 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin index 15159cb7..2315cd50 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin index 69cbcc0a..a3386941 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin index 16a24539..dee6f742 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin index 57a6fa02..f54cd3a0 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java index 35c48de2..b18ede4f 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java | |||
@@ -72,16 +72,16 @@ public class YakinduTest { | |||
72 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/Yakindu.xmi"); | 72 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/Yakindu.xmi"); |
73 | final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, Patterns.instance()); | 73 | final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, Patterns.instance()); |
74 | InputOutput.<String>println("DSL loaded"); | 74 | InputOutput.<String>println("DSL loaded"); |
75 | int MAX = 150; | 75 | int MAX = 80; |
76 | int START = 10; | 76 | int START = 79; |
77 | int INC = 20; | 77 | int INC = 1; |
78 | int REPS = 1; | 78 | int REPS = 3; |
79 | final int EXACT = 50; | 79 | final int EXACT = 130; |
80 | if ((EXACT != (-1))) { | 80 | if ((EXACT != (-1))) { |
81 | MAX = EXACT; | 81 | MAX = EXACT; |
82 | START = EXACT; | 82 | START = EXACT; |
83 | INC = 1; | 83 | INC = 5; |
84 | REPS = 3; | 84 | REPS = 1; |
85 | } | 85 | } |
86 | URI _workspaceURI = workspace.getWorkspaceURI(); | 86 | URI _workspaceURI = workspace.getWorkspaceURI(); |
87 | String _plus_2 = (_workspaceURI + "//_yakinduStats.csv"); | 87 | String _plus_2 = (_workspaceURI + "//_yakinduStats.csv"); |
@@ -115,7 +115,7 @@ public class YakinduTest { | |||
115 | TracedOutput<LogicProblem, Ecore2Logic_Trace> modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel); | 115 | TracedOutput<LogicProblem, Ecore2Logic_Trace> modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel); |
116 | Viatra2LogicConfiguration _viatra2LogicConfiguration = new Viatra2LogicConfiguration(); | 116 | Viatra2LogicConfiguration _viatra2LogicConfiguration = new Viatra2LogicConfiguration(); |
117 | TracedOutput<LogicProblem, Viatra2LogicTrace> validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem, _viatra2LogicConfiguration); | 117 | TracedOutput<LogicProblem, Viatra2LogicTrace> validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem, _viatra2LogicConfiguration); |
118 | LogicProblem problem = validModelExtensionProblem.getOutput(); | 118 | LogicProblem problem = modelGenerationProblem.getOutput(); |
119 | workspace.writeModel(problem, "Yakindu.logicproblem"); | 119 | workspace.writeModel(problem, "Yakindu.logicproblem"); |
120 | long startTime = System.currentTimeMillis(); | 120 | long startTime = System.currentTimeMillis(); |
121 | VampireSolver reasoner = null; | 121 | VampireSolver reasoner = null; |
@@ -128,8 +128,9 @@ public class YakinduTest { | |||
128 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { | 128 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { |
129 | it.documentationLevel = DocumentationLevel.FULL; | 129 | it.documentationLevel = DocumentationLevel.FULL; |
130 | it.iteration = iter; | 130 | it.iteration = iter; |
131 | it.typeScopes.minNewElements = (size - inc); | 131 | it.runtimeLimit = 60; |
132 | it.typeScopes.maxNewElements = size; | 132 | it.typeScopes.maxNewElements = size; |
133 | it.typeScopes.minNewElements = (size - 5); | ||
133 | it.contCycleLevel = 5; | 134 | it.contCycleLevel = 5; |
134 | it.uniquenessDuplicates = false; | 135 | it.uniquenessDuplicates = false; |
135 | }; | 136 | }; |
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 74f8e73f..e77449e7 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 68b3fd77..97f29b0c 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 fc4464b3..0e320f18 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 | |||