sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

quantiles: Added support for formulas with trivial bounds (i.e., >=0).

main
TimQu 7 years ago
parent
6e8aef2acc
commit
4ac23d630f
5 changed files with 23 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/storm/modelchecker/prctl/helper/rewardbounded/Dimension.h
  2. 8
      src/storm/modelchecker/prctl/helper/rewardbounded/EpochModel.cpp
  3. 18
      src/storm/modelchecker/prctl/helper/rewardbounded/MultiDimensionalRewardUnfolding.cpp
  4. 14
      src/storm/modelchecker/prctl/helper/rewardbounded/ProductModel.cpp
  5. 2
      src/storm/transformer/EndComponentEliminator.h

4
src/storm/modelchecker/prctl/helper/rewardbounded/Dimension.h
View File

@ -21,8 +21,8 @@ namespace storm {
/// A label that indicates the states where this dimension is still relevant (i.e., it is yet unknown whether the corresponding objective holds)
boost::optional<std::string> memoryLabel;
/// True iff the objective is not bounded at all (i.e., it has lower bound >= 0)
bool isNotBounded;
/// True iff the objective is bounded with either an upper bound or a lower bound which is not >= 0
bool isBounded;
/// True iff the objective is upper bounded, false if it has a lower bound or no bound at all.
bool isUpperBounded;

8
src/storm/modelchecker/prctl/helper/rewardbounded/EpochModel.cpp
View File

@ -238,10 +238,10 @@ namespace storm {
}
}
template class EpochModel<double, true>;
template class EpochModel<double, false>;
template class EpochModel<storm::RationalNumber, true>;
template class EpochModel<storm::RationalNumber, false>;
template struct EpochModel<double, true>;
template struct EpochModel<double, false>;
template struct EpochModel<storm::RationalNumber, true>;
template struct EpochModel<storm::RationalNumber, false>;
}
}
}

18
src/storm/modelchecker/prctl/helper/rewardbounded/MultiDimensionalRewardUnfolding.cpp
View File

