diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-10-09 01:03:49 -0400 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-10-09 01:03:49 -0400 |
commit | abf9662662c7f4c9fc410ea416a42fea9e0f43d4 (patch) | |
tree | 0c1d94e0ac91ac888824fe3bc471781aa34ca0f8 /Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse | |
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/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse')
6 files changed, 10 insertions, 9 deletions
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 | }; |