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

Bugfix for matrix creation in LRA computation. 

Former-commit-id: cb4c9cb728
tempestpy_adaptions
dehnert 11 years ago
parent
b3601782a9
commit
fde78ad759
1 changed files with 4 additions and 4 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/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h

8
src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
View File

@ -312,7 +312,7 @@ namespace storm {
for (auto element : row) { for (auto element : row) {
if (statesNotContainedInAnyMec.get(element.column())) { if (statesNotContainedInAnyMec.get(element.column())) {
// If the target state is not contained in an MEC, we can copy over the entry. // If the target state is not contained in an MEC, we can copy over the entry.
sspMatrix.insertNextValue(currentChoice, statesNotInMecsBeforeIndex[element.column()], element.value());
sspMatrix.insertNextValue(currentChoice, statesNotInMecsBeforeIndex[element.column()], element.value(), true);
} else { } else {
// If the target state is contained in MEC i, we need to add the probability to the corresponding field in the vector // If the target state is contained in MEC i, we need to add the probability to the corresponding field in the vector
// so that we are able to write the cumulative probability to the MEC into the matrix. // so that we are able to write the cumulative probability to the MEC into the matrix.
@ -323,7 +323,7 @@ namespace storm {
// Now insert all (cumulative) probability values that target an MEC. // Now insert all (cumulative) probability values that target an MEC.
for (uint_fast64_t mecIndex = 0; mecIndex < auxiliaryStateToProbabilityMap.size(); ++mecIndex) { for (uint_fast64_t mecIndex = 0; mecIndex < auxiliaryStateToProbabilityMap.size(); ++mecIndex) {
if (auxiliaryStateToProbabilityMap[mecIndex] != 0) { if (auxiliaryStateToProbabilityMap[mecIndex] != 0) {
sspMatrix.insertNextValue(currentChoice, firstAuxiliaryStateIndex + mecIndex, auxiliaryStateToProbabilityMap[mecIndex]);
sspMatrix.insertNextValue(currentChoice, firstAuxiliaryStateIndex + mecIndex, auxiliaryStateToProbabilityMap[mecIndex], true);
} }
} }
} }
@ -349,7 +349,7 @@ namespace storm {
for (auto element : row) { for (auto element : row) {
if (statesNotContainedInAnyMec.get(element.column())) { if (statesNotContainedInAnyMec.get(element.column())) {
// If the target state is not contained in an MEC, we can copy over the entry. // If the target state is not contained in an MEC, we can copy over the entry.
sspMatrix.insertNextValue(currentChoice, statesNotInMecsBeforeIndex[element.column()], element.value());
sspMatrix.insertNextValue(currentChoice, statesNotInMecsBeforeIndex[element.column()], element.value(), true);
} else { } else {
// If the target state is contained in MEC i, we need to add the probability to the corresponding field in the vector // If the target state is contained in MEC i, we need to add the probability to the corresponding field in the vector
// so that we are able to write the cumulative probability to the MEC into the matrix. // so that we are able to write the cumulative probability to the MEC into the matrix.
@ -366,7 +366,7 @@ namespace storm {
b.back() += auxiliaryStateToProbabilityMap[mecIndex] * lraValuesForEndComponents[mecIndex]; b.back() += auxiliaryStateToProbabilityMap[mecIndex] * lraValuesForEndComponents[mecIndex];
} else { } else {
// Otherwise, we add a transition to the auxiliary state that is associated with the target MEC. // Otherwise, we add a transition to the auxiliary state that is associated with the target MEC.
sspMatrix.insertNextValue(currentChoice, firstAuxiliaryStateIndex + targetMecIndex, auxiliaryStateToProbabilityMap[targetMecIndex]);
sspMatrix.insertNextValue(currentChoice, firstAuxiliaryStateIndex + targetMecIndex, auxiliaryStateToProbabilityMap[targetMecIndex], true);
} }
} }
} }
Write Preview
Loading…
Cancel
Save