From 56b301fbbf29c0f5f9f5d4185962fdf31cbd8a1a Mon Sep 17 00:00:00 2001 From: sjunges Date: Wed, 26 Oct 2016 23:28:28 +0200 Subject: [PATCH 1/2] ignore some 3rd party libs Former-commit-id: d0bc9fae26d3e0d160f35498702911e37c87f7bc [formerly 8c878dfd9d0cb088a4c6e7cf89c9b4ed6fc71e64] Former-commit-id: 072c73b61cd59b194c185bc8251d129ccdd475f0 --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ec0bf1a9e..cdffa634d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,8 @@ resources/3rdparty/log4cplus-1.1.3-rc1/ resources/3rdparty/gtest-1.7.0/ resources/3rdparty/eigen/ resources/3rdparty/gmm-4.2/ -resources/3rdparty/cudd-2.5.0/ +resources/3rdparty/cudd-3.0.0/ +resources/3rdparty/carl/ resources/3rdparty/xercesc-3.1.2/ #Visual Studio files *.[Oo]bj @@ -49,4 +50,4 @@ src/utility/storm-version.cpp nbproject/ .DS_Store .idea -*.out \ No newline at end of file +*.out From ebe9992c0b2fb4d95689038485fa19c78bbfbb1c Mon Sep 17 00:00:00 2001 From: sjunges Date: Fri, 11 Nov 2016 19:33:18 +0100 Subject: [PATCH 2/2] Some comments Former-commit-id: 53c95363982122d7e720ad0b290530163d68113b [formerly a9ae691ccb047913654e8f6adec379979c75f30f] Former-commit-id: 4a3ab5776c741db1742ad076e61d973c8068bef3 --- src/builder/ProgramGraphBuilder.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/builder/ProgramGraphBuilder.h b/src/builder/ProgramGraphBuilder.h index 90f78f112..d15355e0d 100644 --- a/src/builder/ProgramGraphBuilder.h +++ b/src/builder/ProgramGraphBuilder.h @@ -110,9 +110,11 @@ namespace storm { { graph = new storm::ppg::ProgramGraph(program.getExpressionManager(), program.getVariableDeclarations()); noActionId = graph->getNoActionId(); - } - + + /** + * Runs the translator. + */ void run() { currentStack.push_back(graph->addLocation(true)); // Terminal state. @@ -124,24 +126,25 @@ namespace storm { buildBlock(program); } - + /** + * Extracts the program graph from the builder. + * @return + */ storm::ppg::ProgramGraph* finalize() { storm::ppg::ProgramGraph* tmp = graph; graph = nullptr; return tmp; } - - - - + std::vector currentStack; std::vector nextStack; - + /// Action id if no action is to be executed. storm::ppg::ProgramActionIdentifier noActionId; - + /// Resulting state of an failed observation. storm::ppg::ProgramLocation* observeFailedState = nullptr; - + /// PGCL Program to translate. storm::pgcl::PgclProgram const& program; + /// Obtained Program Graph. storm::ppg::ProgramGraph* graph;