1 files changed, 6 insertions, 12 deletions

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunModelExtension.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunModelExtension.xtend
index d8f75b89..1b8fe3e9 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunModelExtension.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunModelExtension.xtend
@@ -30,7 +30,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.StateCoderStrategy

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration

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

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

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace

 import java.io.BufferedReader

 import java.io.InputStreamReader

@@ -44,7 +44,6 @@ import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine

 import org.eclipse.viatra.query.runtime.emf.EMFScope

-import java.lang.invoke.VolatileCallSite

 

 enum PartialModelSource { Homeworks, Random }

 enum ValidationTechique {Alloy, Viatra}

@@ -116,7 +115,7 @@ class RunModelExtensionMeasurements {
                         val smtConfig = new SmtSolverConfiguration() => [

                                 it.typeScopes.maxNewElements = size

                                 it.typeScopes.minNewElements = size

-                                it.solutionScope.numberOfRequiredSolution = 1

+                                it.solutionScope.numberOfRequiredSolutions = 1

                                 it.solverPath = '''"D:/Programs/Z3/4.3/z3.exe"'''

                         ]

                         val solution = this.smtSolver.solve(

@@ -129,9 +128,8 @@ class RunModelExtensionMeasurements {
                         val alloyConfig = new AlloySolverConfiguration => [

                                 it.typeScopes.maxNewElements = size

                                 it.typeScopes.minNewElements = size

-                                it.solutionScope.numberOfRequiredSolution = 1

+                                it.solutionScope.numberOfRequiredSolutions = 1

                                 it.typeScopes.maxNewIntegers = 0

-                                it.writeToFile = true

                         ]

                         val solution = this.alloyReasoner.solve(

                                 problem,

@@ -144,16 +142,12 @@ class RunModelExtensionMeasurements {
                                 it.runtimeLimit = 400

                                 it.typeScopes.maxNewElements = size

                                 it.typeScopes.minNewElements = size

-                                it.solutionScope.numberOfRequiredSolution = 1

-                                it.existingQueries = vq.patterns.map[it.internalQueryRepresentation]

+                                it.solutionScope.numberOfRequiredSolutions = 1

                                 it.nameNewElements = false

                                 it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis

                                 it.searchSpaceConstraints.additionalGlobalConstraints += loader.additionalConstraints

                                 it.stateCoderStrategy = StateCoderStrategy::Neighbourhood

-                                it.debugCongiguration.partalInterpretationVisualisationFrequency = 100

-                                //it.debugCongiguration.partialInterpretatioVisualiser =

-                                        //new GraphvizVisualisation

-                                        //new PartialInterpretationSizePrinter

+                                it.debugConfiguration.partalInterpretationVisualisationFrequency = 100

                         ]

                         viatraConfig.diversityRequirement = diversityRequirement

                         if (solver == UseSolver.Viatra) {

@@ -314,7 +308,7 @@ class RunModelExtensionMeasurements {
                                                         val gml = partialInterpretation2GML.transform(representation)

                                                         r.workspace.writeText('''solution«representationNumber».gml''',gml)

                                                         if(representation.newElements.size <160) {

-                                                                val visualiser = new GraphvizVisualisation

+                                                                val visualiser = new GraphvizVisualiser

                                                                 val visualisation = visualiser.visualiseConcretization(representation)

                                                                 visualisation.writeToFile(r.workspace,'''solution«representationNumber»''')

                                                         }