Browse Source

Fixed minor issue in cli

Former-commit-id: ed63925765
tempestpy_adaptions
dehnert 10 years ago
parent
commit
e4968b1dde
  1. 4
      examples/dtmc/crowds/crowds15_5.pm
  2. 5
      examples/dtmc/crowds/crowds20_5.pm
  3. 2
      src/utility/cli.h

4
examples/dtmc/crowds/crowds15_5.pm

@ -2,9 +2,9 @@ dtmc
// probability of forwarding // probability of forwarding
const double PF = 0.8; const double PF = 0.8;
const double notPF = .2; // must be 1-PF
const double notPF = 0.2; // must be 1-PF
// probability that a crowd member is bad // probability that a crowd member is bad
const double badC = .167;
const double badC = 0.167;
// probability that a crowd member is good // probability that a crowd member is good
const double goodC = 0.833; const double goodC = 0.833;
// Total number of protocol runs to analyze // Total number of protocol runs to analyze

5
examples/dtmc/crowds/crowds20_5.pm

@ -2,9 +2,9 @@ dtmc
// probability of forwarding // probability of forwarding
const double PF = 0.8; const double PF = 0.8;
const double notPF = .2; // must be 1-PF
const double notPF = 0.2; // must be 1-PF
// probability that a crowd member is bad // probability that a crowd member is bad
const double badC = .167;
const double badC = 0.167;
// probability that a crowd member is good // probability that a crowd member is good
const double goodC = 0.833; const double goodC = 0.833;
// Total number of protocol runs to analyze // Total number of protocol runs to analyze
@ -108,3 +108,4 @@ endmodule
label "observe0Greater1" = observe0 > 1; label "observe0Greater1" = observe0 > 1;
label "observeIGreater1" = observe1 > 1 | observe2 > 1 | observe3 > 1 | observe4 > 1 | observe5 > 1 | observe6 > 1 | observe7 > 1 | observe8 > 1 | observe9 > 1 | observe10 > 1 | observe11 > 1 | observe12 > 1 | observe13 > 1 | observe14 > 1 | observe15 > 1 | observe16 > 1 | observe17 > 1 | observe18 > 1 | observe19 > 1; label "observeIGreater1" = observe1 > 1 | observe2 > 1 | observe3 > 1 | observe4 > 1 | observe5 > 1 | observe6 > 1 | observe7 > 1 | observe8 > 1 | observe9 > 1 | observe10 > 1 | observe11 > 1 | observe12 > 1 | observe13 > 1 | observe14 > 1 | observe15 > 1 | observe16 > 1 | observe17 > 1 | observe18 > 1 | observe19 > 1;
label "observeOnlyTrueSender" = observe0 > 1 & observe1 <= 1 & observe2 <= 1 & observe3 <= 1 & observe4 <= 1 & observe5 <= 1 & observe6 <= 1 & observe7 <= 1 & observe8 <= 1 & observe9 <= 1 & observe10 <= 1 & observe11 <= 1 & observe12 <= 1 & observe13 <= 1 & observe14 <= 1 & observe15 <= 1 & observe16 <= 1 & observe17 <= 1 & observe18 <= 1 & observe19 <= 1; label "observeOnlyTrueSender" = observe0 > 1 & observe1 <= 1 & observe2 <= 1 & observe3 <= 1 & observe4 <= 1 & observe5 <= 1 & observe6 <= 1 & observe7 <= 1 & observe8 <= 1 & observe9 <= 1 & observe10 <= 1 & observe11 <= 1 & observe12 <= 1 & observe13 <= 1 & observe14 <= 1 & observe15 <= 1 & observe16 <= 1 & observe17 <= 1 & observe18 <= 1 & observe19 <= 1;

2
src/utility/cli.h

@ -426,7 +426,7 @@ namespace storm {
} else { } else {
storm::modelchecker::SparseDtmcEliminationModelChecker<ValueType> modelchecker2(*dtmc); storm::modelchecker::SparseDtmcEliminationModelChecker<ValueType> modelchecker2(*dtmc);
if (modelchecker2.canHandle(*formula.get())) { if (modelchecker2.canHandle(*formula.get())) {
modelchecker2.check(*formula.get());
result = modelchecker2.check(*formula.get());
} }
} }
} else if (model->getType() == storm::models::ModelType::Mdp) { } else if (model->getType() == storm::models::ModelType::Mdp) {

Loading…
Cancel
Save