aboutsummaryrefslogtreecommitdiffstats
path: root/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
diff options
context:
space:
mode:
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.java18
1 files changed, 1 insertions, 17 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 81b551fb..71178f3d 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
@@ -191,24 +191,9 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
191// continue mainLoop; 191// continue mainLoop;
192// } 192// }
193 193
194 List<Object> activationIds = selectActivation();
195 PartialInterpretation model = (PartialInterpretation) context.getModel();
196 System.out.println(model.getNewElements().size() );
197 PartialInterpretationMetric.initPaths();
198 if(model.getNewElements().size() >= 10) {
199 Map<Object, Double> valueMap = new HashMap<Object, Double>();
200 System.out.println(PartialInterpretationMetric.calculateMetricDistance(model).getMPCDistance());
201 for(Object id : activationIds) {
202 context.executeAcitvationId(id);
203 model = (PartialInterpretation) context.getModel();
204 MetricDistanceGroup g = PartialInterpretationMetric.calculateMetricDistance(model);
205 valueMap.put(id, g.getMPCDistance());
206 context.backtrack();
207 }
208 Collections.sort(activationIds, Comparator.comparing(li -> valueMap.get(li)));
209 }
210 194
211 195
196 List<Object> activationIds = selectActivation();
212 Iterator<Object> iterator = activationIds.iterator(); 197 Iterator<Object> iterator = activationIds.iterator();
213 198
214 while (!isInterrupted && !configuration.progressMonitor.isCancelled() && iterator.hasNext()) { 199 while (!isInterrupted && !configuration.progressMonitor.isCancelled() && iterator.hasNext()) {
@@ -219,7 +204,6 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
219// } 204// }
220 logger.debug("Executing new activation: " + nextActivation); 205 logger.debug("Executing new activation: " + nextActivation);
221 context.executeAcitvationId(nextActivation); 206 context.executeAcitvationId(nextActivation);
222
223 visualiseCurrentState(); 207 visualiseCurrentState();
224// for(ViatraQueryMatcher<? extends IPatternMatch> matcher : matchers) { 208// for(ViatraQueryMatcher<? extends IPatternMatch> matcher : matchers) {
225// System.out.println(matcher.getPatternName()); 209// System.out.println(matcher.getPatternName());