Corrected the configuration in the test runners.

4 files changed, 45 insertions, 36 deletions

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF b/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
index 4193c535..ae6765bd 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
@@ -3,30 +3,31 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Run
 Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.run;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage,
- hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
- com.google.guava,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
- org.eclipse.emf.ecore.xmi;bundle-version="2.11.1",
- hu.bme.mit.inf.dslreasoner.smt.reasoner;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
- org.eclipse.viatra.query.runtime;bundle-version="1.5.0",
- org.eclipse.viatra.query.tooling.core;bundle-version="1.5.0",
- org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0",
- hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
- org.eclipse.viatra.query.patternlanguage;bundle-version="1.5.0",
- org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0",
- hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",
- org.junit;bundle-version="4.12.0",
- hu.bme.mit.inf.dslreasoner.domains.transima.fam;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
- org.eclipse.viatra.dse;bundle-version="0.15.0",
- hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic;bundle-version="1.0.0",
- org.eclipse.viatra.query.runtime.localsearch;bundle-version="1.5.0",
- hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0"
+Require-Bundle: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage,

+ hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",

+ hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",

+ com.google.guava,

+ org.eclipse.xtext.xbase.lib,

+ org.eclipse.xtend.lib,

+ org.eclipse.xtend.lib.macro,

+ org.eclipse.emf.ecore.xmi;bundle-version="2.11.1",

+ hu.bme.mit.inf.dslreasoner.smt.reasoner;bundle-version="1.0.0",

+ hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",

+ org.eclipse.viatra.query.runtime;bundle-version="1.5.0",

+ org.eclipse.viatra.query.tooling.core;bundle-version="1.5.0",

+ org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0",

+ hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",

+ org.eclipse.viatra.query.patternlanguage;bundle-version="1.5.0",

+ org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0",

+ hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",

+ org.junit;bundle-version="4.12.0",

+ hu.bme.mit.inf.dslreasoner.domains.transima.fam;bundle-version="1.0.0",

+ hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",

+ org.eclipse.viatra.dse;bundle-version="0.15.0",

+ hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0",

+ hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic;bundle-version="1.0.0",

+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="1.5.0",

+ hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",

+ hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
index e6ee0ad9..c3f77ad7 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
@@ -35,6 +35,8 @@ import org.eclipse.xtend.lib.annotations.Data
 import java.util.LinkedList

 import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolver

 import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolverConfiguration

+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvisVisualisation

+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation

 

 enum Metamodel {

         FAM, YakinduWOSynch, Yakindu

@@ -190,7 +192,9 @@ class ScenarioRunner {
                                 it.existingQueries = vq.patterns.map[it.internalQueryRepresentation]

                                 it.nameNewElements = false

                                 it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis

-                                it.additionalGlobalConstraints += loader.additionalConstraints

+                                it.searchSpaceConstraints.additionalGlobalConstraints += loader.additionalConstraints

+                                it.debugCongiguration.partalInterpretationVisualisationFrequency = 1

+                        it.debugCongiguration.partialInterpretatioVisualiser = new GraphvizVisualisation

                                 it.stateCoderStrategy = if(scenario.statecoder == StateCoder::ID) {

                                         StateCoderStrategy::IDBased

                                 } else {

@@ -309,7 +313,7 @@ class ScenarioRunner {
 

 class DiverseMeasurementRunner {

         def static void main(String[] args) {
-                val scenario = new Scenario(100,49,Metamodel::Yakindu,Constraints.All,StateCoder.Normal,1,Solver::Alloy)

+                val scenario = new Scenario(30,49,Metamodel::Yakindu,Constraints.All,StateCoder.Normal,1,Solver::ViatraSolver)

                 val scenarioRunner = new ScenarioRunner

                 scenarioRunner.runScenario(scenario)
         }

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
index b4ae9293..8de44b5b 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
@@ -63,7 +63,7 @@ class RunMeasurements {
         // Solvers

         val SMTSolver smtSolver = new SMTSolver

         val ViatraReasoner viatraSolver = new ViatraReasoner

-        val ViatraReasoner viatraWithSmtSolver = new ViatraReasoner(smtSolver)

+        val ViatraReasoner viatraWithSmtSolver = new ViatraReasoner

         val AlloySolver alloyReasoner = new AlloySolver

         

         def  dslLoader(Domain dsl) {

@@ -154,7 +154,7 @@ class RunMeasurements {
                                 it.existingQueries = vq.patterns.map[it.internalQueryRepresentation]

                                 it.nameNewElements = false

                                 it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis

-                                it.additionalGlobalConstraints += loader.additionalConstraints

+                                it.searchSpaceConstraints.additionalGlobalConstraints += loader.additionalConstraints

                                 it.stateCoderStrategy = StateCoderStrategy::Neighbourhood

                         ]

                         viatraConfig.diversityRequirement = diversityRequirement

@@ -172,7 +172,10 @@ class RunMeasurements {
                                 ]

                                 val solution = this.viatraWithSmtSolver.solve(

                                         problem,

-                                        viatraConfig =>[it.inconsistencDetectorConfiguration = inconsistency],

+                                        viatraConfig =>[

+                                                it.internalConsistencyCheckerConfiguration.internalIncosnsitencyDetector = smtSolver

+                                                it.internalConsistencyCheckerConfiguration.internalInconsistencDetectorConfiguration = inconsistency

+                                        ],

                                         this.workspace

                                 )

                                 return solution

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index 20683fff..0a304915 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -33,6 +33,7 @@ import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolver
 import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

 import java.util.LinkedList

+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation

 

 class SimpleRun {

         

@@ -63,16 +64,16 @@ class SimpleRun {
                 println("Problem created")

                 var LogicResult solution

                 var LogicReasoner reasoner

-                /*

+                //*

                 reasoner = new ViatraReasoner

                 val viatraConfig = new ViatraReasonerConfiguration => [

-                        it.typeScopes.maxNewElements = 10

-                        it.typeScopes.minNewElements = 10

+                        it.typeScopes.maxNewElements = 40

+                        it.typeScopes.minNewElements = 40

                         it.solutionScope.numberOfRequiredSolution = 1

                         it.existingQueries = queries.patterns.map[it.internalQueryRepresentation]

-                        it.nameNewElements = true

-                        it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis

-                        it.stateCoderStrategy = StateCoderStrategy::Neighbourhood

+                        it.debugCongiguration.logging = true

+                        it.debugCongiguration.partalInterpretationVisualisationFrequency = 1

+                        it.debugCongiguration.partialInterpretatioVisualiser = new GraphvizVisualisation

                 ]

                 solution = reasoner.solve(logicProblem,viatraConfig,workspace)

                 /*/