aboutsummaryrefslogtreecommitdiffstats
path: root/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire
diff options
context:
space:
mode:
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire')
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbinbin6358 -> 6358 bytes
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbinbin4068 -> 6825 bytes
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbinbin4115 -> 6088 bytes
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbinbin8623 -> 6456 bytes
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbinbin4054 -> 6042 bytes
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java107
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java102
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java107
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java99
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbinbin4997 -> 4997 bytes
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbinbin687 -> 687 bytes
-rw-r--r--Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbinbin6500 -> 6500 bytes
12 files changed, 266 insertions, 149 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 7f92eba4..55d90ac7 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 67bf34bd..8eeb2d28 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 093855d8..ab6aaf6e 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 2df2ba62..cd75a66c 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 0c97e8d1..1b920064 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 7b4bb578..5fc2a391 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
@@ -2,37 +2,110 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse;
2 2
3import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; 3import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;
4import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns; 4import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns;
5import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;
6import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;
7import functionalarchitecture.Function;
8import functionalarchitecture.FunctionalOutput;
5import functionalarchitecture.FunctionalarchitecturePackage; 9import functionalarchitecture.FunctionalarchitecturePackage;
10import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
11import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
12import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
6import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor; 13import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
14import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;
15import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;
16import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
17import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
18import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
19import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;
20import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;
7import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor; 21import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;
22import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;
8import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; 23import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
24import java.util.HashMap;
9import java.util.Map; 25import java.util.Map;
10import org.eclipse.emf.common.util.EList; 26import org.eclipse.emf.common.util.EList;
11import org.eclipse.emf.ecore.EObject; 27import org.eclipse.emf.ecore.EObject;
12import org.eclipse.emf.ecore.resource.Resource; 28import org.eclipse.emf.ecore.resource.Resource;
13import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; 29import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
14import org.eclipse.xtend2.lib.StringConcatenation; 30import org.eclipse.xtend2.lib.StringConcatenation;
31import org.eclipse.xtext.xbase.lib.Exceptions;
15import org.eclipse.xtext.xbase.lib.InputOutput; 32import org.eclipse.xtext.xbase.lib.InputOutput;
33import org.eclipse.xtext.xbase.lib.ObjectExtensions;
34import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
16 35
17@SuppressWarnings("all") 36@SuppressWarnings("all")
18public class FAMTest { 37public class FAMTest {
19 public static void main(final String[] args) { 38 public static void main(final String[] args) {
20 StringConcatenation _builder = new StringConcatenation(); 39 try {
21 _builder.append("initialModels/"); 40 final Ecore2Logic ecore2Logic = new Ecore2Logic();
22 final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), ""); 41 final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);
23 StringConcatenation _builder_1 = new StringConcatenation(); 42 final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();
24 _builder_1.append("output/FAMTest/"); 43 StringConcatenation _builder = new StringConcatenation();
25 final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), ""); 44 _builder.append("initialModels/");
26 workspace.initAndClear(); 45 final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");
27 final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; 46 StringConcatenation _builder_1 = new StringConcatenation();
28 final Map<String, Object> map = reg.getExtensionToFactoryMap(); 47 _builder_1.append("output/FAMTest/");
29 XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl(); 48 final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");
30 map.put("logicproblem", _xMIResourceFactoryImpl); 49 workspace.initAndClear();
31 InputOutput.<String>println("Input and output workspaces are created"); 50 final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
32 final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE); 51 final Map<String, Object> map = reg.getExtensionToFactoryMap();
33 final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi"); 52 XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
34 final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance()); 53 map.put("logicproblem", _xMIResourceFactoryImpl);
35 InputOutput.<String>println("DSL loaded"); 54 InputOutput.<String>println("Input and output workspaces are created");
36 GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace); 55 final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE);
56 final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi");
57 final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance());
58 InputOutput.<String>println("DSL loaded");
59 Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();
60 final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);
61 LogicProblem problem = modelGenerationProblem.getOutput();
62 workspace.writeModel(problem, "Fam.logicproblem");
63 InputOutput.<String>println("Problem created");
64 long startTime = System.currentTimeMillis();
65 LogicReasoner reasoner = null;
66 VampireSolver _vampireSolver = new VampireSolver();
67 reasoner = _vampireSolver;
68 final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();
69 classMapMin.put(Function.class, Integer.valueOf(1));
70 classMapMin.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2));
71 classMapMin.put(FunctionalOutput.class, Integer.valueOf(3));
72 final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());
73 final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();
74 classMapMax.put(Function.class, Integer.valueOf(5));
75 classMapMax.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2));
76 classMapMax.put(FunctionalOutput.class, Integer.valueOf(4));
77 final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());
78 VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();
79 final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {
80 it.documentationLevel = DocumentationLevel.FULL;
81 it.typeScopes.minNewElements = 4;
82 it.typeScopes.maxNewElements = 5;
83 int _size = typeMapMin.size();
84 boolean _notEquals = (_size != 0);
85 if (_notEquals) {
86 it.typeScopes.minNewElementsByType = typeMapMin;
87 }
88 int _size_1 = typeMapMin.size();
89 boolean _notEquals_1 = (_size_1 != 0);
90 if (_notEquals_1) {
91 it.typeScopes.maxNewElementsByType = typeMapMax;
92 }
93 it.contCycleLevel = 5;
94 it.uniquenessDuplicates = false;
95 };
96 final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);
97 LogicResult solution = reasoner.solve(problem, vampireConfig, workspace);
98 long _currentTimeMillis = System.currentTimeMillis();
99 long _minus = (_currentTimeMillis - startTime);
100 long totalTimeMin = (_minus / 60000);
101 long _currentTimeMillis_1 = System.currentTimeMillis();
102 long _minus_1 = (_currentTimeMillis_1 - startTime);
103 long _divide = (_minus_1 / 1000);
104 long totalTimeSec = (_divide % 60);
105 InputOutput.<String>println("Problem solved");
106 InputOutput.<String>println(((("Time was: " + Long.valueOf(totalTimeMin)) + ":") + Long.valueOf(totalTimeSec)));
107 } catch (Throwable _e) {
108 throw Exceptions.sneakyThrow(_e);
109 }
37 } 110 }
38} 111}
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 5994b4b4..eedec995 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
@@ -1,38 +1,100 @@
1package ca.mcgill.ecse.dslreasoner.vampire.icse; 1package ca.mcgill.ecse.dslreasoner.vampire.icse;
2 2
3import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;
3import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; 4import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;
4import functionalarchitecture.FunctionalarchitecturePackage; 5import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;
5import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns; 6import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;
7import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
8import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
9import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
6import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor; 10import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
7import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor; 11import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;
12import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;
13import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
14import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
15import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
16import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;
17import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;
18import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;
8import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; 19import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
20import java.util.HashMap;
9import java.util.Map; 21import java.util.Map;
10import org.eclipse.emf.common.util.EList; 22import org.eclipse.emf.common.util.EList;
11import org.eclipse.emf.ecore.EObject; 23import org.eclipse.emf.ecore.EObject;
12import org.eclipse.emf.ecore.resource.Resource; 24import org.eclipse.emf.ecore.resource.Resource;
13import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; 25import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
14import org.eclipse.xtend2.lib.StringConcatenation; 26import org.eclipse.xtend2.lib.StringConcatenation;
27import org.eclipse.xtext.xbase.lib.Exceptions;
15import org.eclipse.xtext.xbase.lib.InputOutput; 28import org.eclipse.xtext.xbase.lib.InputOutput;
29import org.eclipse.xtext.xbase.lib.ObjectExtensions;
30import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
16 31
17@SuppressWarnings("all") 32@SuppressWarnings("all")
18public class FileSystemTest { 33public class FileSystemTest {
19 public static void main(final String[] args) { 34 public static void main(final String[] args) {
20 StringConcatenation _builder = new StringConcatenation(); 35 try {
21 _builder.append("initialModels/"); 36 final Ecore2Logic ecore2Logic = new Ecore2Logic();
22 final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), ""); 37 final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);
23 StringConcatenation _builder_1 = new StringConcatenation(); 38 final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();
24 _builder_1.append("output/FAMTest/"); 39 StringConcatenation _builder = new StringConcatenation();
25 final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), ""); 40 _builder.append("initialModels/");
26 workspace.initAndClear(); 41 final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");
27 final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; 42 StringConcatenation _builder_1 = new StringConcatenation();
28 final Map<String, Object> map = reg.getExtensionToFactoryMap(); 43 _builder_1.append("output/FAMTest/");
29 XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl(); 44 final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");
30 map.put("logicproblem", _xMIResourceFactoryImpl); 45 workspace.initAndClear();
31 InputOutput.<String>println("Input and output workspaces are created"); 46 final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
32 final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE); 47 final Map<String, Object> map = reg.getExtensionToFactoryMap();
33 final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FunctionalArchitectureModel.xmi"); 48 XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
34 final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance()); 49 map.put("logicproblem", _xMIResourceFactoryImpl);
35 InputOutput.<String>println("DSL loaded"); 50 InputOutput.<String>println("Input and output workspaces are created");
36 GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace); 51 final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);
52 final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");
53 InputOutput.<String>println("DSL loaded");
54 Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();
55 final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);
56 LogicProblem problem = modelGenerationProblem.getOutput();
57 workspace.writeModel(problem, "Fam.logicproblem");
58 InputOutput.<String>println("Problem created");
59 long startTime = System.currentTimeMillis();
60 LogicReasoner reasoner = null;
61 VampireSolver _vampireSolver = new VampireSolver();
62 reasoner = _vampireSolver;
63 final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();
64 final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());
65 final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();
66 final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());
67 VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();
68 final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {
69 it.documentationLevel = DocumentationLevel.FULL;
70 it.typeScopes.minNewElements = 4;
71 it.typeScopes.maxNewElements = 5;
72 int _size = typeMapMin.size();
73 boolean _notEquals = (_size != 0);
74 if (_notEquals) {
75 it.typeScopes.minNewElementsByType = typeMapMin;
76 }
77 int _size_1 = typeMapMin.size();
78 boolean _notEquals_1 = (_size_1 != 0);
79 if (_notEquals_1) {
80 it.typeScopes.maxNewElementsByType = typeMapMax;
81 }
82 it.contCycleLevel = 5;
83 it.uniquenessDuplicates = false;
84 };
85 final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);
86 LogicResult solution = reasoner.solve(problem, vampireConfig, workspace);
87 long _currentTimeMillis = System.currentTimeMillis();
88 long _minus = (_currentTimeMillis - startTime);
89 long totalTimeMin = (_minus / 60000);
90 long _currentTimeMillis_1 = System.currentTimeMillis();
91 long _minus_1 = (_currentTimeMillis_1 - startTime);
92 long _divide = (_minus_1 / 1000);
93 long totalTimeSec = (_divide % 60);
94 InputOutput.<String>println("Problem solved");
95 InputOutput.<String>println(((("Time was: " + Long.valueOf(totalTimeMin)) + ":") + Long.valueOf(totalTimeSec)));
96 } catch (Throwable _e) {
97 throw Exceptions.sneakyThrow(_e);
98 }
37 } 99 }
38} 100}
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 0150ef1d..0bb8f76e 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
@@ -1,27 +1,12 @@
1package ca.mcgill.ecse.dslreasoner.vampire.icse; 1package ca.mcgill.ecse.dslreasoner.vampire.icse;
2 2
3import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;
4import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;
5import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;
6import com.google.common.base.Objects; 3import com.google.common.base.Objects;
7import com.google.common.collect.Iterables; 4import com.google.common.collect.Iterables;
8import functionalarchitecture.Function;
9import functionalarchitecture.FunctionalOutput;
10import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic; 5import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
11import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
12import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace; 6import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
13import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor; 7import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
14import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;
15import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;
16import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
17import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; 8import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
18import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
19import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;
20import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore;
21import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;
22import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor; 9import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;
23import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;
24import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
25import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace; 10import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace;
26import java.util.Collections; 11import java.util.Collections;
27import java.util.HashMap; 12import java.util.HashMap;
@@ -43,94 +28,24 @@ import org.eclipse.viatra.query.runtime.api.IQueryGroup;
43import org.eclipse.viatra.query.runtime.api.IQuerySpecification; 28import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
44import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation; 29import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
45import org.eclipse.xtext.xbase.lib.CollectionLiterals; 30import org.eclipse.xtext.xbase.lib.CollectionLiterals;
46import org.eclipse.xtext.xbase.lib.Exceptions;
47import org.eclipse.xtext.xbase.lib.Extension;
48import org.eclipse.xtext.xbase.lib.Functions.Function1; 31import org.eclipse.xtext.xbase.lib.Functions.Function1;
49import org.eclipse.xtext.xbase.lib.InputOutput;
50import org.eclipse.xtext.xbase.lib.IterableExtensions; 32import org.eclipse.xtext.xbase.lib.IterableExtensions;
51import org.eclipse.xtext.xbase.lib.ListExtensions; 33import org.eclipse.xtext.xbase.lib.ListExtensions;
52import org.eclipse.xtext.xbase.lib.ObjectExtensions;
53import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
54 34
55@SuppressWarnings("all") 35@SuppressWarnings("all")
56public class GeneralTest { 36public class GeneralTest {
57 public static String createAndSolveProblem(final EcoreMetamodelDescriptor metamodel, final List<EObject> partialModel, final ViatraQuerySetDescriptor queries, final FileSystemWorkspace workspace) { 37 public static Map<Type, Integer> getTypeMap(final Map<Class, Integer> classMap, final EcoreMetamodelDescriptor metamodel, final Ecore2Logic e2l, final Ecore2Logic_Trace trace) {
58 try { 38 final HashMap<Type, Integer> typeMap = new HashMap<Type, Integer>();
59 String _xblockexpression = null; 39 final Function1<EClass, String> _function = (EClass s) -> {
60 { 40 return s.getName();
61 @Extension 41 };
62 final VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE; 42 final Map<String, EClass> listMap = IterableExtensions.<String, EClass>toMap(metamodel.getClasses(), _function);
63 final Ecore2Logic ecore2Logic = new Ecore2Logic(); 43 Set<Class> _keySet = classMap.keySet();
64 final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic); 44 for (final Class elem : _keySet) {
65 final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic); 45 typeMap.put(
66 final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic(); 46 e2l.TypeofEClass(trace, listMap.get(elem.getSimpleName())), classMap.get(elem));
67 Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();
68 final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);
69 LogicProblem problem = modelGenerationProblem.getOutput();
70 workspace.writeModel(problem, "Fam.logicproblem");
71 InputOutput.<String>println("Problem created");
72 long startTime = System.currentTimeMillis();
73 LogicResult solution = null;
74 LogicReasoner reasoner = null;
75 VampireSolver _vampireSolver = new VampireSolver();
76 reasoner = _vampireSolver;
77 final HashMap<Type, Integer> typeMapMin = new HashMap<Type, Integer>();
78 final HashMap<Type, Integer> typeMapMax = new HashMap<Type, Integer>();
79 final Function1<EClass, String> _function = (EClass s) -> {
80 return s.getName();
81 };
82 final Map<String, EClass> list2MapMin = IterableExtensions.<String, EClass>toMap(metamodel.getClasses(), _function);
83 final Function1<EClass, String> _function_1 = (EClass s) -> {
84 return s.getName();
85 };
86 final Map<String, EClass> list2MapMax = IterableExtensions.<String, EClass>toMap(metamodel.getClasses(), _function_1);
87 typeMapMin.put(
88 ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(),
89 list2MapMin.get(Function.class.getSimpleName())), Integer.valueOf(1));
90 typeMapMin.put(
91 ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(),
92 list2MapMin.get(functionalarchitecture.FunctionalInterface.class.getSimpleName())), Integer.valueOf(2));
93 typeMapMin.put(
94 ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(),
95 list2MapMin.get(FunctionalOutput.class.getSimpleName())), Integer.valueOf(3));
96 typeMapMax.put(
97 ecore2Logic.TypeofEClass(
98 modelGenerationProblem.getTrace(),
99 list2MapMax.get(Function.class.getSimpleName())), Integer.valueOf(5));
100 typeMapMax.put(
101 ecore2Logic.TypeofEClass(
102 modelGenerationProblem.getTrace(),
103 list2MapMax.get(functionalarchitecture.FunctionalInterface.class.getSimpleName())), Integer.valueOf(2));
104 typeMapMax.put(
105 ecore2Logic.TypeofEClass(
106 modelGenerationProblem.getTrace(),
107 list2MapMax.get(FunctionalOutput.class.getSimpleName())), Integer.valueOf(4));
108 VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();
109 final Procedure1<VampireSolverConfiguration> _function_2 = (VampireSolverConfiguration it) -> {
110 it.documentationLevel = DocumentationLevel.FULL;
111 it.typeScopes.minNewElements = 4;
112 it.typeScopes.maxNewElements = 25;
113 it.typeScopes.minNewElementsByType = typeMapMin;
114 it.typeScopes.maxNewElementsByType = typeMapMax;
115 it.contCycleLevel = 5;
116 it.uniquenessDuplicates = false;
117 };
118 final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function_2);
119 solution = reasoner.solve(problem, vampireConfig, workspace);
120 long _currentTimeMillis = System.currentTimeMillis();
121 long _minus = (_currentTimeMillis - startTime);
122 long totalTimeMin = (_minus / 60000);
123 long _currentTimeMillis_1 = System.currentTimeMillis();
124 long _minus_1 = (_currentTimeMillis_1 - startTime);
125 long _divide = (_minus_1 / 1000);
126 long totalTimeSec = (_divide % 60);
127 InputOutput.<String>println("Problem solved");
128 _xblockexpression = InputOutput.<String>println(((("Time was: " + Long.valueOf(totalTimeMin)) + ":") + Long.valueOf(totalTimeSec)));
129 }
130 return _xblockexpression;
131 } catch (Throwable _e) {
132 throw Exceptions.sneakyThrow(_e);
133 } 47 }
48 return typeMap;
134 } 49 }
135 50
136 public static EcoreMetamodelDescriptor loadMetamodel(final EPackage pckg) { 51 public static EcoreMetamodelDescriptor loadMetamodel(final EPackage pckg) {
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 bea4e8a6..81079764 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
@@ -1,34 +1,101 @@
1package ca.mcgill.ecse.dslreasoner.vampire.icse; 1package ca.mcgill.ecse.dslreasoner.vampire.icse;
2 2
3import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;
3import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest; 4import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;
4import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage; 5import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;
6import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;
7import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
8import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
9import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
5import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor; 10import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
11import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;
12import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;
13import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
14import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
15import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
16import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;
17import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;
18import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;
6import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace; 19import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
20import java.util.HashMap;
7import java.util.Map; 21import java.util.Map;
8import org.eclipse.emf.common.util.EList; 22import org.eclipse.emf.common.util.EList;
9import org.eclipse.emf.ecore.EObject; 23import org.eclipse.emf.ecore.EObject;
10import org.eclipse.emf.ecore.resource.Resource; 24import org.eclipse.emf.ecore.resource.Resource;
11import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; 25import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
12import org.eclipse.xtend2.lib.StringConcatenation; 26import org.eclipse.xtend2.lib.StringConcatenation;
27import org.eclipse.xtext.xbase.lib.Exceptions;
13import org.eclipse.xtext.xbase.lib.InputOutput; 28import org.eclipse.xtext.xbase.lib.InputOutput;
29import org.eclipse.xtext.xbase.lib.ObjectExtensions;
30import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
14 31
15@SuppressWarnings("all") 32@SuppressWarnings("all")
16public class YakinduTest { 33public class YakinduTest {
17 public static void main(final String[] args) { 34 public static void main(final String[] args) {
18 StringConcatenation _builder = new StringConcatenation(); 35 try {
19 _builder.append("initialModels/"); 36 final Ecore2Logic ecore2Logic = new Ecore2Logic();
20 final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), ""); 37 final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);
21 StringConcatenation _builder_1 = new StringConcatenation(); 38 final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();
22 _builder_1.append("output/YakinduTest/"); 39 StringConcatenation _builder = new StringConcatenation();
23 final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), ""); 40 _builder.append("initialModels/");
24 workspace.initAndClear(); 41 final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");
25 final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; 42 StringConcatenation _builder_1 = new StringConcatenation();
26 final Map<String, Object> map = reg.getExtensionToFactoryMap(); 43 _builder_1.append("output/YakinduTest/");
27 XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl(); 44 final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");
28 map.put("logicproblem", _xMIResourceFactoryImpl); 45 workspace.initAndClear();
29 InputOutput.<String>println("Input and output workspaces are created"); 46 final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
30 final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(YakindummPackage.eINSTANCE); 47 final Map<String, Object> map = reg.getExtensionToFactoryMap();
31 final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "Yakindu.xmi"); 48 XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
32 InputOutput.<String>println("DSL loaded"); 49 map.put("logicproblem", _xMIResourceFactoryImpl);
50 InputOutput.<String>println("Input and output workspaces are created");
51 final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(yakinduPackage.eINSTANCE);
52 final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/yakinduinstance.xmi");
53 final Object queries = null;
54 InputOutput.<String>println("DSL loaded");
55 Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();
56 final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);
57 LogicProblem problem = modelGenerationProblem.getOutput();
58 workspace.writeModel(problem, "Yakindu.logicproblem");
59 InputOutput.<String>println("Problem created");
60 long startTime = System.currentTimeMillis();
61 LogicReasoner reasoner = null;
62 VampireSolver _vampireSolver = new VampireSolver();
63 reasoner = _vampireSolver;
64 final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();
65 final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());
66 final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();
67 final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());
68 VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();
69 final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {
70 it.documentationLevel = DocumentationLevel.FULL;
71 it.typeScopes.minNewElements = 20;
72 it.typeScopes.maxNewElements = 30;
73 int _size = typeMapMin.size();
74 boolean _notEquals = (_size != 0);
75 if (_notEquals) {
76 it.typeScopes.minNewElementsByType = typeMapMin;
77 }
78 int _size_1 = typeMapMin.size();
79 boolean _notEquals_1 = (_size_1 != 0);
80 if (_notEquals_1) {
81 it.typeScopes.maxNewElementsByType = typeMapMax;
82 }
83 it.contCycleLevel = 5;
84 it.uniquenessDuplicates = false;
85 };
86 final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);
87 LogicResult solution = reasoner.solve(problem, vampireConfig, workspace);
88 long _currentTimeMillis = System.currentTimeMillis();
89 long _minus = (_currentTimeMillis - startTime);
90 long totalTimeMin = (_minus / 60000);
91 long _currentTimeMillis_1 = System.currentTimeMillis();
92 long _minus_1 = (_currentTimeMillis_1 - startTime);
93 long _divide = (_minus_1 / 1000);
94 long totalTimeSec = (_divide % 60);
95 InputOutput.<String>println("Problem solved");
96 InputOutput.<String>println(((("Time was: " + Long.valueOf(totalTimeMin)) + ":") + Long.valueOf(totalTimeSec)));
97 } catch (Throwable _e) {
98 throw Exceptions.sneakyThrow(_e);
99 }
33 } 100 }
34} 101}
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 c0481fd8..29f8df00 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 53dc2a03..72d33e5d 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 6c84f917..e9c4c0a4 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
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-17 12:45:55 +0000