diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-03-13 19:08:37 -0400 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-03-13 19:08:37 -0400 |
commit | 04b59e1e638c19149eb27bcaec31c6fd9a9bbb84 (patch) | |
tree | cd7d7b6218b292d14db5a6556e703574499ba86b /Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill | |
parent | Improve TypeScope handling (diff) | |
download | VIATRA-Generator-04b59e1e638c19149eb27bcaec31c6fd9a9bbb84.tar.gz VIATRA-Generator-04b59e1e638c19149eb27bcaec31c6fd9a9bbb84.tar.zst VIATRA-Generator-04b59e1e638c19149eb27bcaec31c6fd9a9bbb84.zip |
Implement type scope for specific types
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill')
9 files changed, 41 insertions, 4 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 620541af..57fe8c2d 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 38c38fcd..41284af1 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 dbe2934c..36f2c6e1 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 86f98ad3..ff2a8e18 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 91e71b1b..270ac043 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/GeneralTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java index c902bd10..7d3be50d 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java | |||
@@ -5,6 +5,8 @@ import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; | |||
5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory; | 5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory; |
6 | import com.google.common.base.Objects; | 6 | import com.google.common.base.Objects; |
7 | import com.google.common.collect.Iterables; | 7 | import com.google.common.collect.Iterables; |
8 | import functionalarchitecture.Function; | ||
9 | import functionalarchitecture.FunctionalOutput; | ||
8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; | 10 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; |
9 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration; | 11 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration; |
10 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace; | 12 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace; |
@@ -12,6 +14,7 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor; | |||
12 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel; | 14 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel; |
13 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner; | 15 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner; |
14 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput; | 16 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput; |
17 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; | ||
15 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; | 18 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; |
16 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; | 19 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; |
17 | import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore; | 20 | import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore; |
@@ -21,6 +24,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.Insta | |||
21 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; | 24 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; |
22 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace; | 25 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace; |
23 | import java.util.Collections; | 26 | import java.util.Collections; |
27 | import java.util.HashMap; | ||
24 | import java.util.List; | 28 | import java.util.List; |
25 | import java.util.Map; | 29 | import java.util.Map; |
26 | import java.util.Set; | 30 | import java.util.Set; |
@@ -69,13 +73,46 @@ public class GeneralTest { | |||
69 | LogicReasoner reasoner = null; | 73 | LogicReasoner reasoner = null; |
70 | VampireSolver _vampireSolver = new VampireSolver(); | 74 | VampireSolver _vampireSolver = new VampireSolver(); |
71 | reasoner = _vampireSolver; | 75 | reasoner = _vampireSolver; |
76 | final HashMap<Type, Integer> typeMapMin = new HashMap<Type, Integer>(); | ||
77 | final HashMap<Type, Integer> typeMapMax = new HashMap<Type, Integer>(); | ||
78 | final Function1<EClass, String> _function = (EClass s) -> { | ||
79 | return s.getName(); | ||
80 | }; | ||
81 | final Map<String, EClass> list2MapMin = IterableExtensions.<String, EClass>toMap(metamodel.getClasses(), _function); | ||
82 | final Function1<EClass, String> _function_1 = (EClass s) -> { | ||
83 | return s.getName(); | ||
84 | }; | ||
85 | final Map<String, EClass> list2MapMax = IterableExtensions.<String, EClass>toMap(metamodel.getClasses(), _function_1); | ||
86 | typeMapMin.put( | ||
87 | ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(), | ||
88 | list2MapMin.get(Function.class.getSimpleName())), Integer.valueOf(3)); | ||
89 | typeMapMin.put( | ||
90 | ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(), | ||
91 | list2MapMin.get(functionalarchitecture.FunctionalInterface.class.getSimpleName())), Integer.valueOf(2)); | ||
92 | typeMapMin.put( | ||
93 | ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(), | ||
94 | list2MapMin.get(FunctionalOutput.class.getSimpleName())), Integer.valueOf(1)); | ||
95 | typeMapMax.put( | ||
96 | ecore2Logic.TypeofEClass( | ||
97 | modelGenerationProblem.getTrace(), | ||
98 | list2MapMax.get(Function.class.getSimpleName())), Integer.valueOf(5)); | ||
99 | typeMapMax.put( | ||
100 | ecore2Logic.TypeofEClass( | ||
101 | modelGenerationProblem.getTrace(), | ||
102 | list2MapMax.get(functionalarchitecture.FunctionalInterface.class.getSimpleName())), Integer.valueOf(2)); | ||
103 | typeMapMax.put( | ||
104 | ecore2Logic.TypeofEClass( | ||
105 | modelGenerationProblem.getTrace(), | ||
106 | list2MapMax.get(FunctionalOutput.class.getSimpleName())), Integer.valueOf(4)); | ||
72 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); | 107 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); |
73 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { | 108 | final Procedure1<VampireSolverConfiguration> _function_2 = (VampireSolverConfiguration it) -> { |
74 | it.documentationLevel = DocumentationLevel.FULL; | 109 | it.documentationLevel = DocumentationLevel.FULL; |
75 | it.typeScopes.minNewElements = 3; | 110 | it.typeScopes.minNewElements = 6; |
76 | it.typeScopes.maxNewElements = 6; | 111 | it.typeScopes.maxNewElements = 8; |
112 | it.typeScopes.minNewElementsByType = typeMapMin; | ||
113 | it.typeScopes.maxNewElementsByType = typeMapMax; | ||
77 | }; | 114 | }; |
78 | final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function); | 115 | final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function_2); |
79 | solution = reasoner.solve(problem, vampireConfig, workspace); | 116 | solution = reasoner.solve(problem, vampireConfig, workspace); |
80 | _xblockexpression = InputOutput.<String>println("Problem solved"); | 117 | _xblockexpression = InputOutput.<String>println("Problem solved"); |
81 | } | 118 | } |
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 2fac977d..693ee01d 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 1c3ec2f4..7e61c0ef 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 d479a2aa..8a554a42 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 | |||