Merge branch 'jani_support' into future

Former-commit-id: fb0a4e4b1a [formerly c1346ef7fa]
Former-commit-id: 641ee7306b

.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
+*.out

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<storm::ppg::ProgramLocation*> currentStack;
             std::vector<storm::ppg::ProgramLocation*> 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;