diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-08-29 16:54:53 -0400 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-08-29 16:54:53 -0400 |
commit | 9c1450f069049a5f3e62c6eaa14cf3f5832eeadd (patch) | |
tree | c793d23b3234a7d60ef85bf99df61810354e28aa /Tests | |
parent | VAMPIRE: adapt grammar to Vampire solution + get model from text (diff) | |
download | VIATRA-Generator-9c1450f069049a5f3e62c6eaa14cf3f5832eeadd.tar.gz VIATRA-Generator-9c1450f069049a5f3e62c6eaa14cf3f5832eeadd.tar.zst VIATRA-Generator-9c1450f069049a5f3e62c6eaa14cf3f5832eeadd.zip |
VAMPIRE: setup structure of model interpretation
Diffstat (limited to 'Tests')
11 files changed, 16 insertions, 3 deletions
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem index 4f0bbdb1..dcbb21eb 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem | |||
@@ -560,7 +560,7 @@ | |||
560 | <elements name="Intermediate literal FunctionType" definedInType="//@types.9"/> | 560 | <elements name="Intermediate literal FunctionType" definedInType="//@types.9"/> |
561 | <elements name="Leaf literal FunctionType" definedInType="//@types.9"/> | 561 | <elements name="Leaf literal FunctionType" definedInType="//@types.9"/> |
562 | <elements name="o 1" definedInType="//@types.10"/> | 562 | <elements name="o 1" definedInType="//@types.10"/> |
563 | <containmentHierarchies typesOrderedInHierarchy="//@types.1 //@types.5 //@types.6 //@types.3 //@types.8 //@types.7 //@types.0 //@types.2 //@types.4 //@types.10 //@types.11" containmentRelations="//@relations.0 //@relations.3 //@relations.4 //@relations.8 //@relations.11 //@relations.12"/> | 563 | <containmentHierarchies typesOrderedInHierarchy="//@types.5 //@types.4 //@types.3 //@types.6 //@types.7 //@types.8 //@types.1 //@types.0 //@types.2 //@types.10 //@types.11" containmentRelations="//@relations.0 //@relations.3 //@relations.4 //@relations.8 //@relations.11 //@relations.12"/> |
564 | <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.0" upper="1"/> | 564 | <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.0" upper="1"/> |
565 | <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.1" relation="//@relations.1" lower="1"/> | 565 | <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.1" relation="//@relations.1" lower="1"/> |
566 | <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.2" relation="//@relations.1" upper="1"/> | 566 | <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.2" relation="//@relations.1" upper="1"/> |
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 4625bfbf..0c59b077 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 | |||
@@ -3,25 +3,27 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse | |||
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 functionalarchitecture.Function | 5 | import functionalarchitecture.Function |
6 | import functionalarchitecture.FunctionalArchitectureModel | ||
6 | import functionalarchitecture.FunctionalInterface | 7 | import functionalarchitecture.FunctionalInterface |
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 |
10 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration | 11 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration |
11 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel | 12 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel |
12 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner | ||
13 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult | 13 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult |
14 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult | ||
15 | import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore | ||
14 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic | 16 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic |
15 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic | 17 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic |
16 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace | 18 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace |
17 | import java.util.HashMap | 19 | import java.util.HashMap |
18 | import org.eclipse.emf.ecore.resource.Resource | 20 | import org.eclipse.emf.ecore.resource.Resource |
19 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | 21 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl |
20 | import functionalarchitecture.FunctionalArchitectureModel | ||
21 | 22 | ||
22 | class FAMTest { | 23 | class FAMTest { |
23 | def static void main(String[] args) { | 24 | def static void main(String[] args) { |
24 | val Ecore2Logic ecore2Logic = new Ecore2Logic | 25 | val Ecore2Logic ecore2Logic = new Ecore2Logic |
26 | val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic) | ||
25 | val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic) | 27 | val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic) |
26 | val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic | 28 | val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic |
27 | 29 | ||
@@ -93,6 +95,15 @@ class FAMTest { | |||
93 | ] | 95 | ] |
94 | 96 | ||
95 | var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace) | 97 | var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace) |
98 | |||
99 | //visualisation, see | ||
100 | // var interpretations = reasoner.getInterpretations(solution as ModelResult) | ||
101 | // | ||
102 | // for(interpretation : interpretations) { | ||
103 | // val model = logic2Ecore.transformInterpretation(interpretation,modelGenerationProblem.trace) | ||
104 | // //look here: hu.bme.mit.inf.dslreasoner.application.execution.GenerationTaskExecutor | ||
105 | // } | ||
106 | //transform interpretation to ecore, and it is easy from there | ||
96 | 107 | ||
97 | /*/ | 108 | /*/ |
98 | * | 109 | * |
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 1bf1d5cb..9033512f 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 f921c3b0..292bf88e 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 8da3064a..eb8d5506 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 241e8efd..1023ad44 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 e6e6bbf4..c996fa4f 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 ac49a9aa..aca97399 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 | |||
@@ -16,6 +16,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput; | |||
16 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; | 16 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; |
17 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; | 17 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; |
18 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; | 18 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; |
19 | import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore; | ||
19 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic; | 20 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic; |
20 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic; | 21 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic; |
21 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; | 22 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; |
@@ -36,6 +37,7 @@ public class FAMTest { | |||
36 | public static void main(final String[] args) { | 37 | public static void main(final String[] args) { |
37 | try { | 38 | try { |
38 | final Ecore2Logic ecore2Logic = new Ecore2Logic(); | 39 | final Ecore2Logic ecore2Logic = new Ecore2Logic(); |
40 | final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic); | ||
39 | final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic); | 41 | final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic); |
40 | final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic(); | 42 | final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic(); |
41 | StringConcatenation _builder = new StringConcatenation(); | 43 | StringConcatenation _builder = new StringConcatenation(); |
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 8982a98b..796f7103 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 0d4e05e0..a2cecacf 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 eb5c369d..c1a25e40 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 | |||