diff options
author | 2019-04-15 00:06:29 -0400 | |
---|---|---|
committer | 2020-06-07 19:36:48 -0400 | |
commit | 85e6d0b8590f5aa22cd7065cb850b0f460da25dd (patch) | |
tree | fcc945827435f113aa9099d0be63d68551f7f5a3 /Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse | |
parent | VAMPIRE: #39 Reorganise tests, working yakindu test, need debugging (diff) | |
download | VIATRA-Generator-85e6d0b8590f5aa22cd7065cb850b0f460da25dd.tar.gz VIATRA-Generator-85e6d0b8590f5aa22cd7065cb850b0f460da25dd.tar.zst VIATRA-Generator-85e6d0b8590f5aa22cd7065cb850b0f460da25dd.zip |
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse')
9 files changed, 18 insertions, 65 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 55d90ac7..2cecdaac 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 8eeb2d28..a34ab846 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 ab6aaf6e..a18fd1a5 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 cd75a66c..0969c84c 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 1b920064..f0af3ba5 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/EcoreTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java index 820dd354..7019f162 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java | |||
@@ -1,9 +1,9 @@ | |||
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.filesystem.filesystemPackage; | ||
4 | import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; | ||
3 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; | 5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; |
4 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; | 6 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; |
5 | import com.google.common.collect.Iterables; | ||
6 | import functionalarchitecture.FunctionalarchitecturePackage; | ||
7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; | 7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; |
8 | 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; | 9 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace; |
@@ -17,27 +17,11 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore; | |||
17 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic; | 17 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic; |
18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic; | 18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic; |
19 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; | 19 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; |
20 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace; | ||
21 | import java.util.Collections; | ||
22 | import java.util.List; | ||
23 | import java.util.Map; | ||
24 | import org.eclipse.emf.common.util.EList; | 20 | import org.eclipse.emf.common.util.EList; |
25 | import org.eclipse.emf.ecore.EAttribute; | ||
26 | import org.eclipse.emf.ecore.EClass; | ||
27 | import org.eclipse.emf.ecore.EEnum; | ||
28 | import org.eclipse.emf.ecore.EEnumLiteral; | ||
29 | import org.eclipse.emf.ecore.EObject; | 21 | import org.eclipse.emf.ecore.EObject; |
30 | import org.eclipse.emf.ecore.EReference; | ||
31 | import org.eclipse.emf.ecore.resource.Resource; | ||
32 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; | ||
33 | import org.eclipse.xtend2.lib.StringConcatenation; | 22 | import org.eclipse.xtend2.lib.StringConcatenation; |
34 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; | ||
35 | import org.eclipse.xtext.xbase.lib.Exceptions; | 23 | import org.eclipse.xtext.xbase.lib.Exceptions; |
36 | import org.eclipse.xtext.xbase.lib.Functions.Function1; | ||
37 | import org.eclipse.xtext.xbase.lib.InputOutput; | 24 | import org.eclipse.xtext.xbase.lib.InputOutput; |
38 | import org.eclipse.xtext.xbase.lib.IterableExtensions; | ||
39 | import org.eclipse.xtext.xbase.lib.IteratorExtensions; | ||
40 | import org.eclipse.xtext.xbase.lib.ListExtensions; | ||
41 | import org.eclipse.xtext.xbase.lib.ObjectExtensions; | 25 | import org.eclipse.xtext.xbase.lib.ObjectExtensions; |
42 | import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; | 26 | import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; |
43 | 27 | ||
@@ -49,12 +33,13 @@ public class EcoreTest { | |||
49 | _builder.append("initialModels/"); | 33 | _builder.append("initialModels/"); |
50 | final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), ""); | 34 | final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), ""); |
51 | StringConcatenation _builder_1 = new StringConcatenation(); | 35 | StringConcatenation _builder_1 = new StringConcatenation(); |
52 | _builder_1.append("output/FAMTest/"); | 36 | _builder_1.append("output/FEcoreTest/"); |
53 | final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), ""); | 37 | final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), ""); |
54 | workspace.initAndClear(); | 38 | workspace.initAndClear(); |
55 | InputOutput.<String>println("Input and output workspaces are created"); | 39 | InputOutput.<String>println("Input and output workspaces are created"); |
56 | final EcoreMetamodelDescriptor metamodel = EcoreTest.loadMetamodel(); | 40 | final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE); |
57 | final List<EObject> partialModel = EcoreTest.loadPartialModel(inputs); | 41 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi"); |
42 | final Object queries = null; | ||
58 | InputOutput.<String>println("DSL loaded"); | 43 | InputOutput.<String>println("DSL loaded"); |
59 | final Ecore2Logic ecore2Logic = new Ecore2Logic(); | 44 | final Ecore2Logic ecore2Logic = new Ecore2Logic(); |
60 | final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic); | 45 | final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic); |
@@ -80,38 +65,4 @@ public class EcoreTest { | |||
80 | throw Exceptions.sneakyThrow(_e); | 65 | throw Exceptions.sneakyThrow(_e); |
81 | } | 66 | } |
82 | } | 67 | } |
83 | |||
84 | private static EcoreMetamodelDescriptor loadMetamodel() { | ||
85 | final FunctionalarchitecturePackage pckg = FunctionalarchitecturePackage.eINSTANCE; | ||
86 | final List<EClass> classes = IterableExtensions.<EClass>toList(Iterables.<EClass>filter(pckg.getEClassifiers(), EClass.class)); | ||
87 | final List<EEnum> enums = IterableExtensions.<EEnum>toList(Iterables.<EEnum>filter(pckg.getEClassifiers(), EEnum.class)); | ||
88 | final Function1<EEnum, EList<EEnumLiteral>> _function = (EEnum it) -> { | ||
89 | return it.getELiterals(); | ||
90 | }; | ||
91 | final List<EEnumLiteral> literals = IterableExtensions.<EEnumLiteral>toList(Iterables.<EEnumLiteral>concat(ListExtensions.<EEnum, EList<EEnumLiteral>>map(enums, _function))); | ||
92 | final Function1<EClass, EList<EReference>> _function_1 = (EClass it) -> { | ||
93 | return it.getEReferences(); | ||
94 | }; | ||
95 | final List<EReference> references = IterableExtensions.<EReference>toList(Iterables.<EReference>concat(ListExtensions.<EClass, EList<EReference>>map(classes, _function_1))); | ||
96 | final Function1<EClass, EList<EAttribute>> _function_2 = (EClass it) -> { | ||
97 | return it.getEAttributes(); | ||
98 | }; | ||
99 | final List<EAttribute> attributes = IterableExtensions.<EAttribute>toList(Iterables.<EAttribute>concat(ListExtensions.<EClass, EList<EAttribute>>map(classes, _function_2))); | ||
100 | return new EcoreMetamodelDescriptor(classes, Collections.<EClass>unmodifiableSet(CollectionLiterals.<EClass>newHashSet()), false, enums, literals, references, attributes); | ||
101 | } | ||
102 | |||
103 | private static List<EObject> loadPartialModel(final ReasonerWorkspace inputs) { | ||
104 | List<EObject> _xblockexpression = null; | ||
105 | { | ||
106 | Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap(); | ||
107 | XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl(); | ||
108 | _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl); | ||
109 | _xblockexpression = IteratorExtensions.<EObject>toList(inputs.<EObject>readModel(EObject.class, "FamInstance.xmi").eResource().getAllContents()); | ||
110 | } | ||
111 | return _xblockexpression; | ||
112 | } | ||
113 | |||
114 | private static Object loadQueries(final EcoreMetamodelDescriptor metamodel) { | ||
115 | return null; | ||
116 | } | ||
117 | } | 68 | } |
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 5fc2a391..08f1b4a7 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 | |||
@@ -1,7 +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.vampire.icse.GeneralTest; | 3 | import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; |
4 | import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns; | ||
5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; | 4 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; |
6 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; | 5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; |
7 | import functionalarchitecture.Function; | 6 | import functionalarchitecture.Function; |
@@ -18,7 +17,6 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; | |||
18 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; | 17 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; |
19 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; | 18 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; |
20 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic; | 19 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic; |
21 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor; | ||
22 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic; | 20 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic; |
23 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; | 21 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; |
24 | import java.util.HashMap; | 22 | import java.util.HashMap; |
@@ -53,12 +51,13 @@ public class FAMTest { | |||
53 | map.put("logicproblem", _xMIResourceFactoryImpl); | 51 | map.put("logicproblem", _xMIResourceFactoryImpl); |
54 | InputOutput.<String>println("Input and output workspaces are created"); | 52 | InputOutput.<String>println("Input and output workspaces are created"); |
55 | final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE); | 53 | final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE); |
56 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi"); | 54 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi"); |
57 | final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance()); | 55 | final Object queries = null; |
58 | InputOutput.<String>println("DSL loaded"); | 56 | InputOutput.<String>println("DSL loaded"); |
59 | Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration(); | 57 | Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration(); |
60 | final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration); | 58 | final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration); |
61 | LogicProblem problem = modelGenerationProblem.getOutput(); | 59 | LogicProblem problem = modelGenerationProblem.getOutput(); |
60 | problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput(); | ||
62 | workspace.writeModel(problem, "Fam.logicproblem"); | 61 | workspace.writeModel(problem, "Fam.logicproblem"); |
63 | InputOutput.<String>println("Problem created"); | 62 | InputOutput.<String>println("Problem created"); |
64 | long startTime = System.currentTimeMillis(); | 63 | long startTime = System.currentTimeMillis(); |
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 eedec995..f7f8a5ee 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 | |||
@@ -2,6 +2,7 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse; | |||
2 | 2 | ||
3 | import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage; | 3 | import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage; |
4 | import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; | 4 | import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; |
5 | import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns; | ||
5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; | 6 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver; |
6 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; | 7 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration; |
7 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; | 8 | import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; |
@@ -15,6 +16,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; | |||
15 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; | 16 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; |
16 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; | 17 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; |
17 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic; | 18 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic; |
19 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor; | ||
18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic; | 20 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic; |
19 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; | 21 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; |
20 | import java.util.HashMap; | 22 | import java.util.HashMap; |
@@ -40,7 +42,7 @@ public class FileSystemTest { | |||
40 | _builder.append("initialModels/"); | 42 | _builder.append("initialModels/"); |
41 | final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), ""); | 43 | final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), ""); |
42 | StringConcatenation _builder_1 = new StringConcatenation(); | 44 | StringConcatenation _builder_1 = new StringConcatenation(); |
43 | _builder_1.append("output/FAMTest/"); | 45 | _builder_1.append("output/FileSystemTest/"); |
44 | final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), ""); | 46 | final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), ""); |
45 | workspace.initAndClear(); | 47 | workspace.initAndClear(); |
46 | final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; | 48 | final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; |
@@ -50,11 +52,12 @@ public class FileSystemTest { | |||
50 | InputOutput.<String>println("Input and output workspaces are created"); | 52 | InputOutput.<String>println("Input and output workspaces are created"); |
51 | final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE); | 53 | final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE); |
52 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi"); | 54 | final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi"); |
55 | final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance()); | ||
53 | InputOutput.<String>println("DSL loaded"); | 56 | InputOutput.<String>println("DSL loaded"); |
54 | Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration(); | 57 | Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration(); |
55 | final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration); | 58 | final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration); |
56 | LogicProblem problem = modelGenerationProblem.getOutput(); | 59 | LogicProblem problem = modelGenerationProblem.getOutput(); |
57 | workspace.writeModel(problem, "Fam.logicproblem"); | 60 | workspace.writeModel(problem, "FileSystem.logicproblem"); |
58 | InputOutput.<String>println("Problem created"); | 61 | InputOutput.<String>println("Problem created"); |
59 | long startTime = System.currentTimeMillis(); | 62 | long startTime = System.currentTimeMillis(); |
60 | LogicReasoner reasoner = null; | 63 | LogicReasoner reasoner = null; |
@@ -67,8 +70,8 @@ public class FileSystemTest { | |||
67 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); | 70 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); |
68 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { | 71 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { |
69 | it.documentationLevel = DocumentationLevel.FULL; | 72 | it.documentationLevel = DocumentationLevel.FULL; |
70 | it.typeScopes.minNewElements = 4; | 73 | it.typeScopes.minNewElements = 40; |
71 | it.typeScopes.maxNewElements = 5; | 74 | it.typeScopes.maxNewElements = 59; |
72 | int _size = typeMapMin.size(); | 75 | int _size = typeMapMin.size(); |
73 | boolean _notEquals = (_size != 0); | 76 | boolean _notEquals = (_size != 0); |
74 | if (_notEquals) { | 77 | 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 81079764..3a322ee0 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 | |||
@@ -68,8 +68,8 @@ public class YakinduTest { | |||
68 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); | 68 | VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration(); |
69 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { | 69 | final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> { |
70 | it.documentationLevel = DocumentationLevel.FULL; | 70 | it.documentationLevel = DocumentationLevel.FULL; |
71 | it.typeScopes.minNewElements = 20; | 71 | it.typeScopes.minNewElements = 53; |
72 | it.typeScopes.maxNewElements = 30; | 72 | it.typeScopes.maxNewElements = 53; |
73 | int _size = typeMapMin.size(); | 73 | int _size = typeMapMin.size(); |
74 | boolean _notEquals = (_size != 0); | 74 | boolean _notEquals = (_size != 0); |
75 | if (_notEquals) { | 75 | if (_notEquals) { |