diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt index 5d8bf56..2325d92 100644 --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -2,6 +2,7 @@ list(APPEND SRCS ${CMAKE_CURRENT_LIST_DIR}/cell.cpp ${CMAKE_CURRENT_LIST_DIR}/MinigridGrammar.h ${CMAKE_CURRENT_LIST_DIR}/Grid.cpp + ${CMAKE_CURRENT_LIST_DIR}/PrismPrinter.cpp ${CMAKE_CURRENT_LIST_DIR}/PrismModulesPrinter.cpp ${CMAKE_CURRENT_LIST_DIR}/PrismFormulaPrinter.cpp ${CMAKE_CURRENT_LIST_DIR}/popl.hpp diff --git a/util/PrismFormulaPrinter.cpp b/util/PrismFormulaPrinter.cpp index 74b7ff3..0bcdd69 100644 --- a/util/PrismFormulaPrinter.cpp +++ b/util/PrismFormulaPrinter.cpp @@ -4,11 +4,6 @@ #include #include -std::string capitalize(std::string string) { - string[0] = std::toupper(string[0]); - return string; -} - std::string vectorToDisjunction(const std::vector &formulae) { bool first = true; std::string disjunction = ""; diff --git a/util/PrismFormulaPrinter.h b/util/PrismFormulaPrinter.h index 058849d..97f77f8 100644 --- a/util/PrismFormulaPrinter.h +++ b/util/PrismFormulaPrinter.h @@ -7,7 +7,6 @@ #include "ConfigYaml.h" -std::string capitalize(std::string string); std::string vectorToDisjunction(const std::vector &formulae); std::string cellToConjunction(const AgentName &agentName, const cell &c); std::string coordinatesToConjunction(const AgentName &agentName, const coordinates &c, const ViewDirection viewDirection); diff --git a/util/PrismPrinter.cpp b/util/PrismPrinter.cpp new file mode 100644 index 0000000..4c172f1 --- /dev/null +++ b/util/PrismPrinter.cpp @@ -0,0 +1,8 @@ +#include "PrismPrinter.h" + +#include + +std::string capitalize(std::string string) { + string[0] = std::toupper(string[0]); + return string; +} diff --git a/util/PrismPrinter.h b/util/PrismPrinter.h index a120803..0d28af0 100644 --- a/util/PrismPrinter.h +++ b/util/PrismPrinter.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "cell.h" @@ -12,6 +13,8 @@ typedef std::map KeyNameAndPositionMap; typedef std::pair CellAndCondition; +std::string capitalize(std::string string); + namespace prism { enum class ModelType { MDP, SMG