diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-03-07 17:29:18 -0500 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-03-07 17:29:18 -0500 |
commit | 63cb743dacb8cd374777ba87783cbb96416d32e8 (patch) | |
tree | fee66ffc353ee9706c4bc333bb5092751f766051 /Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire | |
parent | Fix Enum handling for Paradox Integration (diff) | |
download | VIATRA-Generator-63cb743dacb8cd374777ba87783cbb96416d32e8.tar.gz VIATRA-Generator-63cb743dacb8cd374777ba87783cbb96416d32e8.tar.zst VIATRA-Generator-63cb743dacb8cd374777ba87783cbb96416d32e8.zip |
Improve TypeScope handling
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire')
10 files changed, 8 insertions, 5 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 c9fd4467..620541af 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 9ded2f72..38c38fcd 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 2c84c402..dbe2934c 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 120f7cbb..86f98ad3 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 8364a369..91e71b1b 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 dd061008..7b4bb578 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 | |||
@@ -6,7 +6,6 @@ import functionalarchitecture.FunctionalarchitecturePackage; | |||
6 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor; | 6 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor; |
7 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor; | 7 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor; |
8 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; | 8 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; |
9 | import java.util.LinkedList; | ||
10 | import java.util.Map; | 9 | import java.util.Map; |
11 | import org.eclipse.emf.common.util.EList; | 10 | import org.eclipse.emf.common.util.EList; |
12 | import org.eclipse.emf.ecore.EObject; | 11 | import org.eclipse.emf.ecore.EObject; |
@@ -31,10 +30,9 @@ public class FAMTest { | |||
31 | map.put("logicproblem", _xMIResourceFactoryImpl); | 30 | map.put("logicproblem", _xMIResourceFactoryImpl); |
32 | InputOutput.<String>println("Input and output workspaces are created"); | 31 | InputOutput.<String>println("Input and output workspaces are created"); |
33 | final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE); | 32 | final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE); |
34 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FunctionalArchitectureModel2.xmi"); | 33 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi"); |
35 | final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance()); | 34 | final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance()); |
36 | InputOutput.<String>println("DSL loaded"); | 35 | InputOutput.<String>println("DSL loaded"); |
37 | LinkedList<EObject> _linkedList = new LinkedList<EObject>(); | 36 | GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace); |
38 | GeneralTest.createAndSolveProblem(metamodel, _linkedList, queries, workspace); | ||
39 | } | 37 | } |
40 | } | 38 | } |
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 5e4df399..c902bd10 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 | |||
@@ -2,6 +2,7 @@ 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 ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory; | ||
5 | import com.google.common.base.Objects; | 6 | import com.google.common.base.Objects; |
6 | import com.google.common.collect.Iterables; | 7 | import com.google.common.collect.Iterables; |
7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; | 8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; |
@@ -39,6 +40,7 @@ import org.eclipse.viatra.query.runtime.api.IQuerySpecification; | |||
39 | import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation; | 40 | import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation; |
40 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; | 41 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; |
41 | import org.eclipse.xtext.xbase.lib.Exceptions; | 42 | import org.eclipse.xtext.xbase.lib.Exceptions; |
43 | import org.eclipse.xtext.xbase.lib.Extension; | ||
42 | import org.eclipse.xtext.xbase.lib.Functions.Function1; | 44 | import org.eclipse.xtext.xbase.lib.Functions.Function1; |
43 | import org.eclipse.xtext.xbase.lib.InputOutput; | 45 | import org.eclipse.xtext.xbase.lib.InputOutput; |
44 | import org.eclipse.xtext.xbase.lib.IterableExtensions; | 46 | import org.eclipse.xtext.xbase.lib.IterableExtensions; |
@@ -52,6 +54,8 @@ public class GeneralTest { | |||
52 | try { | 54 | try { |
53 | String _xblockexpression = null; | 55 | String _xblockexpression = null; |
54 | { | 56 | { |
57 | @Extension | ||
58 | final VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE; | ||
55 | final Ecore2Logic ecore2Logic = new Ecore2Logic(); | 59 | final Ecore2Logic ecore2Logic = new Ecore2Logic(); |
56 | final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic); | 60 | final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic); |
57 | final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic); | 61 | final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic); |
@@ -68,7 +72,8 @@ public class GeneralTest { | |||
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 = 5; | 75 | it.typeScopes.minNewElements = 3; |
76 | it.typeScopes.maxNewElements = 6; | ||
72 | }; | 77 | }; |
73 | final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function); | 78 | final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function); |
74 | solution = reasoner.solve(problem, vampireConfig, workspace); | 79 | solution = reasoner.solve(problem, vampireConfig, workspace); |
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 3669124b..2fac977d 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 a6a6e1b8..1c3ec2f4 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 71eec0ad..d479a2aa 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 | |||