Browse Source

Use heuristic NONE

tempestpy_adaptions
Matthias Volk 8 years ago
parent
commit
02c7ace5e6
  1. 2
      src/storm-dft/builder/ExplicitDFTModelBuilderApprox.cpp
  2. 3
      src/storm-dft/builder/ExplicitDFTModelBuilderApprox.h
  3. 2
      src/storm-dft/storage/BucketPriorityQueue.h

2
src/storm-dft/builder/ExplicitDFTModelBuilderApprox.cpp

@ -65,7 +65,7 @@ namespace storm {
{
// Intentionally left empty.
// TODO Matthias: remove again
usedHeuristic = storm::builder::ApproximationHeuristic::BOUNDDIFFERENCE;
usedHeuristic = storm::builder::ApproximationHeuristic::NONE;
// Compute independent subtrees
if (dft.topLevelType() == storm::storage::DFTElementType::OR) {

3
src/storm-dft/builder/ExplicitDFTModelBuilderApprox.h

@ -29,7 +29,7 @@ namespace storm {
using DFTStatePointer = std::shared_ptr<storm::storage::DFTState<ValueType>>;
// TODO Matthias: make choosable
using ExplorationHeuristic = DFTExplorationHeuristicBoundDifference<ValueType>;
using ExplorationHeuristic = DFTExplorationHeuristicNone<ValueType>;
using ExplorationHeuristicPointer = std::shared_ptr<ExplorationHeuristic>;
@ -335,7 +335,6 @@ namespace storm {
// A priority queue of states that still need to be explored.
storm::storage::BucketPriorityQueue<ValueType> explorationQueue;
//storm::storage::DynamicPriorityQueue<ExplorationHeuristicPointer, std::vector<ExplorationHeuristicPointer>, std::function<bool(ExplorationHeuristicPointer, ExplorationHeuristicPointer)>> explorationQueue;
// A mapping of not yet explored states from the id to the tuple (state object, heuristic values).
std::map<StateType, std::pair<DFTStatePointer, ExplorationHeuristicPointer>> statesNotExplored;

2
src/storm-dft/storage/BucketPriorityQueue.h

@ -13,7 +13,7 @@ namespace storm {
template<typename ValueType>
class BucketPriorityQueue {
using HeuristicPointer = std::shared_ptr<storm::builder::DFTExplorationHeuristicBoundDifference<ValueType>>;
using HeuristicPointer = std::shared_ptr<storm::builder::DFTExplorationHeuristicNone<ValueType>>;
public:
explicit BucketPriorityQueue(size_t nrBuckets, double lowerValue, double ratio);

Loading…
Cancel
Save