measurement time statistics + activation selection strategies

1 files changed, 4 insertions, 5 deletions

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 1cd61e9a..18fe94e4 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
@@ -84,13 +84,13 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
         private ModelResult modelResultByInternalSolver = null;

         private Random random = new Random();

         //private Collection<ViatraQueryMatcher<? extends IPatternMatch>> matchers;

-        

+        public ActivationSelector activationSelector = new EvenActivationSelector(random);

+        public NumericSolver numericSolver = null;

         // Statistics

         private int numberOfStatecoderFail = 0;

         private int numberOfPrintedModel = 0;

         private int numberOfSolverCalls = 0;

         

-        private NumericSolver numericSolver = null;

 

         public BestFirstStrategyForModelGeneration(

                         ReasonerWorkspace workspace,

@@ -137,7 +137,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                         }

                 };

                 

-                this.numericSolver = new NumericSolver(context, method);

+                this.numericSolver = new NumericSolver(context, method, false);

 

                 trajectoiresToExplore = new PriorityQueue<TrajectoryWithFitness>(11, comparator);

         }

@@ -273,8 +273,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
         private List<Object> selectActivation() {

                 List<Object> activationIds;

                 try {

-                        activationIds = new ArrayList<Object>(context.getUntraversedActivationIds());

-                        Collections.shuffle(activationIds);

+                        activationIds = this.activationSelector.randomizeActivationIDs(context.getUntraversedActivationIds());

                 } catch (NullPointerException e) {

                         numberOfStatecoderFail++;

                         activationIds = Collections.emptyList();