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

Added a test to verify the RowSum Function in the Sparse Matrix. 

Added an option to the settings for auto-fixing missing no-selfloop states. Kind of a super-option above fix-nodeadlocks, perhaps some Cleanup later on.
Modified tra Files to comply with formats...
tempestpy_adaptions
PBerger 12 years ago
parent
1edd306032
commit
9a9cd968d9
4 changed files with 84 additions and 18 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. 73
      src/parser/DeterministicSparseTransitionParser.cpp
  2. 9
      src/storage/SparseMatrix.h
  3. 1
      src/utility/Settings.cpp
  4. 9
      test/storage/SparseMatrixTest.cpp

73
src/parser/DeterministicSparseTransitionParser.cpp
View File

@ -66,9 +66,10 @@ uint_fast64_t DeterministicSparseTransitionParser::firstPass(char* buf, int_fast
if ((non_zero = strtol(buf, &buf, 10)) == 0) return 0; if ((non_zero = strtol(buf, &buf, 10)) == 0) return 0;
/* /*
* Check all transitions for non-zero diagonal entrys.
* Check all transitions for existing diagonal entrys.
*/ */
int_fast64_t row, lastrow = -1, col;
int_fast64_t row, col;
int_fast64_t lastDiagonal = -1;
double val; double val;
maxnode = 0; maxnode = 0;
while (buf[0] != '\0') { while (buf[0] != '\0') {
@ -80,17 +81,29 @@ uint_fast64_t DeterministicSparseTransitionParser::firstPass(char* buf, int_fast
/* /*
* Check if one is larger than the current maximum id. * Check if one is larger than the current maximum id.
*/ */
if (row > maxnode) maxnode = row;
if (col > maxnode) maxnode = col;
if (row > maxnode) {
maxnode = row;
}
if (col > maxnode) {
maxnode = col;
}
/* /*
* Check if a node was skipped, i.e. if a node has no outgoing
* transitions. If so, increase non_zero, as the second pass will
* Check if a self-loop was skipped. If so, increase non_zero, as the second pass will
* either throw an exception (in this case, it doesn't matter * either throw an exception (in this case, it doesn't matter
* anyway) or add a self-loop (in this case, we'll need the * anyway) or add a self-loop (in this case, we'll need the
* additional transition). * additional transition).
*/ */
if (lastrow < row - 1) non_zero += row - lastrow - 1;
lastrow = row;
if (lastDiagonal < (row - 1)) {
non_zero += row - 1 - lastDiagonal;
lastDiagonal = row - 1;
}
/*
* Check if this is a self-loop and remember that
*/
if (row == col) {
lastDiagonal = row;
}
/* /*
* Read probability of this transition. * Read probability of this transition.
* Check, if the value is a probability, i.e. if it is between 0 and 1. * Check, if the value is a probability, i.e. if it is between 0 and 1.
@ -103,6 +116,10 @@ uint_fast64_t DeterministicSparseTransitionParser::firstPass(char* buf, int_fast
buf = trimWhitespaces(buf); buf = trimWhitespaces(buf);
} }
if (lastDiagonal < (row - 1)) {
non_zero += row - 1 - lastDiagonal;
}
return non_zero; return non_zero;
} }
@ -171,12 +188,15 @@ DeterministicSparseTransitionParser::DeterministicSparseTransitionParser(std::st
this->matrix->initialize(non_zero); this->matrix->initialize(non_zero);
int_fast64_t row, lastrow = -1, col; int_fast64_t row, lastrow = -1, col;
int_fast64_t lastDiagonal = -1;
double val; double val;
bool fixDeadlocks = storm::settings::instance()->isSet("fix-deadlocks"); bool fixDeadlocks = storm::settings::instance()->isSet("fix-deadlocks");
bool fixSelfloops = storm::settings::instance()->isSet("fix-selfloops");
bool hadDeadlocks = false; bool hadDeadlocks = false;
bool hadNoSelfLoops = false;
/* /*
* Read all transitions from file. Note that we assume, that the
* Read all transitions from file. Note that we assume that the
* transitions are listed in canonical order, otherwise this will not * transitions are listed in canonical order, otherwise this will not
* work, i.e. the values in the matrix will be at wrong places. * work, i.e. the values in the matrix will be at wrong places.
*/ */
@ -189,24 +209,53 @@ DeterministicSparseTransitionParser::DeterministicSparseTransitionParser(std::st
val = checked_strtod(buf, &buf); val = checked_strtod(buf, &buf);
/* /*
* Check if we skipped a node, i.e. if a node does not have any
* Check if a self-loop was skipped.
*/
if (lastDiagonal < (row - 1)) {
/*
* Check if we skipped a node entirely, i.e. a node does not have any
* outgoing transitions. * outgoing transitions.
*/ */
if ((lastrow + 1) < row) {
for (int_fast64_t node = lastrow + 1; node < row; node++) { for (int_fast64_t node = lastrow + 1; node < row; node++) {
hadDeadlocks = true; hadDeadlocks = true;
if (fixDeadlocks) {
this->matrix->addNextValue(node, node, 1);
if (fixDeadlocks || fixSelfloops) {
this->matrix->addNextValue(node, node, storm::utility::constGetOne<double>());
LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": node " << node << " has no outgoing transitions. A self-loop was inserted."); LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": node " << node << " has no outgoing transitions. A self-loop was inserted.");
} else { } else {
LOG4CPLUS_ERROR(logger, "Error while parsing " << filename << ": node " << node << " has no outgoing transitions."); LOG4CPLUS_ERROR(logger, "Error while parsing " << filename << ": node " << node << " has no outgoing transitions.");
} }
} }
} else {
// there were other transitions but no self-loop
for (int_fast64_t node = lastDiagonal + 1; node < row; node++) {
hadNoSelfLoops = true;
if (fixSelfloops) {
this->matrix->addNextValue(node, node, storm::utility::constGetZero<double>());
LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": node " << node << " has no self transition. A self-loop was inserted.");
} else {
LOG4CPLUS_ERROR(logger, "Error while parsing " << filename << ": node " << node << " has no self transition.");
}