diff options
author | Oszkar Semerath <semerath@mit.bme.hu> | 2020-05-10 18:38:20 +0200 |
---|---|---|
committer | Oszkar Semerath <semerath@mit.bme.hu> | 2020-05-10 18:38:20 +0200 |
commit | 66cc2cc3b2f24d403167fd4e35cd69011d334b00 (patch) | |
tree | 6a87161ee9666591655504eee339d6d2185ffd50 /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java | |
parent | closing numerical solver (diff) | |
download | VIATRA-Generator-66cc2cc3b2f24d403167fd4e35cd69011d334b00.tar.gz VIATRA-Generator-66cc2cc3b2f24d403167fd4e35cd69011d334b00.tar.zst VIATRA-Generator-66cc2cc3b2f24d403167fd4e35cd69011d334b00.zip |
measurement time statistics + activation selection strategies
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java | 9 |
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 { | |||
84 | private ModelResult modelResultByInternalSolver = null; | 84 | private ModelResult modelResultByInternalSolver = null; |
85 | private Random random = new Random(); | 85 | private Random random = new Random(); |
86 | //private Collection<ViatraQueryMatcher<? extends IPatternMatch>> matchers; | 86 | //private Collection<ViatraQueryMatcher<? extends IPatternMatch>> matchers; |
87 | 87 | public ActivationSelector activationSelector = new EvenActivationSelector(random); | |
88 | public NumericSolver numericSolver = null; | ||
88 | // Statistics | 89 | // Statistics |
89 | private int numberOfStatecoderFail = 0; | 90 | private int numberOfStatecoderFail = 0; |
90 | private int numberOfPrintedModel = 0; | 91 | private int numberOfPrintedModel = 0; |
91 | private int numberOfSolverCalls = 0; | 92 | private int numberOfSolverCalls = 0; |
92 | 93 | ||
93 | private NumericSolver numericSolver = null; | ||
94 | 94 | ||
95 | public BestFirstStrategyForModelGeneration( | 95 | public BestFirstStrategyForModelGeneration( |
96 | ReasonerWorkspace workspace, | 96 | ReasonerWorkspace workspace, |
@@ -137,7 +137,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
137 | } | 137 | } |
138 | }; | 138 | }; |
139 | 139 | ||
140 | this.numericSolver = new NumericSolver(context, method); | 140 | this.numericSolver = new NumericSolver(context, method, false); |
141 | 141 | ||
142 | trajectoiresToExplore = new PriorityQueue<TrajectoryWithFitness>(11, comparator); | 142 | trajectoiresToExplore = new PriorityQueue<TrajectoryWithFitness>(11, comparator); |
143 | } | 143 | } |
@@ -273,8 +273,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
273 | private List<Object> selectActivation() { | 273 | private List<Object> selectActivation() { |
274 | List<Object> activationIds; | 274 | List<Object> activationIds; |
275 | try { | 275 | try { |
276 | activationIds = new ArrayList<Object>(context.getUntraversedActivationIds()); | 276 | activationIds = this.activationSelector.randomizeActivationIDs(context.getUntraversedActivationIds()); |
277 | Collections.shuffle(activationIds); | ||
278 | } catch (NullPointerException e) { | 277 | } catch (NullPointerException e) { |
279 | numberOfStatecoderFail++; | 278 | numberOfStatecoderFail++; |
280 | activationIds = Collections.emptyList(); | 279 | activationIds = Collections.emptyList(); |