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

Renamed the folders containing the formulas to lowercase to adhere to the naming conventions and Started with testing. 

-Tests for BoundAction done


Former-commit-id: d5698d3d53
main
masawei 11 years ago
parent
df5bafc38b
commit
9fe246a98b
73 changed files with 366 additions and 191 deletions
Unified View
  1. 2
      src/formula/AbstractFilter.h
  2. 24
      src/formula/Csl.h
  3. 20
      src/formula/Ltl.h
  4. 48
      src/formula/Prctl.h
  5. 0
      src/formula/actions/AbstractAction.h
  6. 44
      src/formula/actions/BoundAction.h
  7. 5
      src/formula/actions/FormulaAction.h
  8. 2
      src/formula/actions/InvertAction.h
  9. 2
      src/formula/actions/RangeAction.h
  10. 2
      src/formula/actions/SortAction.h
  11. 0
      src/formula/csl/AbstractCslFormula.h
  12. 2
      src/formula/csl/AbstractPathFormula.h
  13. 2
      src/formula/csl/AbstractStateFormula.h
  14. 2
      src/formula/csl/And.h
  15. 2
      src/formula/csl/Ap.h
  16. 8
      src/formula/csl/CslFilter.h
  17. 4
      src/formula/csl/Eventually.h
  18. 4
      src/formula/csl/Globally.h
  19. 4
      src/formula/csl/Next.h
  20. 2
      src/formula/csl/Not.h
  21. 2
      src/formula/csl/Or.h
  22. 4
      src/formula/csl/ProbabilisticBoundOperator.h
  23. 0
      src/formula/csl/SteadyStateBoundOperator.h
  24. 4
      src/formula/csl/TimeBoundedEventually.h
  25. 4
      src/formula/csl/TimeBoundedUntil.h
  26. 4
      src/formula/csl/Until.h
  27. 0
      src/formula/ltl/AbstractLtlFormula.h
  28. 0
      src/formula/ltl/And.h
  29. 0
      src/formula/ltl/Ap.h
  30. 0
      src/formula/ltl/BoundedEventually.h
  31. 2
      src/formula/ltl/BoundedUntil.h
  32. 2
      src/formula/ltl/Eventually.h
  33. 0
      src/formula/ltl/Globally.h
  34. 4
      src/formula/ltl/LtlFilter.h
  35. 0
      src/formula/ltl/Next.h
  36. 0
      src/formula/ltl/Not.h
  37. 0
      src/formula/ltl/Or.h
  38. 0
      src/formula/ltl/Until.h
  39. 0
      src/formula/ltl/visitor/AbstractLtlFormulaVisitor.cpp
  40. 0
      src/formula/ltl/visitor/AbstractLtlFormulaVisitor.h
  41. 2
      src/formula/prctl/AbstractPathFormula.h
  42. 0
      src/formula/prctl/AbstractPrctlFormula.h
  43. 2
      src/formula/prctl/AbstractRewardPathFormula.h
  44. 2
      src/formula/prctl/AbstractStateFormula.h
  45. 2
      src/formula/prctl/And.h
  46. 2
      src/formula/prctl/Ap.h
  47. 4
      src/formula/prctl/BoundedEventually.h
  48. 4
      src/formula/prctl/BoundedNaryUntil.h
  49. 4
      src/formula/prctl/BoundedUntil.h
  50. 0
      src/formula/prctl/CumulativeReward.h
  51. 4
      src/formula/prctl/Eventually.h
  52. 4
      src/formula/prctl/Globally.h
  53. 0
      src/formula/prctl/InstantaneousReward.h
  54. 4
      src/formula/prctl/Next.h
  55. 0
      src/formula/prctl/Not.h
  56. 2
      src/formula/prctl/Or.h
  57. 8
      src/formula/prctl/PrctlFilter.h
  58. 0
      src/formula/prctl/ProbabilisticBoundOperator.h
  59. 0
      src/formula/prctl/ReachabilityReward.h
  60. 0
      src/formula/prctl/RewardBoundOperator.h
  61. 0
      src/formula/prctl/SteadyStateReward.h
  62. 0
      src/formula/prctl/Until.h
  63. 12
      src/parser/CslParser.cpp
  64. 2
      src/parser/CslParser.h
  65. 4
      src/parser/LtlFileParser.cpp
  66. 20
      src/parser/LtlFileParser.h
  67. 20
      src/parser/LtlParser.cpp
  68. 26
      src/parser/LtlParser.h
  69. 2
      src/parser/PrctlFileParser.h
  70. 20
      src/parser/PrctlParser.cpp
  71. 6
      src/parser/PrctlParser.h
  72. 157
      test/functional/parser/ActionTest.cpp
  73. 39
      test/functional/parser/LtlParserTest.cpp

2
src/formula/AbstractFilter.h
View File

