diff options
author | 2019-03-07 17:29:18 -0500 | |
---|---|---|
committer | 2020-06-07 19:22:48 -0400 | |
commit | 0380611be40f8f92256455e117f2f3c04b7dd216 (patch) | |
tree | 87feff0aadaa0395299d040bfe83adf77773bd58 /Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner | |
parent | Fix Enum handling for Paradox Integration (diff) | |
download | VIATRA-Generator-0380611be40f8f92256455e117f2f3c04b7dd216.tar.gz VIATRA-Generator-0380611be40f8f92256455e117f2f3c04b7dd216.tar.zst VIATRA-Generator-0380611be40f8f92256455e117f2f3c04b7dd216.zip |
Improve TypeScope handling
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner')
2 files changed, 18 insertions, 8 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 95bfd87a..a9314376 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 | |||
@@ -23,12 +23,12 @@ class FAMTest { | |||
23 | println("Input and output workspaces are created") | 23 | println("Input and output workspaces are created") |
24 | 24 | ||
25 | val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE) | 25 | val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE) |
26 | val partialModel = GeneralTest.loadPartialModel(inputs, "FunctionalArchitectureModel2.xmi") | 26 | val partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi") |
27 | val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance) | 27 | val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance) |
28 | 28 | ||
29 | println("DSL loaded") | 29 | println("DSL loaded") |
30 | 30 | ||
31 | GeneralTest.createAndSolveProblem(metamodel, new LinkedList<EObject>, queries, workspace) | 31 | GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace) |
32 | } | 32 | } |
33 | 33 | ||
34 | 34 | ||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend index 20ad6119..40e305aa 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend | |||
@@ -2,19 +2,23 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse | |||
2 | 2 | ||
3 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver | 3 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver |
4 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration | 4 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration |
5 | import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns | 5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory |
6 | import functionalarchitecture.Function | ||
6 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic | 7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic |
7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration | 8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration |
9 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace | ||
8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor | 10 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor |
11 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel | ||
9 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner | 12 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner |
13 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type | ||
10 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult | 14 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult |
11 | import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore | 15 | import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore |
12 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic | 16 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic |
13 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration | ||
14 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor | 17 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor |
15 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic | 18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic |
16 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace | 19 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace |
17 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace | 20 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace |
21 | import java.util.HashMap | ||
18 | import java.util.List | 22 | import java.util.List |
19 | import org.eclipse.emf.ecore.EAttribute | 23 | import org.eclipse.emf.ecore.EAttribute |
20 | import org.eclipse.emf.ecore.EClass | 24 | import org.eclipse.emf.ecore.EClass |
@@ -26,13 +30,12 @@ import org.eclipse.emf.ecore.EReference | |||
26 | import org.eclipse.emf.ecore.resource.Resource | 30 | import org.eclipse.emf.ecore.resource.Resource |
27 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | 31 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl |
28 | import org.eclipse.viatra.query.runtime.api.IQueryGroup | 32 | import org.eclipse.viatra.query.runtime.api.IQueryGroup |
29 | import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolver | 33 | import org.eclipse.emf.ecore.EClassifier |
30 | import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolverConfiguration | ||
31 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel | ||
32 | 34 | ||
33 | class GeneralTest { | 35 | class GeneralTest { |
34 | def static String createAndSolveProblem(EcoreMetamodelDescriptor metamodel, List<EObject> partialModel, | 36 | def static String createAndSolveProblem(EcoreMetamodelDescriptor metamodel, List<EObject> partialModel, |
35 | ViatraQuerySetDescriptor queries, FileSystemWorkspace workspace) { | 37 | ViatraQuerySetDescriptor queries, FileSystemWorkspace workspace) { |
38 | val extension VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE | ||
36 | val Ecore2Logic ecore2Logic = new Ecore2Logic | 39 | val Ecore2Logic ecore2Logic = new Ecore2Logic |
37 | val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic) | 40 | val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic) |
38 | val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic) | 41 | val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic) |
@@ -52,10 +55,17 @@ class GeneralTest { | |||
52 | 55 | ||
53 | //* | 56 | //* |
54 | reasoner = new VampireSolver | 57 | reasoner = new VampireSolver |
58 | // val typeMap = new HashMap<Type, Integer> | ||
59 | // val n = Function.simpleName | ||
60 | // val classif = factory.vampireLanguagePackage.getEClassifier(n) as EClass | ||
61 | // val x = ecore2Logic.TypeofEClass(modelGenerationProblem.trace, classif) | ||
62 | // typeMap.put(x, 3) | ||
55 | val vampireConfig = new VampireSolverConfiguration => [ | 63 | val vampireConfig = new VampireSolverConfiguration => [ |
56 | // add configuration things, in config file first | 64 | // add configuration things, in config file first |
57 | it.documentationLevel = DocumentationLevel::FULL | 65 | it.documentationLevel = DocumentationLevel::FULL |
58 | it.typeScopes.minNewElements = 5 | 66 | it.typeScopes.minNewElements = 3 |
67 | it.typeScopes.maxNewElements = 6 | ||
68 | // it.typeScopes.minNewElementsByType = typeMap | ||
59 | ] | 69 | ] |
60 | solution = reasoner.solve(problem, vampireConfig, workspace) | 70 | solution = reasoner.solve(problem, vampireConfig, workspace) |
61 | 71 | ||