diff options
author | 2019-10-09 01:03:49 -0400 | |
---|---|---|
committer | 2019-10-09 01:03:49 -0400 | |
commit | abf9662662c7f4c9fc410ea416a42fea9e0f43d4 (patch) | |
tree | 0c1d94e0ac91ac888824fe3bc471781aa34ca0f8 /Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse | |
parent | VAMPIRE: fix bug in transformation, further implement measurement code (diff) | |
download | VIATRA-Generator-abf9662662c7f4c9fc410ea416a42fea9e0f43d4.tar.gz VIATRA-Generator-abf9662662c7f4c9fc410ea416a42fea9e0f43d4.tar.zst VIATRA-Generator-abf9662662c7f4c9fc410ea416a42fea9e0f43d4.zip |
VAMPIRE: Further develop testing fo r Vampire solver
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse')
-rw-r--r-- | Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend | 25 |
1 files changed, 13 insertions, 12 deletions
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 | } |