From 8e680bda966910f2b0bc2f09ec485e2e37fc0469 Mon Sep 17 00:00:00 2001 From: ThomasH Date: Wed, 28 Oct 2015 21:59:04 +0100 Subject: [PATCH] include header Former-commit-id: 9fee7d7e6c02a86c0296fe64fae89c3fc773ecb6 --- src/parser/GspnParser.cpp | 3 +++ src/parser/GspnParser.h | 1 + src/storage/gspn/Marking.h | 18 +++++++++++++++++- src/storm-gspn.cpp | 10 ++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/parser/GspnParser.cpp b/src/parser/GspnParser.cpp index f5999e5f7..ded4f7cf1 100644 --- a/src/parser/GspnParser.cpp +++ b/src/parser/GspnParser.cpp @@ -1,5 +1,8 @@ #include "src/parser/GspnParser.h" storm::gspn::GSPN storm::parser::GspnParser::parse(const std::string &filename) { + + //xercesc::XercesDOMParser; + return storm::gspn::GSPN(); } diff --git a/src/parser/GspnParser.h b/src/parser/GspnParser.h index f519e5a17..4675f80f4 100644 --- a/src/parser/GspnParser.h +++ b/src/parser/GspnParser.h @@ -2,6 +2,7 @@ #define STORM_GSPNPARSER_H #include +#include #include "src/storage/gspn/GSPN.h" namespace storm { diff --git a/src/storage/gspn/Marking.h b/src/storage/gspn/Marking.h index 0eda58f03..8f5e1400c 100644 --- a/src/storage/gspn/Marking.h +++ b/src/storage/gspn/Marking.h @@ -45,7 +45,23 @@ namespace storm { * @param place The place from which the tokens are counted. * @return The number of tokens at the place. */ - uint_fast64_t getNumberOfTokensAt(uint_fast64_t place); + uint_fast64_t getNumberOfTokensAt(uint_fast64_t place); + + /*! + * Reset the number of places. + * If the new number of places is larger than the old one, the new places start with 0 tokens. + * If the new number of places is smaller than the old one, the places which are going to be + * erased must not contain any tokens. + * + * @param numberOfPlaces The new number of places. + * @return Return True if the change is made. + */ + bool setNumberOfPlaces(uint_fast64_t numberOfPlaces); + + /*! + * + */ + bool setMaxNumberOfTokens(uint_fast64_t maxNumberOfTokens); private: // the maximal number of places in the gspn uint_fast64_t numberOfPlaces; diff --git a/src/storm-gspn.cpp b/src/storm-gspn.cpp index 52e8c6069..8cb7211c4 100644 --- a/src/storm-gspn.cpp +++ b/src/storm-gspn.cpp @@ -1,12 +1,22 @@ +#include #include "src/exceptions/BaseException.h" +#include "src/parser/GspnParser.h" +#include "src/storage/gspn/GSPN.h" #include "src/utility/macros.h" #include "src/utility/initialize.h" int main(const int argc, const char** argv) { + if (argc != 2) { + std::cout << "Error: incorrect number of parameters!" << std::endl << std::endl; + std::cout << "Usage:" << std::endl; + std::cout << "storm-gspn " << std::endl; + } + try { storm::utility::setUp(); // Parse GSPN from xml + storm::gspn::GSPN gspn = storm::parser::GspnParser::parse(argv[1]); // Construct MA