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

Fix derivative comparison MonotonicityChecker

tempestpy_adaptions
Jip Spel 6 years ago
parent
9d02519b01
commit
c256bd1677
1 changed files with 3 additions and 5 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. 8
      src/storm-pars/analysis/MonotonicityChecker.cpp

8
src/storm-pars/analysis/MonotonicityChecker.cpp
View File

@ -86,8 +86,7 @@ namespace storm {
std::string color = ""; std::string color = "";
auto val = first.getValue(); auto val = first.getValue();
auto vars = val.gatherVariables(); auto vars = val.gatherVariables();
for (auto itr = vars.begin(); itr != vars.end(); ++itr) {
if (varsMonotone.find(*itr) == varsMonotone.end()) {
for (auto itr = vars.begin(); itr != vars.end(); ++itr) { if (varsMonotone.find(*itr) == varsMonotone.end()) {
varsMonotone[*itr].first = true; varsMonotone[*itr].first = true;
varsMonotone[*itr].second = true; varsMonotone[*itr].second = true;
} }
@ -97,7 +96,6 @@ namespace storm {
for (auto itr2 = transitions.begin(); itr2 != transitions.end(); ++itr2) { for (auto itr2 = transitions.begin(); itr2 != transitions.end(); ++itr2) {
for (auto itr3 = transitions.begin(); itr3 != transitions.end(); ++itr3) { for (auto itr3 = transitions.begin(); itr3 != transitions.end(); ++itr3) {
// TODO improve // TODO improve
auto derivative2 = (*itr2).second.derivative(*itr); auto derivative2 = (*itr2).second.derivative(*itr);
auto derivative3 = (*itr3).second.derivative(*itr); auto derivative3 = (*itr3).second.derivative(*itr);
STORM_LOG_THROW(derivative2.isConstant() && derivative3.isConstant(), storm::exceptions::NotSupportedException, "Expecting derivative to be constant"); STORM_LOG_THROW(derivative2.isConstant() && derivative3.isConstant(), storm::exceptions::NotSupportedException, "Expecting derivative to be constant");
@ -108,8 +106,8 @@ namespace storm {
value->first &=derivative2.constantPart() >= 0; value->first &=derivative2.constantPart() >= 0;
value->second &=derivative2.constantPart() <= 0; value->second &=derivative2.constantPart() <= 0;
} else if (compare == storm::analysis::Lattice::BELOW) { } else if (compare == storm::analysis::Lattice::BELOW) {
value->first &=derivative3.constantPart() <= 0;
value->second &=derivative3.constantPart() >= 0;
value->first &=derivative3.constantPart() >= 0;
value->second &=derivative3.constantPart() <= 0;
} else if (compare == storm::analysis::Lattice::SAME) { } else if (compare == storm::analysis::Lattice::SAME) {
// Behaviour doesn't matter, as they are at the same level // Behaviour doesn't matter, as they are at the same level
} else { } else {

Write Preview
Loading…
Cancel
Save