diff options
Diffstat (limited to 'Tests')
9 files changed, 25 insertions, 13 deletions
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 bbea9822..ccf36550 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 | |||
@@ -17,6 +17,7 @@ import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace | |||
17 | import java.util.HashMap | 17 | import java.util.HashMap |
18 | import org.eclipse.emf.ecore.resource.Resource | 18 | import org.eclipse.emf.ecore.resource.Resource |
19 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | 19 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl |
20 | import functionalarchitecture.FunctionalArchitectureModel | ||
20 | 21 | ||
21 | class FAMTest { | 22 | class FAMTest { |
22 | def static void main(String[] args) { | 23 | def static void main(String[] args) { |
@@ -46,7 +47,7 @@ class FAMTest { | |||
46 | 47 | ||
47 | val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration()) | 48 | val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration()) |
48 | var problem = modelGenerationProblem.output | 49 | var problem = modelGenerationProblem.output |
49 | problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output | 50 | // problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output |
50 | // problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output | 51 | // problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output |
51 | workspace.writeModel(problem, "Fam.logicproblem") | 52 | workspace.writeModel(problem, "Fam.logicproblem") |
52 | 53 | ||
@@ -62,6 +63,7 @@ class FAMTest { | |||
62 | // ///////////////////////////////////////////////////// | 63 | // ///////////////////////////////////////////////////// |
63 | // Minimum Scope | 64 | // Minimum Scope |
64 | val classMapMin = new HashMap<Class, Integer> | 65 | val classMapMin = new HashMap<Class, Integer> |
66 | classMapMin.put(FunctionalArchitectureModel, 1) | ||
65 | classMapMin.put(Function, 1) | 67 | classMapMin.put(Function, 1) |
66 | classMapMin.put(FunctionalInterface, 2) | 68 | classMapMin.put(FunctionalInterface, 2) |
67 | classMapMin.put(FunctionalOutput, 3) | 69 | classMapMin.put(FunctionalOutput, 3) |
@@ -70,6 +72,7 @@ class FAMTest { | |||
70 | 72 | ||
71 | // Maximum Scope | 73 | // Maximum Scope |
72 | val classMapMax = new HashMap<Class, Integer> | 74 | val classMapMax = new HashMap<Class, Integer> |
75 | classMapMax.put(FunctionalArchitectureModel, 3) | ||
73 | classMapMax.put(Function, 5) | 76 | classMapMax.put(Function, 5) |
74 | classMapMax.put(FunctionalInterface, 2) | 77 | classMapMax.put(FunctionalInterface, 2) |
75 | classMapMax.put(FunctionalOutput, 4) | 78 | classMapMax.put(FunctionalOutput, 4) |
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 d4cbb299..61a20a34 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 | |||
@@ -43,7 +43,7 @@ class FileSystemTest { | |||
43 | 43 | ||
44 | val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration()) | 44 | val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration()) |
45 | var problem = modelGenerationProblem.output | 45 | var problem = modelGenerationProblem.output |
46 | // problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output | 46 | problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output |
47 | // problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output | 47 | // problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output |
48 | workspace.writeModel(problem, "FileSystem.logicproblem") | 48 | workspace.writeModel(problem, "FileSystem.logicproblem") |
49 | 49 | ||
@@ -76,8 +76,8 @@ class FileSystemTest { | |||
76 | // add configuration things, in config file first | 76 | // add configuration things, in config file first |
77 | it.documentationLevel = DocumentationLevel::FULL | 77 | it.documentationLevel = DocumentationLevel::FULL |
78 | 78 | ||
79 | it.typeScopes.minNewElements = 40 | 79 | it.typeScopes.minNewElements = 10 |
80 | it.typeScopes.maxNewElements = 59 | 80 | it.typeScopes.maxNewElements = 25 |
81 | if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin | 81 | if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin |
82 | if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax | 82 | if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax |
83 | it.contCycleLevel = 5 | 83 | it.contCycleLevel = 5 |
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 f0d88b49..3342c18a 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 | |||
@@ -14,6 +14,7 @@ import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace | |||
14 | import java.util.HashMap | 14 | import java.util.HashMap |
15 | import org.eclipse.emf.ecore.resource.Resource | 15 | import org.eclipse.emf.ecore.resource.Resource |
16 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | 16 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl |
17 | import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region | ||
17 | 18 | ||
18 | class YakinduTest { | 19 | class YakinduTest { |
19 | def static void main(String[] args) { | 20 | def static void main(String[] args) { |
@@ -42,7 +43,7 @@ class YakinduTest { | |||
42 | 43 | ||
43 | val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration()) | 44 | val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration()) |
44 | var problem = modelGenerationProblem.output | 45 | var problem = modelGenerationProblem.output |
45 | // problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output | 46 | problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output |
46 | // problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output | 47 | // problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output |
47 | workspace.writeModel(problem, "Yakindu.logicproblem") | 48 | workspace.writeModel(problem, "Yakindu.logicproblem") |
48 | 49 | ||
@@ -58,14 +59,14 @@ class YakinduTest { | |||
58 | // ///////////////////////////////////////////////////// | 59 | // ///////////////////////////////////////////////////// |
59 | // Minimum Scope | 60 | // Minimum Scope |
60 | val classMapMin = new HashMap<Class, Integer> | 61 | val classMapMin = new HashMap<Class, Integer> |
61 | // classMapMin.put(Function, 1) | 62 | classMapMin.put(Region, 1) |
62 | // classMapMin.put(FunctionalInterface, 2) | 63 | // classMapMin.put(FunctionalInterface, 2) |
63 | // classMapMin.put(FunctionalOutput, 3) | 64 | // classMapMin.put(FunctionalOutput, 3) |
64 | val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace) | 65 | val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace) |
65 | 66 | ||
66 | // Maximum Scope | 67 | // Maximum Scope |
67 | val classMapMax = new HashMap<Class, Integer> | 68 | val classMapMax = new HashMap<Class, Integer> |
68 | // classMapMax.put(Function, 5) | 69 | classMapMax.put(Region, 5) |
69 | // classMapMax.put(FunctionalInterface, 2) | 70 | // classMapMax.put(FunctionalInterface, 2) |
70 | // classMapMax.put(FunctionalOutput, 4) | 71 | // classMapMax.put(FunctionalOutput, 4) |
71 | val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace) | 72 | val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace) |
@@ -75,8 +76,8 @@ class YakinduTest { | |||
75 | // add configuration things, in config file first | 76 | // add configuration things, in config file first |
76 | it.documentationLevel = DocumentationLevel::FULL | 77 | it.documentationLevel = DocumentationLevel::FULL |
77 | 78 | ||
78 | it.typeScopes.minNewElements = 53 | 79 | it.typeScopes.minNewElements = 20 |
79 | it.typeScopes.maxNewElements = 53 | 80 | it.typeScopes.maxNewElements = 30 |
80 | if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin | 81 | if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin |
81 | if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax | 82 | if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax |
82 | it.contCycleLevel = 5 | 83 | it.contCycleLevel = 5 |
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 9ac7c906..796bed43 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 60e770c6..830ec7f9 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/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin index 5b017f34..395fc452 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/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java index 1fcaf9bd..855909aa 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java | |||
@@ -4,6 +4,7 @@ import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; | |||
4 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; | 4 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; |
5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; | 5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; |
6 | import functionalarchitecture.Function; | 6 | import functionalarchitecture.Function; |
7 | import functionalarchitecture.FunctionalArchitectureModel; | ||
7 | import functionalarchitecture.FunctionalOutput; | 8 | import functionalarchitecture.FunctionalOutput; |
8 | import functionalarchitecture.FunctionalarchitecturePackage; | 9 | import functionalarchitecture.FunctionalarchitecturePackage; |
9 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; | 10 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; |
@@ -65,11 +66,13 @@ public class FAMTest { | |||
65 | VampireSolver _vampireSolver = new VampireSolver(); | 66 | VampireSolver _vampireSolver = new VampireSolver(); |
66 | reasoner = _vampireSolver; | 67 | reasoner = _vampireSolver; |
67 | final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>(); | 68 | final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>(); |
69 | classMapMin.put(FunctionalArchitectureModel.class, Integer.valueOf(1)); | ||
68 | classMapMin.put(Function.class, Integer.valueOf(1)); | 70 | classMapMin.put(Function.class, Integer.valueOf(1)); |
69 | classMapMin.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2)); | 71 | classMapMin.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2)); |
70 | classMapMin.put(FunctionalOutput.class, Integer.valueOf(3)); | 72 | classMapMin.put(FunctionalOutput.class, Integer.valueOf(3)); |
71 | final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace()); | 73 | final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace()); |
72 | final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>(); | 74 | final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>(); |
75 | classMapMax.put(FunctionalArchitectureModel.class, Integer.valueOf(3)); | ||
73 | classMapMax.put(Function.class, Integer.valueOf(5)); | 76 | classMapMax.put(Function.class, Integer.valueOf(5)); |
74 | classMapMax.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2)); | 77 | classMapMax.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2)); |
75 | classMapMax.put(FunctionalOutput.class, Integer.valueOf(4)); | 78 | classMapMax.put(FunctionalOutput.class, Integer.valueOf(4)); |
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java index f7f8a5ee..21d2a307 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java | |||
@@ -57,6 +57,7 @@ public class FileSystemTest { | |||
57 | Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration(); | 57 | Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration(); |
58 | final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration); | 58 | final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration); |
59 | LogicProblem problem = modelGenerationProblem.getOutput(); | 59 | LogicProblem problem = modelGenerationProblem.getOutput(); |
60 | problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput(); | ||
60 | workspace.writeModel(problem, "FileSystem.logicproblem"); | 61 | workspace.writeModel(problem, "FileSystem.logicproblem"); |
61 | InputOutput.<String>println("Problem created"); | 62 | InputOutput.<String>println("Problem created"); |
62 | long startTime = System.currentTimeMillis(); | 63 | long startTime = System.currentTimeMillis(); |
@@ -70,8 +71,8 @@ public class FileSystemTest { | |||
70 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); | 71 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); |
71 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { | 72 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { |
72 | it.documentationLevel = DocumentationLevel.FULL; | 73 | it.documentationLevel = DocumentationLevel.FULL; |
73 | it.typeScopes.minNewElements = 40; | 74 | it.typeScopes.minNewElements = 10; |
74 | it.typeScopes.maxNewElements = 59; | 75 | it.typeScopes.maxNewElements = 25; |
75 | int _size = typeMapMin.size(); | 76 | int _size = typeMapMin.size(); |
76 | boolean _notEquals = (_size != 0); | 77 | boolean _notEquals = (_size != 0); |
77 | if (_notEquals) { | 78 | if (_notEquals) { |
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 3a322ee0..ceae8ed2 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 | |||
@@ -1,5 +1,6 @@ | |||
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.yakindu.Region; | ||
3 | import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage; | 4 | import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage; |
4 | import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; | 5 | import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; |
5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; | 6 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; |
@@ -55,6 +56,7 @@ public class YakinduTest { | |||
55 | Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration(); | 56 | Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration(); |
56 | final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration); | 57 | final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration); |
57 | LogicProblem problem = modelGenerationProblem.getOutput(); | 58 | LogicProblem problem = modelGenerationProblem.getOutput(); |
59 | problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput(); | ||
58 | workspace.writeModel(problem, "Yakindu.logicproblem"); | 60 | workspace.writeModel(problem, "Yakindu.logicproblem"); |
59 | InputOutput.<String>println("Problem created"); | 61 | InputOutput.<String>println("Problem created"); |
60 | long startTime = System.currentTimeMillis(); | 62 | long startTime = System.currentTimeMillis(); |
@@ -62,14 +64,16 @@ public class YakinduTest { | |||
62 | VampireSolver _vampireSolver = new VampireSolver(); | 64 | VampireSolver _vampireSolver = new VampireSolver(); |
63 | reasoner = _vampireSolver; | 65 | reasoner = _vampireSolver; |
64 | final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>(); | 66 | final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>(); |
67 | classMapMin.put(Region.class, Integer.valueOf(1)); | ||
65 | final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace()); | 68 | final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace()); |
66 | final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>(); | 69 | final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>(); |
70 | classMapMax.put(Region.class, Integer.valueOf(5)); | ||
67 | final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace()); | 71 | final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace()); |
68 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); | 72 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); |
69 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { | 73 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { |
70 | it.documentationLevel = DocumentationLevel.FULL; | 74 | it.documentationLevel = DocumentationLevel.FULL; |
71 | it.typeScopes.minNewElements = 53; | 75 | it.typeScopes.minNewElements = 20; |
72 | it.typeScopes.maxNewElements = 53; | 76 | it.typeScopes.maxNewElements = 30; |
73 | int _size = typeMapMin.size(); | 77 | int _size = typeMapMin.size(); |
74 | boolean _notEquals = (_size != 0); | 78 | boolean _notEquals = (_size != 0); |
75 | if (_notEquals) { | 79 | if (_notEquals) { |