Browse Source

Do not skip states if approx = 0.0

Former-commit-id: 37dbb9739c
tempestpy_adaptions
Mavo 8 years ago
parent
commit
1c95722711
  1. 26
      src/builder/ExplicitDFTModelBuilderApprox.cpp

26
src/builder/ExplicitDFTModelBuilderApprox.cpp

@ -143,17 +143,19 @@ namespace storm {
initializeNextIteration();
}
switch (heuristic) {
case storm::builder::ApproximationHeuristic::NONE:
// Do not change anything
approximationThreshold = dft.nrElements()+10;
break;
case storm::builder::ApproximationHeuristic::DEPTH:
approximationThreshold = iteration;
break;
case storm::builder::ApproximationHeuristic::PROBABILITY:
approximationThreshold = 10 * std::pow(2, iteration);
break;
if (approximationThreshold > 0) {
switch (heuristic) {
case storm::builder::ApproximationHeuristic::NONE:
// Do not change anything
approximationThreshold = dft.nrElements()+10;
break;
case storm::builder::ApproximationHeuristic::DEPTH:
approximationThreshold = iteration;
break;
case storm::builder::ApproximationHeuristic::PROBABILITY:
approximationThreshold = 10 * std::pow(2, iteration);
break;
}
}
exploreStateSpace(approximationThreshold);
@ -319,7 +321,7 @@ namespace storm {
// Try to explore the next state
generator.load(currentState);
if (nrExpandedStates > approximationThreshold && !currentExplorationHeuristic->isExpand()) {
if (approximationThreshold > 0.0 && nrExpandedStates > approximationThreshold && !currentExplorationHeuristic->isExpand()) {
//if (currentExplorationHeuristic->isSkip(approximationThreshold)) {
// Skip the current state
++nrSkippedStates;

Loading…
Cancel
Save