11 files changed, 63 insertions, 61 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
index b786abfb..0af80e6c 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
@@ -7,47 +7,47 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: ca.mcgill.ecse.dslreasoner.vamipre.yakindumm,
-  ca.mcgill.ecse.dslreasoner.vamipre.yakindumm.impl,
-  ca.mcgill.ecse.dslreasoner.vamipre.yakindumm.util,
-  ca.mcgill.ecse.dslreasoner.vampire.queries,
-  ca.mcgill.ecse.dslreasoner.vampire.yakindumm,
-  ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl,
-  ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util,
-  yakindumm,
-  yakindumm.impl,
-  yakindumm.util,
-  yakindumm.yakindumm,
-  yakindumm.yakindumm.impl,
-  yakindumm.yakindumm.util
+ ca.mcgill.ecse.dslreasoner.vamipre.yakindumm.impl,
+ ca.mcgill.ecse.dslreasoner.vamipre.yakindumm.util,
+ ca.mcgill.ecse.dslreasoner.vampire.queries,
+ ca.mcgill.ecse.dslreasoner.vampire.yakindumm,
+ ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl,
+ ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util,
+ yakindumm,
+ yakindumm.impl,
+ yakindumm.util,
+ yakindumm.yakindumm,
+ yakindumm.yakindumm.impl,
+ yakindumm.yakindumm.util
 Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
-  org.eclipse.core.runtime,
-  org.eclipse.emf.ecore;visibility:=reexport,
-  org.eclipse.viatra.query.runtime.rete,
-  org.eclipse.viatra.query.runtime.localsearch,
-  com.google.guava,
-  org.eclipse.xtext.xbase.lib,
-  org.eclipse.xtend.lib,
-  org.eclipse.xtend.lib.macro,
-  ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
-  ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
-  org.eclipse.emf.ecore.xmi;bundle-version="2.13.0",
-  hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
-  ModelGenExampleFAM_plugin;bundle-version="1.0.0",
-  ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1",
-  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1",
-  org.eclipse.viatra.query.runtime;bundle-version="2.1.0",
-  org.eclipse.collections;bundle-version="9.2.0",
-  hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0",
-  ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0"
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.viatra.query.runtime.rete,
+ org.eclipse.viatra.query.runtime.localsearch,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
+ ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
+ ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.13.0",
+ hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
+ ModelGenExampleFAM_plugin;bundle-version="1.0.0",
+ ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1",
+ hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1",
+ org.eclipse.viatra.query.runtime;bundle-version="2.1.0",
+ org.eclipse.collections;bundle-version="9.2.0",
+ hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0",
+ ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0"
 Import-Package: org.apache.log4j
 Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.test
 Bundle-ActivationPolicy: lazy
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
index cc7f4809..28e3e685 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
@@ -54,17 +54,17 @@ class YakinduTest {
 //              val queries = null

                 println("DSL loaded")

 

-                var MAX = 150

-                var START = 10

-                var INC = 20

-                var REPS = 1

+                var MAX = 80

+                var START = 79

+                var INC = 1

+                var REPS = 3

 

-                val EXACT = 50

+                val EXACT = 130

                 if (EXACT != -1) {

                         MAX = EXACT

                         START = EXACT

-                        INC = 1

-                        REPS = 3

+                        INC = 5

+                        REPS = 1

                 }

 

                 var writer = new PrintWriter(workspace.workspaceURI + "//_yakinduStats.csv")

@@ -93,7 +93,7 @@ class YakinduTest {
                                 var validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem,

                                         new Viatra2LogicConfiguration)

 

-                                var problem = validModelExtensionProblem.output

+                                var problem = modelGenerationProblem.output

                                 workspace.writeModel(problem, "Yakindu.logicproblem")

 

 //                               println("Problem created")

@@ -125,9 +125,10 @@ class YakinduTest {
                                         // add configuration things, in config file first

                                         it.documentationLevel = DocumentationLevel::FULL

                                         it.iteration = iter

-

-                                        it.typeScopes.minNewElements = size - inc

+                                        it.runtimeLimit = 60

                                         it.typeScopes.maxNewElements = size

+                                        it.typeScopes.minNewElements = size - 5

+

 //                      if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

 //                      if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

                                         it.contCycleLevel = 5

@@ -167,8 +168,8 @@ class YakinduTest {
 //                       println("Time was: " + totalTimeMin + ":" + totalTimeSec)

                         }

                         println()

-                        var solverMed = solverTimes.sort.get(REPS/2)

-                        var transformationMed = transformationTimes.sort.get(REPS/2)

+                        var solverMed = solverTimes.sort.get(REPS / 2)

+                        var transformationMed = transformationTimes.sort.get(REPS / 2)

                         writer.append(solverMed.toString + "," + transformationMed.toString)

                         writer.append("\n")

                 }

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 1d9db781..084503b5 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
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 15159cb7..2315cd50 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
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 69cbcc0a..a3386941 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
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 16a24539..dee6f742 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
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 57a6fa02..f54cd3a0 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
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 35c48de2..b18ede4f 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
@@ -72,16 +72,16 @@ public class YakinduTest {
       final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/Yakindu.xmi");

       final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, Patterns.instance());

       InputOutput.<String>println("DSL loaded");

-      int MAX = 150;

-      int START = 10;

-      int INC = 20;

-      int REPS = 1;

-      final int EXACT = 50;

+      int MAX = 80;

+      int START = 79;

+      int INC = 1;

+      int REPS = 3;

+      final int EXACT = 130;

       if ((EXACT != (-1))) {

         MAX = EXACT;

         START = EXACT;

-        INC = 1;

-        REPS = 3;

+        INC = 5;

+        REPS = 1;

       }

       URI _workspaceURI = workspace.getWorkspaceURI();

       String _plus_2 = (_workspaceURI + "//_yakinduStats.csv");

@@ -115,7 +115,7 @@ public class YakinduTest {
                 TracedOutput<LogicProblem, Ecore2Logic_Trace> modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel);

                 Viatra2LogicConfiguration _viatra2LogicConfiguration = new Viatra2LogicConfiguration();

                 TracedOutput<LogicProblem, Viatra2LogicTrace> validModelExtensionProblem = viatra2Logic.transformQueries(queries, modelExtensionProblem, _viatra2LogicConfiguration);

-                LogicProblem problem = validModelExtensionProblem.getOutput();

+                LogicProblem problem = modelGenerationProblem.getOutput();

                 workspace.writeModel(problem, "Yakindu.logicproblem");

                 long startTime = System.currentTimeMillis();

                 VampireSolver reasoner = null;

@@ -128,8 +128,9 @@ public class YakinduTest {
                 final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

                   it.documentationLevel = DocumentationLevel.FULL;

                   it.iteration = iter;

-                  it.typeScopes.minNewElements = (size - inc);

+                  it.runtimeLimit = 60;

                   it.typeScopes.maxNewElements = size;

+                  it.typeScopes.minNewElements = (size - 5);

                   it.contCycleLevel = 5;

                   it.uniquenessDuplicates = false;

                 };

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 74f8e73f..e77449e7 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
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 68b3fd77..97f29b0c 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
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 fc4464b3..0e320f18 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