Browse Source

added method isShieldingTask() to SolveGoal.*

tempestpy_adaptions
Lukas Posch 3 years ago
committed by Stefan Pranger
parent
commit
731c060c4e
  1. 5
      src/storm/solver/SolveGoal.cpp
  2. 9
      src/storm/solver/SolveGoal.h

5
src/storm/solver/SolveGoal.cpp

@ -122,6 +122,11 @@ namespace storm {
relevantValueVector = std::move(values); relevantValueVector = std::move(values);
} }
template<typename ValueType>
bool SolveGoal<ValueType>::isShieldingTask() const {
return shieldingTask;
}
template class SolveGoal<double>; template class SolveGoal<double>;
#ifdef STORM_HAVE_CARL #ifdef STORM_HAVE_CARL

9
src/storm/solver/SolveGoal.h

@ -51,6 +51,7 @@ namespace storm {
comparisonType = checkTask.getBoundComparisonType(); comparisonType = checkTask.getBoundComparisonType();
threshold = checkTask.getBoundThreshold(); threshold = checkTask.getBoundThreshold();
} }
shieldingTask = checkTask.isShieldingTask();
} }
SolveGoal(bool minimize); SolveGoal(bool minimize);
@ -77,19 +78,23 @@ namespace storm {
ValueType const& thresholdValue() const; ValueType const& thresholdValue() const;
bool hasRelevantValues() const; bool hasRelevantValues() const;
storm::storage::BitVector& relevantValues(); storm::storage::BitVector& relevantValues();
storm::storage::BitVector const& relevantValues() const; storm::storage::BitVector const& relevantValues() const;
void restrictRelevantValues(storm::storage::BitVector const& filter); void restrictRelevantValues(storm::storage::BitVector const& filter);
void setRelevantValues(storm::storage::BitVector&& values); void setRelevantValues(storm::storage::BitVector&& values);
bool isShieldingTask() const;
private: private:
boost::optional<OptimizationDirection> optimizationDirection; boost::optional<OptimizationDirection> optimizationDirection;
boost::optional<storm::logic::ComparisonType> comparisonType; boost::optional<storm::logic::ComparisonType> comparisonType;
boost::optional<ValueType> threshold; boost::optional<ValueType> threshold;
boost::optional<storm::storage::BitVector> relevantValueVector; boost::optional<storm::storage::BitVector> relevantValueVector;
// We only want to know if it **is** a shielding task
bool shieldingTask;
}; };
template<typename ValueType, typename MatrixType> template<typename ValueType, typename MatrixType>

Loading…
Cancel
Save