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

Fixed missing ifdefs. 

Former-commit-id: 1e95658a8f
tempestpy_adaptions
dehnert 10 years ago
parent
780ddd9694
commit
994250a697
2 changed files with 11 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/adapters/ExplicitModelAdapter.h
  2. 2
      src/adapters/MathsatExpressionAdapter.cpp

18
src/adapters/ExplicitModelAdapter.h
View File

@ -233,8 +233,8 @@ namespace storm {
* @param action The action label to select. * @param action The action label to select.
* @return A list of lists of active commands or nothing. * @return A list of lists of active commands or nothing.
*/ */
static boost::optional<std::vector<std::list<storm::prism::Command>>> getActiveCommandsByAction(storm::prism::Program const& program, StateType const* state, std::string const& action) {
boost::optional<std::vector<std::list<storm::prism::Command>>> result((std::vector<std::list<storm::prism::Command>>()));
static boost::optional<std::vector<std::list<std::reference_wrapper<storm::prism::Command const>>>> getActiveCommandsByAction(storm::prism::Program const& program, StateType const* state, std::string const& action) {
boost::optional<std::vector<std::list<std::reference_wrapper<storm::prism::Command const>>>> result((std::vector<std::list<std::reference_wrapper<storm::prism::Command const>>>()));
// Iterate over all modules. // Iterate over all modules.
for (uint_fast64_t i = 0; i < program.getNumberOfModules(); ++i) { for (uint_fast64_t i = 0; i < program.getNumberOfModules(); ++i) {
@ -250,10 +250,10 @@ namespace storm {
// If the module contains the action, but there is no command in the module that is labeled with // If the module contains the action, but there is no command in the module that is labeled with
// this action, we don't have any feasible command combinations. // this action, we don't have any feasible command combinations.
if (commandIndices.empty()) { if (commandIndices.empty()) {
return boost::optional<std::vector<std::list<storm::prism::Command>>>();
return boost::optional<std::vector<std::list<std::reference_wrapper<storm::prism::Command const>>>>();
} }
std::list<storm::prism::Command> commands;
std::list<std::reference_wrapper<storm::prism::Command const>> commands;
// Look up commands by their indices and add them if the guard evaluates to true in the given state. // Look up commands by their indices and add them if the guard evaluates to true in the given state.
for (uint_fast64_t commandIndex : commandIndices) { for (uint_fast64_t commandIndex : commandIndices) {
@ -266,7 +266,7 @@ namespace storm {
// If there was no enabled command although the module has some command with the required action label, // If there was no enabled command although the module has some command with the required action label,
// we must not return anything. // we must not return anything.
if (commands.size() == 0) { if (commands.size() == 0) {
return boost::optional<std::vector<std::list<storm::prism::Command>>>();
return boost::optional<std::vector<std::list<std::reference_wrapper<storm::prism::Command const>>>>();
} }
result.get().push_back(std::move(commands)); result.get().push_back(std::move(commands));
@ -333,12 +333,12 @@ namespace storm {
for (std::string const& action : program.getActions()) { for (std::string const& action : program.getActions()) {
StateType const* currentState = stateInformation.reachableStates[stateIndex]; StateType const* currentState = stateInformation.reachableStates[stateIndex];
boost::optional<std::vector<std::list<storm::prism::Command>>> optionalActiveCommandLists = getActiveCommandsByAction(program, currentState, action);
boost::optional<std::vector<std::list<std::reference_wrapper<storm::prism::Command const>>>> optionalActiveCommandLists = getActiveCommandsByAction(program, currentState, action);
// Only process this action label, if there is at least one feasible solution. // Only process this action label, if there is at least one feasible solution.
if (optionalActiveCommandLists) { if (optionalActiveCommandLists) {
std::vector<std::list<storm::prism::Command>> const& activeCommandList = optionalActiveCommandLists.get();
std::vector<std::list<storm::prism::Command>::const_iterator> iteratorList(activeCommandList.size());
std::vector<std::list<std::reference_wrapper<storm::prism::Command const>>> const& activeCommandList = optionalActiveCommandLists.get();
std::vector<std::list<std::reference_wrapper<storm::prism::Command const>>::const_iterator> iteratorList(activeCommandList.size());
// Initialize the list of iterators. // Initialize the list of iterators.
for (size_t i = 0; i < activeCommandList.size(); ++i) { for (size_t i = 0; i < activeCommandList.size(); ++i) {
@ -408,7 +408,7 @@ namespace storm {
// Add the labels of all commands to this choice. // Add the labels of all commands to this choice.
for (uint_fast64_t i = 0; i < iteratorList.size(); ++i) { for (uint_fast64_t i = 0; i < iteratorList.size(); ++i) {
choice.addChoiceLabel(iteratorList[i]->getGlobalIndex());
choice.addChoiceLabel(iteratorList[i]->get().getGlobalIndex());
} }
double probabilitySum = 0; double probabilitySum = 0;

2
src/adapters/MathsatExpressionAdapter.cpp
View File

@ -1,5 +1,7 @@
#include "src/adapters/MathsatExpressionAdapter.h" #include "src/adapters/MathsatExpressionAdapter.h"
#ifdef STORM_HAVE_MSAT
bool operator==(msat_decl decl1, msat_decl decl2) { bool operator==(msat_decl decl1, msat_decl decl2) {
return decl1.repr == decl2.repr; return decl1.repr == decl2.repr;
} }
#endif
Write Preview
Loading…
Cancel
Save