Sebastian Junges
5 years ago
23 changed files with 396 additions and 243 deletions
-
3CHANGELOG.md
-
13src/storm-cli-utilities/model-handling.h
-
2src/storm-dft/parser/DFTGalileoParser.cpp
-
2src/storm-gspn/api/storm-gspn.cpp
-
30src/storm-parsers/parser/DirectEncodingParser.cpp
-
15src/storm/api/builder.h
-
56src/storm/builder/BuilderOptions.cpp
-
149src/storm/builder/DdJaniModelBuilder.cpp
-
19src/storm/builder/DdJaniModelBuilder.h
-
90src/storm/builder/DdPrismModelBuilder.cpp
-
10src/storm/builder/DdPrismModelBuilder.h
-
101src/storm/builder/TerminalStatesGetter.cpp
-
58src/storm/builder/TerminalStatesGetter.h
-
2src/storm/settings/SettingsManager.cpp
-
12src/storm/settings/modules/BuildSettings.cpp
-
13src/storm/settings/modules/BuildSettings.h
-
4src/storm/settings/modules/IOSettings.cpp
-
1src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp
-
2src/storm/storage/dd/cudd/InternalCuddAdd.cpp
-
2src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp
-
23src/storm/utility/file.h
-
8src/test/storm/storage/SparseMatrixTest.cpp
-
24src/test/storm/utility/FileTest.cpp
@ -0,0 +1,101 @@ |
|||
#include "storm/builder/TerminalStatesGetter.h"
|
|||
|
|||
#include "storm/storage/expressions/Expression.h"
|
|||
#include "storm/logic/Formulas.h"
|
|||
|
|||
namespace storm { |
|||
namespace builder { |
|||
void getTerminalStatesFromFormula(storm::logic::Formula const& formula, std::function<void(storm::expressions::Expression const&, bool)> const& terminalExpressionCallback, std::function<void(std::string const&, bool)> const& terminalLabelCallback) { |
|||
if (formula.isAtomicExpressionFormula()) { |
|||
terminalExpressionCallback(formula.asAtomicExpressionFormula().getExpression(), true); |
|||
} else if (formula.isAtomicLabelFormula()) { |
|||
terminalLabelCallback(formula.asAtomicLabelFormula().getLabel(), true); |
|||
} else if (formula.isEventuallyFormula()) { |
|||
storm::logic::Formula const& sub = formula.asEventuallyFormula().getSubformula(); |
|||
if (sub.isAtomicExpressionFormula() || sub.isAtomicLabelFormula()) { |
|||
getTerminalStatesFromFormula(sub, terminalExpressionCallback, terminalLabelCallback); |
|||
} |
|||
} else if (formula.isUntilFormula()) { |
|||
storm::logic::Formula const& right = formula.asUntilFormula().getRightSubformula(); |
|||
if (right.isAtomicExpressionFormula() || right.isAtomicLabelFormula()) { |
|||
getTerminalStatesFromFormula(right, terminalExpressionCallback, terminalLabelCallback); |
|||
} |
|||
storm::logic::Formula const& left = formula.asUntilFormula().getLeftSubformula(); |
|||
if (left.isAtomicExpressionFormula()) { |
|||
terminalExpressionCallback(left.asAtomicExpressionFormula().getExpression(), false); |
|||
} else if (left.isAtomicLabelFormula()) { |
|||
terminalLabelCallback(left.asAtomicLabelFormula().getLabel(), false); |
|||
} |
|||
} else if (formula.isBoundedUntilFormula()) { |
|||
storm::logic::BoundedUntilFormula const& boundedUntil = formula.asBoundedUntilFormula(); |
|||
bool hasLowerBound = false; |
|||
for (uint64_t i = 0; i < boundedUntil.getDimension(); ++i) { |
|||
if (boundedUntil.hasLowerBound(i) && (boundedUntil.getLowerBound(i).containsVariables() || !storm::utility::isZero(boundedUntil.getLowerBound(i).evaluateAsRational()))) { |
|||
hasLowerBound = true; |
|||
break; |
|||
} |
|||
} |
|||
if (!hasLowerBound) { |
|||
storm::logic::Formula const& right = boundedUntil.getRightSubformula(); |
|||
if (right.isAtomicExpressionFormula() || right.isAtomicLabelFormula()) { |
|||
getTerminalStatesFromFormula(right, terminalExpressionCallback, terminalLabelCallback); |
|||
} |
|||
} |
|||
storm::logic::Formula const& left = boundedUntil.getLeftSubformula(); |
|||
if (left.isAtomicExpressionFormula()) { |
|||
terminalExpressionCallback(left.asAtomicExpressionFormula().getExpression(), false); |
|||
} else if (left.isAtomicLabelFormula()) { |
|||
terminalLabelCallback(left.asAtomicLabelFormula().getLabel(), false); |
|||
} |
|||
} else if (formula.isProbabilityOperatorFormula()) { |
|||
storm::logic::Formula const& sub = formula.asProbabilityOperatorFormula().getSubformula(); |
|||
if (sub.isEventuallyFormula() || sub.isUntilFormula() || sub.isBoundedUntilFormula()) { |
|||
getTerminalStatesFromFormula(sub, terminalExpressionCallback, terminalLabelCallback); |
|||
} |
|||
} else if (formula.isRewardOperatorFormula() || formula.isTimeOperatorFormula()) { |
|||
storm::logic::Formula const& sub = formula.asOperatorFormula().getSubformula(); |
|||
if (sub.isEventuallyFormula()) { |
|||
getTerminalStatesFromFormula(sub, terminalExpressionCallback, terminalLabelCallback); |
|||
} |
|||
} |
|||
} |
|||
|
|||
void TerminalStates::clear() { |
|||
terminalExpressions.clear(); |
|||
negatedTerminalExpressions.clear(); |
|||
terminalLabels.clear(); |
|||
negatedTerminalLabels.clear(); |
|||
} |
|||
|
|||
bool TerminalStates::empty() const { |
|||
return terminalExpressions.empty() && negatedTerminalExpressions.empty() && terminalLabels.empty() && negatedTerminalLabels.empty(); |
|||
} |
|||
|
|||
storm::expressions::Expression TerminalStates::asExpression(std::function<storm::expressions::Expression(std::string const&)> const& labelToExpressionMap) const { |
|||
auto allTerminalExpressions = terminalExpressions; |
|||
for (auto const& e : negatedTerminalExpressions) { |
|||
allTerminalExpressions.push_back(!e); |
|||
} |
|||
for (auto const& l : terminalLabels) { |
|||
allTerminalExpressions.push_back(labelToExpressionMap(l)); |
|||
} |
|||
for (auto const& l : negatedTerminalLabels) { |
|||
allTerminalExpressions.push_back(!labelToExpressionMap(l)); |
|||
} |
|||
STORM_LOG_ASSERT(!allTerminalExpressions.empty(), "Unable to convert empty terminal state set to expression"); |
|||
return storm::expressions::disjunction(allTerminalExpressions); |
|||
} |
|||
|
|||
TerminalStates getTerminalStatesFromFormula(storm::logic::Formula const& formula) { |
|||
TerminalStates result; |
|||
getTerminalStatesFromFormula(formula, [&result](storm::expressions::Expression const& expr, bool inverted){ if(inverted) { result.terminalExpressions.push_back(expr);} else {result.negatedTerminalExpressions.push_back(expr);} }, |
|||
[&result](std::string const& label, bool inverted){ if(inverted) { result.terminalLabels.push_back(label);} else {result.negatedTerminalLabels.push_back(label);} }); |
|||
return result; |
|||
} |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,58 @@ |
|||
#pragma once |
|||
|
|||
#include <functional> |
|||
#include <string> |
|||
#include <vector> |
|||
|
|||
namespace storm { |
|||
|
|||
namespace expressions { |
|||
class Expression; |
|||
} |
|||
namespace logic { |
|||
class Formula; |
|||
} |
|||
|
|||
namespace builder { |
|||
|
|||
/*! |
|||
* Traverses the formula. If an expression (or label) is found such that checking the formula does not require further exploration from a state |
|||
* satisfying (or violating) the expression (or label), the corresponding callback function is called. |
|||
* @param formula The formula to analyzed |
|||
* @param terminalExpressionCallback called on terminal expressions. The corresponding flag indicates whether exploration can stop from states satisfying (true) or violating (false) the expression |
|||
* @param terminalLabelCallback called on terminal labels. The corresponding flag indicates whether exploration can stop from states having (true) or not having (false) the label |
|||
*/ |
|||
void getTerminalStatesFromFormula(storm::logic::Formula const& formula, std::function<void(storm::expressions::Expression const&, bool)> const& terminalExpressionCallback, std::function<void(std::string const&, bool)> const& terminalLabelCallback); |
|||
|
|||
|
|||
struct TerminalStates { |
|||
std::vector<storm::expressions::Expression> terminalExpressions; // if one of these is true, we can stop exploration |
|||
std::vector<storm::expressions::Expression> negatedTerminalExpressions; // if one of these is false, we can stop exploration |
|||
std::vector<std::string> terminalLabels; // if a state has one of these labels, we can stop exploration |
|||
std::vector<std::string> negatedTerminalLabels; // if a state does not have all of these labels, we can stop exploration |
|||
|
|||
/*! |
|||
* Clears all terminal states. After calling this, empty() holds. |
|||
*/ |
|||
void clear(); |
|||
|
|||
/*! |
|||
* True if no terminal states are specified |
|||
*/ |
|||
bool empty() const; |
|||
|
|||
/*! |
|||
* Returns an expression that evaluates to true only if the exploration can stop at the corresponding state |
|||
* Should only be called if this is not empty. |
|||
*/ |
|||
storm::expressions::Expression asExpression(std::function<storm::expressions::Expression(std::string const&)> const& labelToExpressionMap) const; |
|||
}; |
|||
|
|||
/*! |
|||
* Traverses the formula. If an expression (or label) is found such that checking the formula does not require further exploration from a state |
|||
* satisfying (or violating) the expression (or label), it is inserted into the returned struct. |
|||
*/ |
|||
TerminalStates getTerminalStatesFromFormula(storm::logic::Formula const& formula); |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
#include "test/storm_gtest.h"
|
|||
#include "storm-config.h"
|
|||
|
|||
#include "storm/utility/file.h"
|
|||
|
|||
TEST(FileTest, GetLine) { |
|||
std::stringstream stream; |
|||
stream << "Hello world" << std::endl << "This is a test with n\nThis is a test with rn\r\n\nMore tests"; |
|||
|
|||
std::string str; |
|||
int i = 0; |
|||
std::string expected[] = {"Hello world", "This is a test with n", "This is a test with rn", "", "More tests"}; |
|||
while (storm::utility::getline(stream, str)) { |
|||
EXPECT_EQ(str, expected[i]); |
|||
++i; |
|||
} |
|||
} |
|||
|
|||
|
|||
TEST(FileTest, GetLineEmpty) { |
|||
std::stringstream stream; |
|||
std::string str; |
|||
EXPECT_FALSE(storm::utility::getline(stream, str)); |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue