2 files changed, 49 insertions, 10 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
index 6639e5f3..92aefb56 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
@@ -1,5 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner

 

+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.PartialInterpretationMetric

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

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

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

@@ -27,12 +28,11 @@ import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
 import java.util.List

 import java.util.Map

 import org.eclipse.emf.ecore.EObject

+import org.eclipse.emf.ecore.util.EcoreUtil

 import org.eclipse.viatra.dse.api.DesignSpaceExplorer

 import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel

 import org.eclipse.viatra.dse.solutionstore.SolutionStore

 import org.eclipse.viatra.dse.statecode.IStateCoderFactory

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.SolutionStoreWithDiversityDescriptor

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.DiversityGranularity

 

 class ViatraReasoner extends LogicReasoner{

         val PartialInterpretationInitialiser initialiser = new PartialInterpretationInitialiser()

@@ -61,11 +61,12 @@ class ViatraReasoner extends LogicReasoner{
                 

                 

                 val emptySolution = initialiser.initialisePartialInterpretation(problem,viatraConfig.typeScopes).output

+                

                 if((viatraConfig.documentationLevel == DocumentationLevel::FULL || viatraConfig.documentationLevel == DocumentationLevel::NORMAL) && workspace !== null) {

                         workspace.writeModel(emptySolution,"init.partialmodel")

                 } 

                 emptySolution.problemConainer = problem

-                

+                val emptySolutionCopy = EcoreUtil.copy(emptySolution)

                 val ScopePropagator scopePropagator = new ScopePropagator(emptySolution)

                 scopePropagator.propagateAllScopeConstraints            

                 

@@ -129,6 +130,12 @@ class ViatraReasoner extends LogicReasoner{
                 val solverTime = System.nanoTime - solverStartTime

                 viatraConfig.progressMonitor.workedSearchFinished

                 

+                //find trajectory to each solution

+                if(viatraConfig.documentationLevel == DocumentationLevel.NONE){

+                        PartialInterpretationMetric.initPaths();

+                        PartialInterpretationMetric.outputTrajectories(emptySolutionCopy, dse.solutions.toList());

+                }

+                

                 //additionalMatches = strategy.solutionStoreWithCopy.additionalMatches

                 val statistics = createStatistics => [

                         //it.solverTime = viatraConfig.runtimeLimit

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
index 60f46033..81b551fb 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
@@ -14,9 +14,11 @@ import java.util.Arrays;
 import java.util.Collection;

 import java.util.Collections;

 import java.util.Comparator;

+import java.util.HashMap;

 import java.util.Iterator;

 import java.util.LinkedList;

 import java.util.List;

+import java.util.Map;

 import java.util.PriorityQueue;

 import java.util.Random;

 

@@ -32,6 +34,8 @@ import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher;

 

+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.MetricDistanceGroup;

+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.PartialInterpretationMetric;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;

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

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

@@ -188,8 +192,25 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
 //                      }

 

                         List<Object> activationIds = selectActivation();

+                        PartialInterpretation model = (PartialInterpretation) context.getModel();

+                        System.out.println(model.getNewElements().size() );

+                        PartialInterpretationMetric.initPaths();

+                        if(model.getNewElements().size() >= 10) {

+                                Map<Object, Double> valueMap = new HashMap<Object, Double>();

+                                System.out.println(PartialInterpretationMetric.calculateMetricDistance(model).getMPCDistance());

+                                for(Object id : activationIds) {

+                                        context.executeAcitvationId(id);

+                                        model = (PartialInterpretation) context.getModel();

+                                        MetricDistanceGroup g = PartialInterpretationMetric.calculateMetricDistance(model);

+                                        valueMap.put(id, g.getMPCDistance());

+                                        context.backtrack();

+                                }

+                                Collections.sort(activationIds, Comparator.comparing(li -> valueMap.get(li)));

+                        }

+                        

+                        

                         Iterator<Object> iterator = activationIds.iterator();

-

+                        

                         while (!isInterrupted && !configuration.progressMonitor.isCancelled() && iterator.hasNext()) {

                                 final Object nextActivation = iterator.next();

 //                              if (!iterator.hasNext()) {

@@ -198,7 +219,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
 //                              }

                                 logger.debug("Executing new activation: " + nextActivation);

                                 context.executeAcitvationId(nextActivation);

-

+                                

                                 visualiseCurrentState();

 //                              for(ViatraQueryMatcher<? extends IPatternMatch> matcher : matchers) {

 //                                      System.out.println(matcher.getPatternName());

@@ -209,13 +230,16 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
 //                                      System.out.println("---------");

 //                              }

                                 

+                                //calculate the metrics for each state

+//                              logCurrentStateMetric();

+                                

                                 boolean consistencyCheckResult = checkConsistency(currentTrajectoryWithFittness);

                                 if(consistencyCheckResult == true) { continue mainLoop; }

 

-                                if (context.isCurrentStateAlreadyTraversed()) {

-                                        logger.info("The new state is already visited.");

-                                        context.backtrack();

-                                } else if (!context.checkGlobalConstraints()) {

+/*                              if (context.isCurrentStateAlreadyTraversed()) {

+//                                      logger.info("The new state is already visited.");

+//                                      context.backtrack();

+//                              } else*/ if (!context.checkGlobalConstraints()) {

                                         logger.debug("Global contraint is not satisifed.");

                                         context.backtrack();

                                 } else {

@@ -248,7 +272,6 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                                         }

                                 }

                         }

-

                         logger.debug("State is fully traversed.");

                         trajectoiresToExplore.remove(currentTrajectoryWithFittness);

                         currentTrajectoryWithFittness = null;

@@ -309,6 +332,15 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                         return trajectoiresToExplore.element();

                 }

         }       

+        

+//      private void logCurrentStateMetric() {

+//              if(this.configuration.documentationLevel != DocumentationLevel.NONE || workspace == null) {

+//                      return;

+//              }

+//              

+//              PartialInterpretation interpretation = (PartialInterpretation)context.getModel();   //pattern.get("interpretation");

+//              PartialInterpretationMetric.calculateMetric(interpretation, "debug/metric/" + context.getModel().hashCode(), context.getCurrentStateId().toString());           

+//      }

 

         public void visualiseCurrentState() {

                 PartialInterpretationVisualiser partialInterpretatioVisualiser = configuration.debugCongiguration.partialInterpretatioVisualiser;