Browse Source

Silenced a warning.

tempestpy_adaptions
Tim Quatmann 4 years ago
parent
commit
43db81c18f
  1. 2
      src/storm/modelchecker/multiobjective/pcaa/PcaaWeightVectorChecker.cpp
  2. 4
      src/storm/modelchecker/multiobjective/pcaa/StandardMaPcaaWeightVectorChecker.cpp

2
src/storm/modelchecker/multiobjective/pcaa/PcaaWeightVectorChecker.cpp

@ -35,7 +35,7 @@ namespace storm {
boost::optional<typename SparseModelType::ValueType> PcaaWeightVectorChecker<SparseModelType>::computeWeightedResultBound(bool lower, std::vector<ValueType> const& weightVector, storm::storage::BitVector const& objectiveFilter) const { boost::optional<typename SparseModelType::ValueType> PcaaWeightVectorChecker<SparseModelType>::computeWeightedResultBound(bool lower, std::vector<ValueType> const& weightVector, storm::storage::BitVector const& objectiveFilter) const {
ValueType result = storm::utility::zero<ValueType>(); ValueType result = storm::utility::zero<ValueType>();
for (auto const& objIndex : objectiveFilter) {
for (auto objIndex : objectiveFilter) {
boost::optional<ValueType> const& objBound = (lower == storm::solver::minimize(this->objectives[objIndex].formula->getOptimalityType())) ? this->objectives[objIndex].upperResultBound : this->objectives[objIndex].lowerResultBound; boost::optional<ValueType> const& objBound = (lower == storm::solver::minimize(this->objectives[objIndex].formula->getOptimalityType())) ? this->objectives[objIndex].upperResultBound : this->objectives[objIndex].lowerResultBound;
if (objBound) { if (objBound) {
if (storm::solver::minimize(this->objectives[objIndex].formula->getOptimalityType())) { if (storm::solver::minimize(this->objectives[objIndex].formula->getOptimalityType())) {

4
src/storm/modelchecker/multiobjective/pcaa/StandardMaPcaaWeightVectorChecker.cpp

@ -152,7 +152,7 @@ namespace storm {
std::vector<ValueType> const& objRewards = this->actionRewards[objIndex]; std::vector<ValueType> const& objRewards = this->actionRewards[objIndex];
std::vector<ValueType> subModelObjRewards; std::vector<ValueType> subModelObjRewards;
subModelObjRewards.reserve(result.getNumberOfChoices()); subModelObjRewards.reserve(result.getNumberOfChoices());
for (auto const& choice : result.choices) {
for (auto choice : result.choices) {
subModelObjRewards.push_back(objRewards[choice]); subModelObjRewards.push_back(objRewards[choice]);
} }
result.objectiveRewardVectors.push_back(std::move(subModelObjRewards)); result.objectiveRewardVectors.push_back(std::move(subModelObjRewards));
@ -213,7 +213,7 @@ namespace storm {
VT delta = smallestNonZeroBound / smallestStepBound; VT delta = smallestNonZeroBound / smallestStepBound;
while(true) { while(true) {
bool deltaValid = true; bool deltaValid = true;
for (auto const& objIndex : objectivesWithTimeBound) {
for (auto objIndex : objectivesWithTimeBound) {
auto const& timeBound = timeBounds[objIndex]; auto const& timeBound = timeBounds[objIndex];
if (timeBound/delta != std::floor(timeBound/delta)) { if (timeBound/delta != std::floor(timeBound/delta)) {
deltaValid = false; deltaValid = false;

Loading…
Cancel
Save