1 files changed, 34 insertions, 14 deletions

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 e96a6bf6..8d96958d 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
@@ -37,9 +37,12 @@ import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

 import org.junit.Test

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

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationSizePrinter

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml

 

 enum UseSolver{Viatra, Smt, ViatraWithSmt, Alloy}

-enum Domain{FAM, Yakindu}

+enum Domain{FAM, Yakindu, FileSystem,Ecore}

 enum Diversity{No, Diverse}

 

 class RunMeasurements {

@@ -70,8 +73,12 @@ class RunMeasurements {
                 if(dsl == Domain::FAM) {

                         return new FAMLoader(inputs)

                 } else if(dsl == Domain::Yakindu) {

-                        return new YakinduLoader(inputs)

-                } else throw new IllegalArgumentException('''Unknown domain: «dsl»''')

+                        return new YakinduLoader(inputs) =>[it.useSynchronization = true useComplexStates = false]

+                } else if(dsl == Domain::FileSystem){

+                        return new FileSystemLoader(inputs)

+                } else if(dsl == Domain::Ecore) {

+                        return new EcoreLoader(inputs)

+                }else throw new IllegalArgumentException('''Unknown domain: «dsl»''')

         }

         def static init() {

                 LogiclanguagePackage.eINSTANCE.class

@@ -147,7 +154,7 @@ class RunMeasurements {
                         return solution

                 } else {

                         val viatraConfig = new ViatraReasonerConfiguration => [

-                                it.runtimeLimit = 20

+                                it.runtimeLimit = 400

                                 it.typeScopes.maxNewElements = size

                                 it.typeScopes.minNewElements = size

                                 it.solutionScope.numberOfRequiredSolution = number

@@ -156,6 +163,10 @@ class RunMeasurements {
                                 it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis

                                 it.searchSpaceConstraints.additionalGlobalConstraints += loader.additionalConstraints

                                 it.stateCoderStrategy = StateCoderStrategy::Neighbourhood

+                                it.debugCongiguration.partalInterpretationVisualisationFrequency = 100

+                                //it.debugCongiguration.partialInterpretatioVisualiser =

+                                        //new GraphvizVisualisation

+                                        //new PartialInterpretationSizePrinter

                         ]

                         viatraConfig.diversityRequirement = diversityRequirement

                         if (solver == UseSolver.Viatra) {

@@ -189,13 +200,13 @@ class RunMeasurements {
         }

         

         static val monitoring = false

-        static val clean = false

-        static val domain = Domain::Yakindu

+        static val clean = true

+        static val domain = Domain::FAM

         static val solver = UseSolver::Viatra

-        static val diverse = true

-        static val wf = false

-        public static var sizes =  #[50]

-        static var int number = 3

+        static val diverse = false

+        static val wf = true

+        public static var sizes =  #[11,5,10,15,20,25,30,35,40,45,50,100,150,200,250,300,350,400,450,500]

+        static var int number = 1

         

         def static void waitForEnter() {

                 if(monitoring) {

@@ -215,8 +226,8 @@ class RunMeasurements {
                 //println("- Queries loaded")

                 

                 if(!wf) {

-                        mm.attributes.forEach[it.lowerBound = 0]

-                        mm.references.forEach[it.lowerBound = 0]

+//                      mm.attributes.forEach[it.lowerBound = 0]

+//                      mm.references.forEach[it.lowerBound = 0]

                         mm.references.removeAll(vq.derivedFeatures.values)

                         mm.attributes.removeAll(vq.derivedFeatures.values)

                 }

@@ -252,6 +263,15 @@ class RunMeasurements {
                                 val representationNumber = representationIndex + 1

                                 if(representation instanceof PartialInterpretation) {

                                         r.workspace.writeModel(representation, '''solution«representationNumber».partialinterpretation''')

+                                        val partialInterpretation2GML = new PartialInterpretation2Gml

+                                        val gml = partialInterpretation2GML.transform(representation)

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

+                                        if(representation.newElements.size <160) {

+                                                val visualiser = new GraphvizVisualisation

+                                                val visualisation = visualiser.visualiseConcretization(representation)

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

+                                        }

+

                                 } else {

                                         r.workspace.writeText('''solution«representationNumber».txt''',representation.toString)

                                 }

@@ -274,14 +294,14 @@ class RunMeasurements {
                 println("save")

                 //val id = 50//args.get(0)

                 for(size : sizes) {

-                        val run = (1..50).map['''r«it»''']

+                        val run = (1..10).map['''r«it»''']

                         for(runIndex : run) {

                                 val runID = runIndex+"_"+size

                                 print(runID + ";")

                                 

                                 try {

                                         runMeasure(runID,size)

-                                } catch(Exception e) {}

+                                } catch(Exception e) {e.printStackTrace}

                                 

                                 System.gc System.gc System.gc

                                 Thread.sleep(2000)