@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "src/formula/AbstractFormula.h" #include "src/formula/AbstractFormula.h"
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
namespace storm { namespace storm {
namespace property { namespace property {

24
src/formula/Csl.h
View File

@ -10,19 +10,19 @@
#include "src/modelchecker/csl/ForwardDeclarations.h" #include "src/modelchecker/csl/ForwardDeclarations.h"
#include "Csl/And.h" #include "csl/And.h"
#include "Csl/Ap.h" #include "csl/Ap.h"
#include "Csl/Next.h" #include "csl/Next.h"
#include "Csl/Not.h" #include "csl/Not.h"
#include "Csl/Or.h" #include "csl/Or.h"
#include "Csl/ProbabilisticBoundOperator.h" #include "csl/ProbabilisticBoundOperator.h"
#include "Csl/SteadyStateBoundOperator.h" #include "csl/SteadyStateBoundOperator.h"
#include "Csl/Until.h" #include "csl/Until.h"
#include "Csl/Eventually.h" #include "csl/Eventually.h"
#include "Csl/Globally.h" #include "csl/Globally.h"
#include "Csl/TimeBoundedEventually.h" #include "csl/TimeBoundedEventually.h"
#include "Csl/TimeBoundedUntil.h" #include "csl/TimeBoundedUntil.h"
#include "modelchecker/csl/AbstractModelChecker.h" #include "modelchecker/csl/AbstractModelChecker.h"

20
src/formula/Ltl.h
View File

@ -10,16 +10,16 @@
#include "src/modelchecker/ltl/ForwardDeclarations.h" #include "src/modelchecker/ltl/ForwardDeclarations.h"
#include "Ltl/And.h" #include "ltl/And.h"
#include "Ltl/Ap.h" #include "ltl/Ap.h"
#include "Ltl/BoundedEventually.h" #include "ltl/BoundedEventually.h"
#include "Ltl/BoundedUntil.h" #include "ltl/BoundedUntil.h"
#include "Ltl/Eventually.h" #include "ltl/Eventually.h"
#include "Ltl/Globally.h" #include "ltl/Globally.h"
#include "Ltl/Next.h" #include "ltl/Next.h"
#include "Ltl/Not.h" #include "ltl/Not.h"
#include "Ltl/Or.h" #include "ltl/Or.h"
#include "Ltl/Until.h" #include "ltl/Until.h"
#include "modelchecker/ltl/AbstractModelChecker.h" #include "modelchecker/ltl/AbstractModelChecker.h"

48
src/formula/Prctl.h
View File

@ -10,30 +10,30 @@
#include "modelchecker/prctl/ForwardDeclarations.h" #include "modelchecker/prctl/ForwardDeclarations.h"
#include "Prctl/And.h" #include "prctl/And.h"
#include "Prctl/Ap.h" #include "prctl/Ap.h"
#include "Prctl/BoundedUntil.h" #include "prctl/BoundedUntil.h"
#include "Prctl/BoundedNaryUntil.h" #include "prctl/BoundedNaryUntil.h"
#include "Prctl/Next.h" #include "prctl/Next.h"
#include "Prctl/Not.h" #include "prctl/Not.h"
#include "Prctl/Or.h" #include "prctl/Or.h"
#include "Prctl/ProbabilisticBoundOperator.h" #include "prctl/ProbabilisticBoundOperator.h"
#include "prctl/Until.h"
#include "Prctl/Until.h" #include "prctl/Eventually.h"
#include "Prctl/Eventually.h" #include "prctl/Globally.h"
#include "Prctl/Globally.h" #include "prctl/BoundedEventually.h"
#include "Prctl/BoundedEventually.h" #include "prctl/InstantaneousReward.h"
#include "prctl/CumulativeReward.h"
#include "Prctl/InstantaneousReward.h" #include "prctl/ReachabilityReward.h"
#include "Prctl/CumulativeReward.h" #include "prctl/RewardBoundOperator.h"
#include "Prctl/ReachabilityReward.h" #include "prctl/SteadyStateReward.h"
#include "Prctl/RewardBoundOperator.h" #include "prctl/AbstractPrctlFormula.h"
#include "Prctl/SteadyStateReward.h" #include "prctl/AbstractStateFormula.h"
#include "prctl/AbstractPathFormula.h"
#include "Prctl/AbstractPrctlFormula.h" #include "prctl/AbstractRewardPathFormula.h"
#include "Prctl/AbstractStateFormula.h"
#include "Prctl/AbstractPathFormula.h"
#include "Prctl/AbstractRewardPathFormula.h"
#include "modelchecker/prctl/AbstractModelChecker.h" #include "modelchecker/prctl/AbstractModelChecker.h"

0
src/formula/Actions/AbstractAction.h → src/formula/actions/AbstractAction.h
View File

44
src/formula/Actions/BoundAction.h → src/formula/actions/BoundAction.h
View File

@ -8,8 +8,9 @@
#ifndef STORM_FORMULA_ACTION_BOUNDACTION_H_ #ifndef STORM_FORMULA_ACTION_BOUNDACTION_H_
#define STORM_FORMULA_ACTION_BOUNDACTION_H_ #define STORM_FORMULA_ACTION_BOUNDACTION_H_
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
#include "src/formula/ComparisonType.h" #include "src/formula/ComparisonType.h"
#include "src/exceptions/InvalidArgumentException.h"
namespace storm { namespace storm {
namespace property { namespace property {
@ -78,8 +79,8 @@ public:
out += ">="; out += ">=";
break; break;
default: default:
LOG4CPLUS_INFO(logger, "Unknown comparison operator of value " << comparisonOperator << "."); LOG4CPLUS_ERROR(logger, "Unknown comparison operator of value " << comparisonOperator << ".");
std::cout << "Unknown comparison operator of value " << comparisonOperator << "." << std::endl; throw storm::exceptions::InvalidArgumentException() << "Unknown comparison operator of value " << comparisonOperator << ".";
break; break;
} }
out += ", "; out += ", ";
@ -100,25 +101,30 @@ private:
if(result.pathResult.size() != 0) { if(result.pathResult.size() != 0) {
//Fill the selction by comapring the values for all previously selected states with theegiven bound using the comparison operator. if(result.stateResult.size() != 0) {
for(uint_fast64_t i = 0; i < result.stateMap.size(); i++) { LOG4CPLUS_WARN(logger, "Both pathResult and stateResult are set. The filter action is applied using only the pathResult.");
if(result.selection[result.stateMap[i]]) { std::cout << "Both pathResult and stateResult are set. The filter action is applied using only the pathResult." << std::endl;
}
//Fill the selection by comparing the values for all previously selected states with the given bound using the comparison operator.
for(uint_fast64_t i = 0; i < result.pathResult.size(); i++) {
if(result.selection[i]) {
switch(comparisonOperator) { switch(comparisonOperator) {
case storm::property::GREATER_EQUAL: case storm::property::GREATER_EQUAL:
out.set(result.pathResult[result.stateMap[i]] >= bound); out.set(i, result.pathResult[i] >= bound);
break; break;
case storm::property::GREATER: case storm::property::GREATER:
out.set(result.pathResult[result.stateMap[i]] > bound); out.set(i, result.pathResult[i] > bound);
break; break;
case storm::property::LESS_EQUAL: case storm::property::LESS_EQUAL:
out.set(result.pathResult[result.stateMap[i]] <= bound); out.set(i, result.pathResult[i] <= bound);
break; break;
case storm::property::LESS: case storm::property::LESS:
out.set(result.pathResult[result.stateMap[i]] < bound); out.set(i, result.pathResult[i] < bound);
break; break;
default: default:
LOG4CPLUS_INFO(logger, "Unknown comparison operator of value " << comparisonOperator << "."); LOG4CPLUS_ERROR(logger, "Unknown comparison operator of value " << comparisonOperator << ".");
std::cout << "Unknown comparison operator of value " << comparisonOperator << "." << std::endl; throw storm::exceptions::InvalidArgumentException() << "Unknown comparison operator of value " << comparisonOperator << ".";
break; break;
} }
} }
@ -127,23 +133,23 @@ private:
//Fill the selction by comapring the values for all previously selected states with theegiven bound using the comparison operator. //Fill the selction by comapring the values for all previously selected states with theegiven bound using the comparison operator.
for(uint_fast64_t i = 0; i < result.stateMap.size(); i++) { for(uint_fast64_t i = 0; i < result.stateMap.size(); i++) {
if(result.selection[result.stateMap[i]]) { if(result.selection[i]) {
switch(comparisonOperator) { switch(comparisonOperator) {
case storm::property::GREATER_EQUAL: case storm::property::GREATER_EQUAL:
out.set(result.stateResult[result.stateMap[i]] >= bound); out.set(i, result.stateResult[i] >= bound);
break; break;
case storm::property::GREATER: case storm::property::GREATER:
out.set(result.stateResult[result.stateMap[i]] > bound); out.set(i, result.stateResult[i] > bound);
break; break;
case storm::property::LESS_EQUAL: case storm::property::LESS_EQUAL:
out.set(result.stateResult[result.stateMap[i]] <= bound); out.set(i, result.stateResult[i] <= bound);
break; break;
case storm::property::LESS: case storm::property::LESS:
out.set(result.stateResult[result.stateMap[i]] < bound); out.set(i, result.stateResult[i] < bound);
break; break;
default: default:
LOG4CPLUS_INFO(logger, "Unknown comparison operator of value " << comparisonOperator << "."); LOG4CPLUS_ERROR(logger, "Unknown comparison operator of value " << comparisonOperator << ".");
std::cout << "Unknown comparison operator of value " << comparisonOperator << "." << std::endl; throw storm::exceptions::InvalidArgumentException() << "Unknown comparison operator of value " << comparisonOperator << ".";
break; break;
} }
} }

5
src/formula/Actions/FormulaAction.h → src/formula/actions/FormulaAction.h
View File

@ -8,8 +8,9 @@
#ifndef STORM_FORMULA_ACTION_FORMULAACTION_H_ #ifndef STORM_FORMULA_ACTION_FORMULAACTION_H_
#define STORM_FORMULA_ACTION_FORMULAACTION_H_ #define STORM_FORMULA_ACTION_FORMULAACTION_H_
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/formula/csl/AbstractStateFormula.h"
#include <string> #include <string>

2
src/formula/Actions/InvertAction.h → src/formula/actions/InvertAction.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_ACTION_INVERTACTION_H_ #ifndef STORM_FORMULA_ACTION_INVERTACTION_H_
#define STORM_FORMULA_ACTION_INVERTACTION_H_ #define STORM_FORMULA_ACTION_INVERTACTION_H_
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
namespace storm { namespace storm {
namespace property { namespace property {

2
src/formula/Actions/RangeAction.h → src/formula/actions/RangeAction.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_ACTION_RANGEACTION_H_ #ifndef STORM_FORMULA_ACTION_RANGEACTION_H_
#define STORM_FORMULA_ACTION_RANGEACTION_H_ #define STORM_FORMULA_ACTION_RANGEACTION_H_
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
namespace storm { namespace storm {
namespace property { namespace property {

2
src/formula/Actions/SortAction.h → src/formula/actions/SortAction.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_ACTION_SORTACTION_H_ #ifndef STORM_FORMULA_ACTION_SORTACTION_H_
#define STORM_FORMULA_ACTION_SORTACTION_H_ #define STORM_FORMULA_ACTION_SORTACTION_H_
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
#include <cctype> #include <cctype>
namespace storm { namespace storm {

0
src/formula/Csl/AbstractCslFormula.h → src/formula/csl/AbstractCslFormula.h
View File

2
src/formula/Csl/AbstractPathFormula.h → src/formula/csl/AbstractPathFormula.h
View File

@ -16,7 +16,7 @@ template<class T> class AbstractPathFormula;
} //namespace property } //namespace property
} //namespace storm } //namespace storm
#include "src/formula/Csl/AbstractCslFormula.h" #include "src/formula/csl/AbstractCslFormula.h"
#include "src/modelchecker/csl/ForwardDeclarations.h" #include "src/modelchecker/csl/ForwardDeclarations.h"
#include <vector> #include <vector>

2
src/formula/Csl/AbstractStateFormula.h → src/formula/csl/AbstractStateFormula.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_CSL_ABSTRACTSTATEFORMULA_H_ #ifndef STORM_FORMULA_CSL_ABSTRACTSTATEFORMULA_H_
#define STORM_FORMULA_CSL_ABSTRACTSTATEFORMULA_H_ #define STORM_FORMULA_CSL_ABSTRACTSTATEFORMULA_H_
#include "src/formula/Csl/AbstractCslFormula.h" #include "src/formula/csl/AbstractCslFormula.h"
#include "src/storage/BitVector.h" #include "src/storage/BitVector.h"
#include "src/modelchecker/csl/ForwardDeclarations.h" #include "src/modelchecker/csl/ForwardDeclarations.h"

2
src/formula/Csl/And.h → src/formula/csl/And.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_CSL_AND_H_ #ifndef STORM_FORMULA_CSL_AND_H_
#define STORM_FORMULA_CSL_AND_H_ #define STORM_FORMULA_CSL_AND_H_
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
#include "src/modelchecker/csl/ForwardDeclarations.h" #include "src/modelchecker/csl/ForwardDeclarations.h"
#include <string> #include <string>

2
src/formula/Csl/Ap.h → src/formula/csl/Ap.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_CSL_AP_H_ #ifndef STORM_FORMULA_CSL_AP_H_
#define STORM_FORMULA_CSL_AP_H_ #define STORM_FORMULA_CSL_AP_H_
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
#include "src/modelchecker/csl/ForwardDeclarations.h" #include "src/modelchecker/csl/ForwardDeclarations.h"

8
src/formula/Csl/CslFilter.h → src/formula/csl/CslFilter.h
View File

@ -9,12 +9,12 @@
#define STORM_FORMULA_PRCTL_CSLFILTER_H_ #define STORM_FORMULA_PRCTL_CSLFILTER_H_
#include "src/formula/AbstractFilter.h" #include "src/formula/AbstractFilter.h"
#include "src/formula/Csl/AbstractCslFormula.h" #include "src/formula/csl/AbstractCslFormula.h"
#include "src/formula/Csl/AbstractPathFormula.h" #include "src/formula/csl/AbstractPathFormula.h"
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/modelchecker/csl/AbstractModelChecker.h" #include "src/modelchecker/csl/AbstractModelChecker.h"
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
namespace storm { namespace storm {
namespace property { namespace property {

4
src/formula/Csl/Eventually.h → src/formula/csl/Eventually.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_CSL_EVENTUALLY_H_ #ifndef STORM_FORMULA_CSL_EVENTUALLY_H_
#define STORM_FORMULA_CSL_EVENTUALLY_H_ #define STORM_FORMULA_CSL_EVENTUALLY_H_
#include "src/formula/Csl/AbstractPathFormula.h" #include "src/formula/csl/AbstractPathFormula.h"
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/modelchecker/csl/ForwardDeclarations.h" #include "src/modelchecker/csl/ForwardDeclarations.h"
namespace storm { namespace storm {

4
src/formula/Csl/Globally.h → src/formula/csl/Globally.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_CSL_GLOBALLY_H_ #ifndef STORM_FORMULA_CSL_GLOBALLY_H_
#define STORM_FORMULA_CSL_GLOBALLY_H_ #define STORM_FORMULA_CSL_GLOBALLY_H_
#include "src/formula/Csl/AbstractPathFormula.h" #include "src/formula/csl/AbstractPathFormula.h"
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
#include "src/modelchecker/csl/ForwardDeclarations.h" #include "src/modelchecker/csl/ForwardDeclarations.h"

4
src/formula/Csl/Next.h → src/formula/csl/Next.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_CSL_NEXT_H_ #ifndef STORM_FORMULA_CSL_NEXT_H_
#define STORM_FORMULA_CSL_NEXT_H_ #define STORM_FORMULA_CSL_NEXT_H_
#include "src/formula/Csl/AbstractPathFormula.h" #include "src/formula/csl/AbstractPathFormula.h"
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
namespace storm { namespace storm {

2
src/formula/Csl/Not.h → src/formula/csl/Not.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_CSL_NOT_H_ #ifndef STORM_FORMULA_CSL_NOT_H_
#define STORM_FORMULA_CSL_NOT_H_ #define STORM_FORMULA_CSL_NOT_H_
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
#include "src/modelchecker/csl/ForwardDeclarations.h" #include "src/modelchecker/csl/ForwardDeclarations.h"

2
src/formula/Csl/Or.h → src/formula/csl/Or.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_CSL_OR_H_ #ifndef STORM_FORMULA_CSL_OR_H_
#define STORM_FORMULA_CSL_OR_H_ #define STORM_FORMULA_CSL_OR_H_
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
namespace storm { namespace storm {

4
src/formula/Csl/ProbabilisticBoundOperator.h → src/formula/csl/ProbabilisticBoundOperator.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_CSL_PROBABILISTICBOUNDOPERATOR_H_ #ifndef STORM_FORMULA_CSL_PROBABILISTICBOUNDOPERATOR_H_
#define STORM_FORMULA_CSL_PROBABILISTICBOUNDOPERATOR_H_ #define STORM_FORMULA_CSL_PROBABILISTICBOUNDOPERATOR_H_
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/formula/Csl/AbstractPathFormula.h" #include "src/formula/csl/AbstractPathFormula.h"
#include "src/formula/ComparisonType.h" #include "src/formula/ComparisonType.h"
#include "utility/constants.h" #include "utility/constants.h"

0
src/formula/Csl/SteadyStateBoundOperator.h → src/formula/csl/SteadyStateBoundOperator.h
View File

4
src/formula/Csl/TimeBoundedEventually.h → src/formula/csl/TimeBoundedEventually.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_CSL_TIMEBOUNDEDEVENTUALLY_H_ #ifndef STORM_FORMULA_CSL_TIMEBOUNDEDEVENTUALLY_H_
#define STORM_FORMULA_CSL_TIMEBOUNDEDEVENTUALLY_H_ #define STORM_FORMULA_CSL_TIMEBOUNDEDEVENTUALLY_H_
#include "src/formula/Csl/AbstractPathFormula.h" #include "src/formula/csl/AbstractPathFormula.h"
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
namespace storm { namespace storm {
namespace property { namespace property {

4
src/formula/Csl/TimeBoundedUntil.h → src/formula/csl/TimeBoundedUntil.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_CSL_TIMEBOUNDEDUNTIL_H_ #ifndef STORM_FORMULA_CSL_TIMEBOUNDEDUNTIL_H_
#define STORM_FORMULA_CSL_TIMEBOUNDEDUNTIL_H_ #define STORM_FORMULA_CSL_TIMEBOUNDEDUNTIL_H_
#include "src/formula/Csl/AbstractPathFormula.h" #include "src/formula/csl/AbstractPathFormula.h"
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
namespace storm { namespace storm {
namespace property { namespace property {

4
src/formula/Csl/Until.h → src/formula/csl/Until.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_CSL_UNTIL_H_ #ifndef STORM_FORMULA_CSL_UNTIL_H_
#define STORM_FORMULA_CSL_UNTIL_H_ #define STORM_FORMULA_CSL_UNTIL_H_
#include "src/formula/Csl/AbstractPathFormula.h" #include "src/formula/csl/AbstractPathFormula.h"
#include "src/formula/Csl/AbstractStateFormula.h" #include "src/formula/csl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
namespace storm { namespace storm {

0
src/formula/Ltl/AbstractLtlFormula.h → src/formula/ltl/AbstractLtlFormula.h
View File

0
src/formula/Ltl/And.h → src/formula/ltl/And.h
View File

0
src/formula/Ltl/Ap.h → src/formula/ltl/Ap.h
View File

0
src/formula/Ltl/BoundedEventually.h → src/formula/ltl/BoundedEventually.h
View File

2
src/formula/Ltl/BoundedUntil.h → src/formula/ltl/BoundedUntil.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_LTL_BOUNDEDUNTIL_H_ #ifndef STORM_FORMULA_LTL_BOUNDEDUNTIL_H_
#define STORM_FORMULA_LTL_BOUNDEDUNTIL_H_ #define STORM_FORMULA_LTL_BOUNDEDUNTIL_H_
#include "src/formula/Ltl/AbstractLtlFormula.h" #include "src/formula/ltl/AbstractLtlFormula.h"
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include "src/modelchecker/ltl/ForwardDeclarations.h" #include "src/modelchecker/ltl/ForwardDeclarations.h"

2
src/formula/Ltl/Eventually.h → src/formula/ltl/Eventually.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_LTL_EVENTUALLY_H_ #ifndef STORM_FORMULA_LTL_EVENTUALLY_H_
#define STORM_FORMULA_LTL_EVENTUALLY_H_ #define STORM_FORMULA_LTL_EVENTUALLY_H_
#include "src/formula/Ltl/AbstractLtlFormula.h" #include "src/formula/ltl/AbstractLtlFormula.h"
#include "src/modelchecker/ltl/ForwardDeclarations.h" #include "src/modelchecker/ltl/ForwardDeclarations.h"
namespace storm { namespace storm {

0
src/formula/Ltl/Globally.h → src/formula/ltl/Globally.h
View File

4
src/formula/Ltl/LtlFilter.h → src/formula/ltl/LtlFilter.h
View File

@ -10,8 +10,8 @@
#include "src/formula/AbstractFilter.h" #include "src/formula/AbstractFilter.h"
#include "src/modelchecker/ltl/AbstractModelChecker.h" #include "src/modelchecker/ltl/AbstractModelChecker.h"
#include "src/formula/Ltl/AbstractLtlFormula.h" #include "src/formula/ltl/AbstractLtlFormula.h"
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
#include "src/exceptions/NotImplementedException.h" #include "src/exceptions/NotImplementedException.h"
namespace storm { namespace storm {

0
src/formula/Ltl/Next.h → src/formula/ltl/Next.h
View File

0
src/formula/Ltl/Not.h → src/formula/ltl/Not.h
View File

0
src/formula/Ltl/Or.h → src/formula/ltl/Or.h
View File

0
src/formula/Ltl/Until.h → src/formula/ltl/Until.h
View File

0
src/formula/Ltl/visitor/AbstractLtlFormulaVisitor.cpp → src/formula/ltl/visitor/AbstractLtlFormulaVisitor.cpp
View File

0
src/formula/Ltl/visitor/AbstractLtlFormulaVisitor.h → src/formula/ltl/visitor/AbstractLtlFormulaVisitor.h
View File

2
src/formula/Prctl/AbstractPathFormula.h → src/formula/prctl/AbstractPathFormula.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_PRCTL_ABSTRACTPATHFORMULA_H_ #ifndef STORM_FORMULA_PRCTL_ABSTRACTPATHFORMULA_H_
#define STORM_FORMULA_PRCTL_ABSTRACTPATHFORMULA_H_ #define STORM_FORMULA_PRCTL_ABSTRACTPATHFORMULA_H_
#include "src/formula/Prctl/AbstractPrctlFormula.h" #include "src/formula/prctl/AbstractPrctlFormula.h"
#include "src/modelchecker/prctl/ForwardDeclarations.h" #include "src/modelchecker/prctl/ForwardDeclarations.h"
#include <vector> #include <vector>

0
src/formula/Prctl/AbstractPrctlFormula.h → src/formula/prctl/AbstractPrctlFormula.h
View File

2
src/formula/Prctl/AbstractRewardPathFormula.h → src/formula/prctl/AbstractRewardPathFormula.h
View File

@ -8,6 +8,8 @@
#ifndef STORM_FORMULA_PRCTL_ABSTRACTREWARDPATHFORMULA_H_ #ifndef STORM_FORMULA_PRCTL_ABSTRACTREWARDPATHFORMULA_H_
#define STORM_FORMULA_PRCTL_ABSTRACTREWARDPATHFORMULA_H_ #define STORM_FORMULA_PRCTL_ABSTRACTREWARDPATHFORMULA_H_
#include "src/formula/prctl/AbstractPrctlFormula.h"
namespace storm { namespace storm {
namespace property { namespace property {
namespace prctl { namespace prctl {

2
src/formula/Prctl/AbstractStateFormula.h → src/formula/prctl/AbstractStateFormula.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_PRCTL_ABSTRACTSTATEFORMULA_H_ #ifndef STORM_FORMULA_PRCTL_ABSTRACTSTATEFORMULA_H_
#define STORM_FORMULA_PRCTL_ABSTRACTSTATEFORMULA_H_ #define STORM_FORMULA_PRCTL_ABSTRACTSTATEFORMULA_H_
#include "src/formula/Prctl/AbstractPrctlFormula.h" #include "src/formula/prctl/AbstractPrctlFormula.h"
#include "src/storage/BitVector.h" #include "src/storage/BitVector.h"
#include "src/modelchecker/prctl/ForwardDeclarations.h" #include "src/modelchecker/prctl/ForwardDeclarations.h"

2
src/formula/Prctl/And.h → src/formula/prctl/And.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_PRCTL_AND_H_ #ifndef STORM_FORMULA_PRCTL_AND_H_
#define STORM_FORMULA_PRCTL_AND_H_ #define STORM_FORMULA_PRCTL_AND_H_
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
#include "src/modelchecker/prctl/ForwardDeclarations.h" #include "src/modelchecker/prctl/ForwardDeclarations.h"
#include <string> #include <string>

2
src/formula/Prctl/Ap.h → src/formula/prctl/Ap.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_PRCTL_AP_H_ #ifndef STORM_FORMULA_PRCTL_AP_H_
#define STORM_FORMULA_PRCTL_AP_H_ #define STORM_FORMULA_PRCTL_AP_H_
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
#include "src/modelchecker/prctl/ForwardDeclarations.h" #include "src/modelchecker/prctl/ForwardDeclarations.h"

4
src/formula/Prctl/BoundedEventually.h → src/formula/prctl/BoundedEventually.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_PRCTL_BOUNDEDEVENTUALLY_H_ #ifndef STORM_FORMULA_PRCTL_BOUNDEDEVENTUALLY_H_
#define STORM_FORMULA_PRCTL_BOUNDEDEVENTUALLY_H_ #define STORM_FORMULA_PRCTL_BOUNDEDEVENTUALLY_H_
#include "src/formula/Prctl/AbstractPathFormula.h" #include "src/formula/prctl/AbstractPathFormula.h"
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
#include <cstdint> #include <cstdint>
#include <string> #include <string>

4
src/formula/Prctl/BoundedNaryUntil.h → src/formula/prctl/BoundedNaryUntil.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_PRCTL_BOUNDEDNARYUNTIL_H_ #ifndef STORM_FORMULA_PRCTL_BOUNDEDNARYUNTIL_H_
#define STORM_FORMULA_PRCTL_BOUNDEDNARYUNTIL_H_ #define STORM_FORMULA_PRCTL_BOUNDEDNARYUNTIL_H_
#include "src/formula/Prctl/AbstractPathFormula.h" #include "src/formula/prctl/AbstractPathFormula.h"
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include <vector> #include <vector>

4
src/formula/Prctl/BoundedUntil.h → src/formula/prctl/BoundedUntil.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_PRCTL_BOUNDEDUNTIL_H_ #ifndef STORM_FORMULA_PRCTL_BOUNDEDUNTIL_H_
#define STORM_FORMULA_PRCTL_BOUNDEDUNTIL_H_ #define STORM_FORMULA_PRCTL_BOUNDEDUNTIL_H_
#include "src/formula/Prctl/AbstractPathFormula.h" #include "src/formula/prctl/AbstractPathFormula.h"
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include "src/modelchecker/prctl/ForwardDeclarations.h" #include "src/modelchecker/prctl/ForwardDeclarations.h"

0
src/formula/Prctl/CumulativeReward.h → src/formula/prctl/CumulativeReward.h
View File

4
src/formula/Prctl/Eventually.h → src/formula/prctl/Eventually.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_PRCTL_EVENTUALLY_H_ #ifndef STORM_FORMULA_PRCTL_EVENTUALLY_H_
#define STORM_FORMULA_PRCTL_EVENTUALLY_H_ #define STORM_FORMULA_PRCTL_EVENTUALLY_H_
#include "src/formula/Prctl/AbstractPathFormula.h" #include "src/formula/prctl/AbstractPathFormula.h"
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/modelchecker/prctl/ForwardDeclarations.h" #include "src/modelchecker/prctl/ForwardDeclarations.h"
namespace storm { namespace storm {

4
src/formula/Prctl/Globally.h → src/formula/prctl/Globally.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_PRCTL_GLOBALLY_H_ #ifndef STORM_FORMULA_PRCTL_GLOBALLY_H_
#define STORM_FORMULA_PRCTL_GLOBALLY_H_ #define STORM_FORMULA_PRCTL_GLOBALLY_H_
#include "src/formula/Prctl/AbstractPathFormula.h" #include "src/formula/prctl/AbstractPathFormula.h"
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
#include "src/modelchecker/prctl/ForwardDeclarations.h" #include "src/modelchecker/prctl/ForwardDeclarations.h"

0
src/formula/Prctl/InstantaneousReward.h → src/formula/prctl/InstantaneousReward.h
View File

4
src/formula/Prctl/Next.h → src/formula/prctl/Next.h
View File

@ -8,8 +8,8 @@
#ifndef STORM_FORMULA_PRCTL_NEXT_H_ #ifndef STORM_FORMULA_PRCTL_NEXT_H_
#define STORM_FORMULA_PRCTL_NEXT_H_ #define STORM_FORMULA_PRCTL_NEXT_H_
#include "src/formula/Prctl/AbstractPathFormula.h" #include "src/formula/prctl/AbstractPathFormula.h"
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
namespace storm { namespace storm {

0
src/formula/Prctl/Not.h → src/formula/prctl/Not.h
View File

2
src/formula/Prctl/Or.h → src/formula/prctl/Or.h
View File

@ -8,7 +8,7 @@
#ifndef STORM_FORMULA_PRCTL_OR_H_ #ifndef STORM_FORMULA_PRCTL_OR_H_
#define STORM_FORMULA_PRCTL_OR_H_ #define STORM_FORMULA_PRCTL_OR_H_
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/formula/AbstractFormulaChecker.h" #include "src/formula/AbstractFormulaChecker.h"
namespace storm { namespace storm {

8
src/formula/Prctl/PrctlFilter.h → src/formula/prctl/PrctlFilter.h
View File

@ -9,11 +9,11 @@
#define STORM_FORMULA_PRCTL_PRCTLFILTER_H_ #define STORM_FORMULA_PRCTL_PRCTLFILTER_H_
#include "src/formula/AbstractFilter.h" #include "src/formula/AbstractFilter.h"
#include "src/formula/Prctl/AbstractPrctlFormula.h" #include "src/formula/prctl/AbstractPrctlFormula.h"
#include "src/formula/Prctl/AbstractPathFormula.h" #include "src/formula/prctl/AbstractPathFormula.h"
#include "src/formula/Prctl/AbstractStateFormula.h" #include "src/formula/prctl/AbstractStateFormula.h"
#include "src/modelchecker/prctl/AbstractModelChecker.h" #include "src/modelchecker/prctl/AbstractModelChecker.h"
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
// TODO: Test if this can be can be ommitted. // TODO: Test if this can be can be ommitted.
namespace storm { namespace storm {

0
src/formula/Prctl/ProbabilisticBoundOperator.h → src/formula/prctl/ProbabilisticBoundOperator.h
View File

0
src/formula/Prctl/ReachabilityReward.h → src/formula/prctl/ReachabilityReward.h
View File

0
src/formula/Prctl/RewardBoundOperator.h → src/formula/prctl/RewardBoundOperator.h
View File

0
src/formula/Prctl/SteadyStateReward.h → src/formula/prctl/SteadyStateReward.h
View File

0
src/formula/Prctl/Until.h → src/formula/prctl/Until.h
View File

12
src/parser/CslParser.cpp
View File

@ -10,12 +10,12 @@
#include "src/utility/constants.h" #include "src/utility/constants.h"
// The action class headers. // The action class headers.
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
#include "src/formula/Actions/BoundAction.h" #include "src/formula/actions/BoundAction.h"
#include "src/formula/Actions/InvertAction.h" #include "src/formula/actions/InvertAction.h"
#include "src/formula/Actions/FormulaAction.h" #include "src/formula/actions/FormulaAction.h"
#include "src/formula/Actions/RangeAction.h" #include "src/formula/actions/RangeAction.h"
#include "src/formula/Actions/SortAction.h" #include "src/formula/actions/SortAction.h"
// If the parser fails due to ill-formed data, this exception is thrown. // If the parser fails due to ill-formed data, this exception is thrown.
#include "src/exceptions/WrongFormatException.h" #include "src/exceptions/WrongFormatException.h"

2
src/parser/CslParser.h
View File

@ -9,7 +9,7 @@
#define STORM_PARSER_CSLPARSER_H_ #define STORM_PARSER_CSLPARSER_H_
#include "src/formula/Csl.h" #include "src/formula/Csl.h"
#include "src/formula/Csl/CslFilter.h" #include "src/formula/csl/CslFilter.h"
#include <functional> #include <functional>
namespace storm { namespace storm {

4
src/parser/LtlFileParser.cpp
View File

@ -15,7 +15,7 @@
namespace storm { namespace storm {
namespace parser { namespace parser {
std::list<storm::property::ltl::LtlFilter<double>*> LtlFileParser(std::string filename) { std::list<storm::property::ltl::LtlFilter<double>*> LtlFileParser::parseLtlFile(std::string filename) {
// Open file // Open file
std::ifstream inputFileStream(filename, std::ios::in); std::ifstream inputFileStream(filename, std::ios::in);
@ -30,7 +30,7 @@ std::list<storm::property::ltl::LtlFilter<double>*> LtlFileParser(std::string fi
std::string line; std::string line;
//The while loop reads the input file line by line //The while loop reads the input file line by line
while (std::getline(inputFileStream, line)) { while (std::getline(inputFileStream, line)) {
result.push_back(storm::parser::LtlParser(line)); result.push_back(storm::parser::LtlParser::parseLtlFormula(line));
} }
} }

20
src/parser/LtlFileParser.h
View File

@ -9,20 +9,24 @@
#define LTLFILEPARSER_H_ #define LTLFILEPARSER_H_
#include "formula/Ltl.h" #include "formula/Ltl.h"
#include "src/formula/Ltl/LtlFilter.h" #include "src/formula/ltl/LtlFilter.h"
#include <list> #include <list>
namespace storm { namespace storm {
namespace parser { namespace parser {
/*! class LtlFileParser {
* Parses each line of a given file as prctl formula and returns a list containing the results of the parsing. public:
* /*!
* @param filename * Parses each line of a given file as prctl formula and returns a list containing the results of the parsing.
* @return The list of parsed formulas *
*/ * @param filename
std::list<storm::property::ltl::LtlFilter<double>*> LtlFileParser(std::string filename); * @return The list of parsed formulas
*/
static std::list<storm::property::ltl::LtlFilter<double>*> parseLtlFile(std::string filename);
};
} //namespace parser } //namespace parser
} //namespace storm } //namespace storm

20
src/parser/LtlParser.cpp
View File

@ -11,11 +11,11 @@
#include "src/utility/constants.h" #include "src/utility/constants.h"
// The action class headers. // The action class headers.
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
#include "src/formula/Actions/BoundAction.h" #include "src/formula/actions/BoundAction.h"
#include "src/formula/Actions/InvertAction.h" #include "src/formula/actions/InvertAction.h"
#include "src/formula/Actions/RangeAction.h" #include "src/formula/actions/RangeAction.h"
#include "src/formula/Actions/SortAction.h" #include "src/formula/actions/SortAction.h"
// If the parser fails due to ill-formed data, this exception is thrown. // If the parser fails due to ill-formed data, this exception is thrown.
#include "src/exceptions/WrongFormatException.h" #include "src/exceptions/WrongFormatException.h"
@ -48,7 +48,7 @@ namespace storm {
namespace parser { namespace parser {
template<typename Iterator, typename Skipper> template<typename Iterator, typename Skipper>
struct LtlGrammar : qi::grammar<Iterator, storm::property::ltl::LtlFilter<double>*(), Skipper > { struct LtlParser::LtlGrammar : qi::grammar<Iterator, storm::property::ltl::LtlFilter<double>*(), Skipper > {
LtlGrammar() : LtlGrammar::base_type(start) { LtlGrammar() : LtlGrammar::base_type(start) {
//This block contains helper rules that may be used several times //This block contains helper rules that may be used several times
freeIdentifierName = qi::lexeme[qi::alpha >> *(qi::alnum | qi::char_('_'))]; freeIdentifierName = qi::lexeme[qi::alpha >> *(qi::alnum | qi::char_('_'))];
@ -182,11 +182,7 @@ struct LtlGrammar : qi::grammar<Iterator, storm::property::ltl::LtlFilter<double
}; };
} //namespace storm storm::property::ltl::LtlFilter<double>* LtlParser::parseLtlFormula(std::string formulaString) {
} //namespace parser
storm::property::ltl::LtlFilter<double>* storm::parser::LtlParser(std::string formulaString) {
// Prepare iterators to input. // Prepare iterators to input.
BaseIteratorType stringIteratorBegin = formulaString.begin(); BaseIteratorType stringIteratorBegin = formulaString.begin();
BaseIteratorType stringIteratorEnd = formulaString.end(); BaseIteratorType stringIteratorEnd = formulaString.end();
@ -239,3 +235,5 @@ storm::property::ltl::LtlFilter<double>* storm::parser::LtlParser(std::string fo
return result_pointer; return result_pointer;
} }
} //namespace parser
} //namespace storm

26
src/parser/LtlParser.h
View File

@ -9,12 +9,20 @@
#define STORM_PARSER_LTLPARSER_H_ #define STORM_PARSER_LTLPARSER_H_
#include "src/formula/Ltl.h" #include "src/formula/Ltl.h"
#include "src/formula/Ltl/LtlFilter.h" #include "src/formula/ltl/LtlFilter.h"
namespace storm { namespace storm {
namespace parser { namespace parser {
/*! /*!
* Reads a LTL formula from a string and return the formula tree.
*
* If you want to read the formula from a file, use the LtlFileParser class instead.
*/
class LtlParser {
public:
/*!
* Reads a LTL formula from its string representation and parses it into a formula tree, consisting of * Reads a LTL formula from its string representation and parses it into a formula tree, consisting of
* classes in the namespace storm::property. * classes in the namespace storm::property.
* *
@ -23,13 +31,17 @@ namespace parser {
* @param formulaString The string representation of the formula * @param formulaString The string representation of the formula
* @throw wrongFormatException If the input could not be parsed successfully * @throw wrongFormatException If the input could not be parsed successfully
*/ */
storm::property::ltl::LtlFilter<double>* LtlParser(std::string formulaString); static storm::property::ltl::LtlFilter<double>* parseLtlFormula(std::string formulaString);
/*! private:
* Struct for the Ltl grammar, that Boost::Spirit uses to parse the formulas. /*!
*/ * Struct for the Ltl grammar, that Boost::Spirit uses to parse the formulas.
template<typename Iterator, typename Skipper> */
struct LtlGrammar; template<typename Iterator, typename Skipper>
struct LtlGrammar;
};
} /* namespace parser */ } /* namespace parser */
} /* namespace storm */ } /* namespace storm */

2
src/parser/PrctlFileParser.h
View File

@ -9,7 +9,7 @@
#define STORM_PARSER_PRCTLFILEPARSER_H_ #define STORM_PARSER_PRCTLFILEPARSER_H_
#include "formula/Prctl.h" #include "formula/Prctl.h"
#include "src/formula/Prctl/PrctlFilter.h" #include "src/formula/prctl/PrctlFilter.h"
#include <list> #include <list>

20
src/parser/PrctlParser.cpp
View File

@ -3,12 +3,12 @@
#include "src/utility/constants.h" #include "src/utility/constants.h"
// The action class headers. // The action class headers.
#include "src/formula/Actions/AbstractAction.h" #include "src/formula/actions/AbstractAction.h"
#include "src/formula/Actions/BoundAction.h" #include "src/formula/actions/BoundAction.h"
#include "src/formula/Actions/InvertAction.h" #include "src/formula/actions/InvertAction.h"
#include "src/formula/Actions/FormulaAction.h" #include "src/formula/actions/FormulaAction.h"
#include "src/formula/Actions/RangeAction.h" #include "src/formula/actions/RangeAction.h"
#include "src/formula/Actions/SortAction.h" #include "src/formula/actions/SortAction.h"
// If the parser fails due to ill-formed data, this exception is thrown. // If the parser fails due to ill-formed data, this exception is thrown.
#include "src/exceptions/WrongFormatException.h" #include "src/exceptions/WrongFormatException.h"
@ -248,10 +248,7 @@ struct PrctlParser::PrctlGrammar : qi::grammar<Iterator, storm::property::prctl:
}; };
} //namespace storm storm::property::prctl::PrctlFilter<double>* PrctlParser::parsePrctlFormula(std::string formulaString) {
} //namespace parser
storm::property::prctl::PrctlFilter<double>* storm::parser::PrctlParser::parsePrctlFormula(std::string formulaString) {
// Prepare iterators to input. // Prepare iterators to input.
BaseIteratorType stringIteratorBegin = formulaString.begin(); BaseIteratorType stringIteratorBegin = formulaString.begin();
BaseIteratorType stringIteratorEnd = formulaString.end(); BaseIteratorType stringIteratorEnd = formulaString.end();
@ -296,3 +293,6 @@ storm::property::prctl::PrctlFilter<double>* storm::parser::PrctlParser::parsePr
return result_pointer; return result_pointer;
} }
} //namespace parser
} //namespace storm

6
src/parser/PrctlParser.h
View File

@ -2,7 +2,7 @@
#define STORM_PARSER_PRCTLPARSER_H_ #define STORM_PARSER_PRCTLPARSER_H_
#include "src/formula/Prctl.h" #include "src/formula/Prctl.h"
#include "src/formula/Prctl/PrctlFilter.h" #include "src/formula/prctl/PrctlFilter.h"
namespace storm { namespace storm {
namespace parser { namespace parser {
@ -11,10 +11,6 @@ namespace parser {
* Reads a PRCTL formula from a string and return the formula tree. * Reads a PRCTL formula from a string and return the formula tree.
* *
* If you want to read the formula from a file, use the PrctlFileParser class instead. * If you want to read the formula from a file, use the PrctlFileParser class instead.
*
* @note
* This class creates a PctlFormula object which can be accessed through the getFormula() method (of base
* class PrctlParser). However, it will not delete this object.
*/ */
class PrctlParser { class PrctlParser {
public: public:

157
test/functional/parser/ActionTest.cpp
View File

@ -0,0 +1,157 @@
/*
* ActionTest.cpp
*
* Created on: Jun 27, 2014
* Author: Manuel Sascha Weiand
*/
#include "gtest/gtest.h"
#include "storm-config.h"
#include "src/formula/actions/BoundAction.h"
#include "src/parser/MarkovAutomatonParser.h"
#include "src/parser/DeterministicModelParser.h"
#include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
#include "src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h"
#include "src/solver/GmmxxLinearEquationSolver.h"
#include "src/exceptions/InvalidArgumentException.h"
typedef typename storm::property::action::AbstractAction<double>::Result Result;
TEST(ActionTest, BoundActionFunctionality) {
// Setup the modelchecker.
storm::models::Dtmc<double> model = storm::parser::DeterministicModelParser::parseDtmc(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/dtmc_actionTest.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/dtmc_actionTest.lab");
storm::modelchecker::prctl::SparseDtmcPrctlModelChecker<double> mc(model, new storm::solver::GmmxxLinearEquationSolver<double>());
// Build the filter input.
// Basically the modelchecking result of "F a" on the used DTMC.
std::vector<double> pathResult = mc.checkEventually(storm::property::prctl::Eventually<double>(new storm::property::prctl::Ap<double>("a")), false);
std::vector<uint_fast64_t> stateMap(pathResult.size());
for(uint_fast64_t i = 0; i < pathResult.size(); i++) {
stateMap[i] = i;
}
Result input(storm::storage::BitVector(pathResult.size(), true), stateMap, pathResult, storm::storage::BitVector());
// Test the action.
// First test that the boundAction build by the empty constructor does not change the selection.
storm::property::action::BoundAction<double> action;
Result result = action.evaluate(input, mc);
for(auto value : result.selection) {
ASSERT_TRUE(input.selection[value]);
}
// Test that using a strict bound can give different results than using a non-strict bound.
action = storm::property::action::BoundAction<double>(storm::property::GREATER, 0);
result = action.evaluate(input, mc);
for(uint_fast64_t i = 0; i < result.selection.size()-2; i++) {
ASSERT_TRUE(result.selection[i]);
}
ASSERT_FALSE(result.selection[6]);
ASSERT_FALSE(result.selection[7]);
// Check whether the state order has any effect on the selected states, which it should not.
for(uint_fast64_t i = 0; i < pathResult.size(); i++) {
stateMap[i] = pathResult.size() - i - 1;
}
action = storm::property::action::BoundAction<double>(storm::property::GREATER, 0);
result = action.evaluate(input, mc);
for(uint_fast64_t i = 0; i < result.selection.size()-2; i++) {
ASSERT_TRUE(result.selection[i]);
}
ASSERT_FALSE(result.selection[6]);
ASSERT_FALSE(result.selection[7]);
// Test the functionality for state formulas instead.
input.pathResult = std::vector<double>();
input.stateResult = mc.checkAp(storm::property::prctl::Ap<double>("a"));
action = storm::property::action::BoundAction<double>(storm::property::GREATER, 0.5);
result = action.evaluate(input, mc);
for(uint_fast64_t i = 0; i < result.selection.size(); i++) {
if(i == 5) {
ASSERT_TRUE(result.selection[i]);
} else {
ASSERT_FALSE(result.selection[i]);
}
}
// Make sure that the modelchecker has no influence on the result.
storm::models::MarkovAutomaton<double> ma = storm::parser::MarkovAutomatonParser::parseMarkovAutomaton(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/ma_general.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/ma_general.lab");
storm::modelchecker::csl::SparseMarkovAutomatonCslModelChecker<double> cslMc(ma);
result = action.evaluate(input, cslMc);
for(uint_fast64_t i = 0; i < result.selection.size(); i++) {
if(i == 5) {
ASSERT_TRUE(result.selection[i]);
} else {
ASSERT_FALSE(result.selection[i]);
}
}
}
TEST(ActionTest, BoundActionSafety) {
// Setup the modelchecker.
storm::models::Dtmc<double> model = storm::parser::DeterministicModelParser::parseDtmc(STORM_CPP_TESTS_BASE_PATH "/functional/parser/tra_files/dtmc_actionTest.tra", STORM_CPP_TESTS_BASE_PATH "/functional/parser/lab_files/dtmc_actionTest.lab");
storm::modelchecker::prctl::SparseDtmcPrctlModelChecker<double> mc(model, new storm::solver::GmmxxLinearEquationSolver<double>());
// Build the filter input.
// Basically the modelchecking result of "F a" on the used DTMC.
std::vector<double> pathResult = mc.checkEventually(storm::property::prctl::Eventually<double>(new storm::property::prctl::Ap<double>("a")), false);
storm::storage::BitVector stateResult = mc.checkAp(storm::property::prctl::Ap<double>("a"));
std::vector<uint_fast64_t> stateMap(pathResult.size());
for(uint_fast64_t i = 0; i < pathResult.size(); i++) {
stateMap[i] = i;
}
Result input(storm::storage::BitVector(pathResult.size(), true), stateMap, pathResult, storm::storage::BitVector());
// First, test unusual bounds.
storm::property::action::BoundAction<double> action(storm::property::LESS, -2044);
Result result;
ASSERT_NO_THROW(result = action.evaluate(input, mc));
ASSERT_EQ(0, result.selection.getNumberOfSetBits());
action = storm::property::action::BoundAction<double>(storm::property::GREATER_EQUAL, 5879);
ASSERT_NO_THROW(result = action.evaluate(input, mc));
ASSERT_EQ(0, result.selection.getNumberOfSetBits());
action = storm::property::action::BoundAction<double>(storm::property::LESS_EQUAL, 5879);
ASSERT_NO_THROW(result = action.evaluate(input, mc));
ASSERT_EQ(result.selection.size(), result.selection.getNumberOfSetBits());
// Now, check the behavior under a undefined comparison type.
action = storm::property::action::BoundAction<double>(static_cast<storm::property::ComparisonType>(10), 5879);
ASSERT_THROW(action.toString(), storm::exceptions::InvalidArgumentException);
ASSERT_THROW(action.evaluate(input, mc), storm::exceptions::InvalidArgumentException);
// Test for a result input with both results filled.
// It should put out a warning and use the pathResult.
action = storm::property::action::BoundAction<double>(storm::property::GREATER_EQUAL, 0.5);
input.stateResult = stateResult;
// To capture the warning, redirect cout and test the written buffer content.
std::stringstream buffer;
std::streambuf *sbuf = std::cout.rdbuf();
std::cout.rdbuf(buffer.rdbuf());
ASSERT_NO_THROW(result = action.evaluate(input, mc));
std::cout.rdbuf(sbuf);
ASSERT_FALSE(buffer.str().empty());
ASSERT_TRUE(result.selection[0]);
ASSERT_FALSE(result.selection[1]);
ASSERT_TRUE(result.selection[2]);
ASSERT_TRUE(result.selection[5]);
// Check for empty input.
ASSERT_NO_THROW(result = action.evaluate(Result(), mc));
}

39
test/functional/parser/LtlParserTest.cpp
View File

@ -12,9 +12,9 @@
TEST(LtlParserTest, parseApOnlyTest) { TEST(LtlParserTest, parseApOnlyTest) {
std::string formula = "ap"; std::string formula = "ap";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr; storm::property::ltl::LtlFilter<double>* ltlFormula = nullptr;
ASSERT_NO_THROW( ASSERT_NO_THROW(
ltlFormula = storm::parser::LtlParser(formula); ltlFormula = storm::parser::LtlParser::parseLtlFormula(formula);
); );
ASSERT_NE(ltlFormula, nullptr); ASSERT_NE(ltlFormula, nullptr);
@ -25,9 +25,9 @@ TEST(LtlParserTest, parseApOnlyTest) {
TEST(LtlParserTest, parsePropositionalFormulaTest) { TEST(LtlParserTest, parsePropositionalFormulaTest) {
std::string formula = "!(a & b) | a & ! c"; std::string formula = "!(a & b) | a & ! c";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr; storm::property::ltl::LtlFilter<double>* ltlFormula = nullptr;
ASSERT_NO_THROW( ASSERT_NO_THROW(
ltlFormula = storm::parser::LtlParser(formula); ltlFormula = storm::parser::LtlParser::parseLtlFormula(formula);
); );
ASSERT_NE(ltlFormula, nullptr); ASSERT_NE(ltlFormula, nullptr);
@ -42,9 +42,9 @@ TEST(LtlParserTest, parsePropositionalFormulaTest) {
*/ */
TEST(LtlParserTest, parseAmbiguousFormulaTest) { TEST(LtlParserTest, parseAmbiguousFormulaTest) {
std::string formula = "F & b"; std::string formula = "F & b";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr; storm::property::ltl::LtlFilter<double>* ltlFormula = nullptr;
ASSERT_NO_THROW( ASSERT_NO_THROW(
ltlFormula = storm::parser::LtlParser(formula); ltlFormula = storm::parser::LtlParser::parseLtlFormula(formula);
); );
ASSERT_NE(ltlFormula, nullptr); ASSERT_NE(ltlFormula, nullptr);
@ -59,9 +59,9 @@ TEST(LtlParserTest, parseAmbiguousFormulaTest) {
*/ */
TEST(LtlParserTest, parseAmbiguousFormulaTest2) { TEST(LtlParserTest, parseAmbiguousFormulaTest2) {
std::string formula = "F F"; std::string formula = "F F";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr; storm::property::ltl::LtlFilter<double>* ltlFormula = nullptr;
ASSERT_NO_THROW( ASSERT_NO_THROW(
ltlFormula = storm::parser::LtlParser(formula); ltlFormula = storm::parser::LtlParser::parseLtlFormula(formula);
); );
ASSERT_NE(ltlFormula, nullptr); ASSERT_NE(ltlFormula, nullptr);
@ -72,14 +72,14 @@ TEST(LtlParserTest, parseAmbiguousFormulaTest2) {
TEST(LtlParserTest, parseBoundedEventuallyFormulaTest) { TEST(LtlParserTest, parseBoundedEventuallyFormulaTest) {
std::string formula = "F<=5 a"; std::string formula = "F<=5 a";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr; storm::property::ltl::LtlFilter<double>* ltlFormula = nullptr;
ASSERT_NO_THROW( ASSERT_NO_THROW(
ltlFormula = storm::parser::LtlParser(formula); ltlFormula = storm::parser::LtlParser::parseLtlFormula(formula);
); );
ASSERT_NE(ltlFormula, nullptr); ASSERT_NE(ltlFormula, nullptr);
storm::property::ltl::BoundedEventually<double>* op = static_cast<storm::property::ltl::BoundedEventually<double>*>(ltlFormula); storm::property::ltl::BoundedEventually<double>* op = static_cast<storm::property::ltl::BoundedEventually<double>*>(ltlFormula->getChild());
ASSERT_EQ(static_cast<uint_fast64_t>(5), op->getBound()); ASSERT_EQ(static_cast<uint_fast64_t>(5), op->getBound());
@ -90,14 +90,14 @@ TEST(LtlParserTest, parseBoundedEventuallyFormulaTest) {
TEST(LtlParserTest, parseBoundedUntilFormulaTest) { TEST(LtlParserTest, parseBoundedUntilFormulaTest) {
std::string formula = "a U<=3 b"; std::string formula = "a U<=3 b";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr; storm::property::ltl::LtlFilter<double>* ltlFormula = nullptr;
ASSERT_NO_THROW( ASSERT_NO_THROW(
ltlFormula = storm::parser::LtlParser(formula); ltlFormula = storm::parser::LtlParser::parseLtlFormula(formula);
); );
ASSERT_NE(ltlFormula, nullptr); ASSERT_NE(ltlFormula, nullptr);
storm::property::ltl::BoundedUntil<double>* op = static_cast<storm::property::ltl::BoundedUntil<double>*>(ltlFormula); storm::property::ltl::BoundedUntil<double>* op = static_cast<storm::property::ltl::BoundedUntil<double>*>(ltlFormula->getChild());
ASSERT_EQ(static_cast<uint_fast64_t>(3), op->getBound()); ASSERT_EQ(static_cast<uint_fast64_t>(3), op->getBound());
@ -108,9 +108,9 @@ TEST(LtlParserTest, parseBoundedUntilFormulaTest) {
TEST(LtlParserTest, parseComplexUntilTest) { TEST(LtlParserTest, parseComplexUntilTest) {
std::string formula = "a U b U<=3 c"; std::string formula = "a U b U<=3 c";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr; storm::property::ltl::LtlFilter<double>* ltlFormula = nullptr;
ASSERT_NO_THROW( ASSERT_NO_THROW(
ltlFormula = storm::parser::LtlParser(formula); ltlFormula = storm::parser::LtlParser::parseLtlFormula(formula);
); );
ASSERT_NE(ltlFormula, nullptr); ASSERT_NE(ltlFormula, nullptr);
@ -121,9 +121,9 @@ TEST(LtlParserTest, parseComplexUntilTest) {
TEST(LtlParserTest, parseComplexFormulaTest) { TEST(LtlParserTest, parseComplexFormulaTest) {
std::string formula = "a U F b | G a & F<=3 a U<=7 b // and a comment"; std::string formula = "a U F b | G a & F<=3 a U<=7 b // and a comment";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr; storm::property::ltl::LtlFilter<double>* ltlFormula = nullptr;
ASSERT_NO_THROW( ASSERT_NO_THROW(
ltlFormula = storm::parser::LtlParser(formula); ltlFormula = storm::parser::LtlParser::parseLtlFormula(formula);
); );
ASSERT_NE(ltlFormula, nullptr); ASSERT_NE(ltlFormula, nullptr);
@ -134,9 +134,8 @@ TEST(LtlParserTest, parseComplexFormulaTest) {
TEST(LtlParserTest, wrongFormulaTest) { TEST(LtlParserTest, wrongFormulaTest) {
std::string formula = "(a | c) & +"; std::string formula = "(a | c) & +";
storm::property::ltl::AbstractLtlFormula<double>* ltlFormula = nullptr;
ASSERT_THROW( ASSERT_THROW(
ltlFormula = storm::parser::LtlParser(formula), storm::parser::LtlParser::parseLtlFormula(formula),
storm::exceptions::WrongFormatException storm::exceptions::WrongFormatException
); );
} }
Write Preview
|||||||
100:0
Loading…
Cancel
Save