@ -95,11 +95,11 @@ namespace storm {
if ((!subformula.hasLowerBound(dim) && !subformula.hasUpperBound(dim)) || (subformula.hasLowerBound(dim) && !subformula.isLowerBoundStrict(dim) && !subformula.getLowerBound(dim).containsVariables() && storm::utility::isZero(subformula.getLowerBound(dim).evaluateAsRational()))) {
dimensionWiseEpochSteps.push_back(std::vector<uint64_t>(model.getTransitionMatrix().getRowCount(), 0));
dimension.scalingFactor = storm::utility::zero<ValueType>();
dimension.isNotBounded = true;
dimension.isBounded = false;
} else if (subformula.getTimeBoundReference(dim).isTimeBound() || subformula.getTimeBoundReference(dim).isStepBound()) {
dimensionWiseEpochSteps.push_back(std::vector<uint64_t>(model.getTransitionMatrix().getRowCount(), 1));
dimension.scalingFactor = storm::utility::one<ValueType>();
dimension.isNotBounded = false;
dimension.isBounded = true;
} else {
STORM_LOG_ASSERT(subformula.getTimeBoundReference(dim).isRewardBound(), "Unexpected type of time bound.");
std::string const& rewardName = subformula.getTimeBoundReference(dim).getRewardName();
@ -110,7 +110,7 @@ namespace storm {
auto discretizedRewardsAndFactor = storm::utility::vector::toIntegralVector<ValueType, uint64_t>(actionRewards);
dimensionWiseEpochSteps.push_back(std::move(discretizedRewardsAndFactor.first));
dimension.scalingFactor = std::move(discretizedRewardsAndFactor.second);
dimension.isNotBounded = false;
dimension.isBounded = true;
}
dimensions.emplace_back(std::move(dimension));
}
@ -121,7 +121,7 @@ namespace storm {
dimension.formula = subformula.restrictToDimension(dim);
dimension.objectiveIndex = objIndex;
dimension.isUpperBounded = true;
dimension.isNotBounded = false;
dimension.isBounded = true;
if (subformula.getTimeBoundReference(dim).isTimeBound() || subformula.getTimeBoundReference(dim).isStepBound()) {
dimensionWiseEpochSteps.push_back(std::vector<uint64_t>(model.getTransitionMatrix().getRowCount(), 1));
dimension.scalingFactor = storm::utility::one<ValueType>();
@ -229,7 +229,7 @@ namespace storm {
ValueType discretizedBound = storm::utility::convertNumber<ValueType>(bound.evaluateAsRational());
// We always consider upper bounds to be non-strict and lower bounds to be strict.
// Thus, >=N would become >N-1. However, note that the case N=0 needs extra treatment
if (!dimensions[dim].isNotBounded) {
if (dimensions[dim].isBounded) {
discretizedBound /= dimensions[dim].scalingFactor;
if (storm::utility::isInteger(discretizedBound)) {
if (isStrict == dimensions[dim].isUpperBounded) {
@ -250,11 +250,11 @@ namespace storm {
typename MultiDimensionalRewardUnfolding<ValueType, SingleObjectiveMode>::Epoch MultiDimensionalRewardUnfolding<ValueType, SingleObjectiveMode>::getStartEpoch() {
Epoch startEpoch = epochManager.getZeroEpoch();
for (uint64_t dim = 0; dim < epochManager.getDimensionCount(); ++dim) {
if (dimensions[dim].isNotBounded) {
epochManager.setBottomDimension(startEpoch, dim);
} else {
if (dimensions[dim].isBounded) {
STORM_LOG_ASSERT(dimensions[dim].maxValue, "No max-value for dimension " << dim << " was given.");
epochManager.setDimensionOfEpoch(startEpoch, dim, dimensions[dim].maxValue.get());
} else {
epochManager.setBottomDimension(startEpoch, dim);
}
}
STORM_LOG_TRACE("Start epoch is " << epochManager.toString(startEpoch));
@ -745,7 +745,6 @@ namespace storm {
}
predecessorEpochs.erase(currentEpoch.get());
successorEpochs.erase(currentEpoch.get());
STORM_LOG_ASSERT(!predecessorEpochs.empty(), "There are no predecessors for the epoch " << epochManager.toString(currentEpoch.get()));
// clean up solutions that are not needed anymore
for (auto const& successorEpoch : successorEpochs) {
@ -794,7 +793,6 @@ namespace storm {
template<typename ValueType, bool SingleObjectiveMode>
typename MultiDimensionalRewardUnfolding<ValueType, SingleObjectiveMode>::SolutionType const& MultiDimensionalRewardUnfolding<ValueType, SingleObjectiveMode>::getInitialStateResult(Epoch const& epoch) {
STORM_LOG_ASSERT(model.getInitialStates().getNumberOfSetBits() == 1, "The model has multiple initial states.");
STORM_LOG_ASSERT(!epochManager.hasBottomDimension(epoch), "Tried to get the initial state result in an epoch that still contains at least one bottom dimension.");
return getStateSolution(epoch, productModel->getInitialProductState(*model.getInitialStates().begin(), model.getInitialStates()));
}

14
src/storm/modelchecker/prctl/helper/rewardbounded/ProductModel.cpp
View File

@ -460,11 +460,11 @@ namespace storm {
Epoch startEpoch = epochManager.getZeroEpoch();
for (uint64_t dim = 0; dim < epochManager.getDimensionCount(); ++dim) {
if (dimensions[dim].isNotBounded) {
epochManager.setBottomDimension(startEpoch, dim);
} else {
if (dimensions[dim].isBounded) {
STORM_LOG_ASSERT(dimensions[dim].maxValue, "No max-value for dimension " << dim << " was given.");
epochManager.setDimensionOfEpoch(startEpoch, dim, dimensions[dim].maxValue.get());
} else {
epochManager.setBottomDimension(startEpoch, dim);
}
}
@ -491,22 +491,24 @@ namespace storm {
void ProductModel<ValueType>::computeReachableStates(EpochClass const& epochClass, std::vector<EpochClass> const& predecessors) {
storm::storage::BitVector bottomDimensions(epochManager.getDimensionCount(), false);
bool considerInitialStates = true;
for (uint64_t dim = 0; dim < epochManager.getDimensionCount(); ++dim) {
if (epochManager.isBottomDimensionEpochClass(epochClass, dim)) {
bottomDimensions.set(dim, true);
if (dimensions[dim].isBounded) {
considerInitialStates = false;
}
}
}
storm::storage::BitVector nonBottomDimensions = ~bottomDimensions;
storm::storage::BitVector ecInStates(getProduct().getNumberOfStates(), false);
if (!epochManager.hasBottomDimensionEpochClass(epochClass)) {
if (considerInitialStates) {
for (auto const& initState : getProduct().getInitialStates()) {
uint64_t transformedInitState = transformProductState(initState, epochClass, memoryStateManager.getInitialMemoryState());
ecInStates.set(transformedInitState, true);
}
}
for (auto const& predecessor : predecessors) {
storm::storage::BitVector positiveStepDimensions(epochManager.getDimensionCount(), false);
for (uint64_t dim = 0; dim < epochManager.getDimensionCount(); ++dim) {

2
src/storm/transformer/EndComponentEliminator.h
View File

@ -53,7 +53,7 @@ namespace storm {
keptStates.set(stateActionsPair.first, false);
}
}
STORM_LOG_DEBUG("Found " << ecs.size() << " end components to eliminate. Keeping " << keptStates.getNumberOfSetBits() << " of " << keptStates.size() << " original states.");
STORM_LOG_DEBUG("Found " << ecs.size() << " end components to eliminate. Keeping " << keptStates.getNumberOfSetBits() << " of " << keptStates.size() << " original states plus " << ecs.size() << "new end component states.");
EndComponentEliminatorReturnType result;
std::vector<uint_fast64_t> newRowGroupIndices;

Write Preview
Loading…
Cancel
Save