From 0d9cdd6ef882fbe21b5db8e9b1ee6d85a02bd767 Mon Sep 17 00:00:00 2001 From: Mavo Date: Tue, 25 Oct 2016 13:47:06 +0200 Subject: [PATCH] Use Heuristic None Former-commit-id: 63f78f3db06074f322326d9169deed15256b8304 --- src/builder/ExplicitDFTModelBuilderApprox.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/builder/ExplicitDFTModelBuilderApprox.cpp b/src/builder/ExplicitDFTModelBuilderApprox.cpp index 6b35344cd..7de1e0bb4 100644 --- a/src/builder/ExplicitDFTModelBuilderApprox.cpp +++ b/src/builder/ExplicitDFTModelBuilderApprox.cpp @@ -33,11 +33,11 @@ namespace storm { stateStorage(((dft.stateVectorSize() / 64) + 1) * 64), // TODO Matthias: make choosable explorationQueue(dft.nrElements()+1, 0, 1) - //explorationQueue(141, 0, 0.02) + //explorationQueue(1001, 0, 0.001) { // Intentionally left empty. // TODO Matthias: remove again - heuristic = storm::builder::ApproximationHeuristic::PROBABILITY; + heuristic = storm::builder::ApproximationHeuristic::NONE; } template @@ -97,7 +97,7 @@ namespace storm { break; case storm::builder::ApproximationHeuristic::PROBABILITY: //approximationThreshold = std::pow(0.1, iteration) * approximationThreshold; - approximationThreshold = 10 * std::pow(2, iteration); + approximationThreshold = iteration;//10 * std::pow(2, iteration); break; } exploreStateSpace(approximationThreshold); @@ -267,6 +267,7 @@ namespace storm { // Try to explore the next state generator.load(currentState); + //if (nrExpandedStates > approximationThreshold) { if (currentExplorationHeuristic->isSkip(approximationThreshold)) { // Skip the current state ++nrSkippedStates;