[examples][dataflow] explicitly transfer ownership when adding a node…

… to the graph
STORM-IRIT · Jan 31, 2023 · a4d7d7a · a4d7d7a
1 parent 421018c
commit a4d7d7a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/examples/DataflowExamples/FunctionalsGraph/main.cpp b/examples/DataflowExamples/FunctionalsGraph/main.cpp
@@ -37,12 +37,12 @@ int main( int argc, char* argv[] ) {
     //! [Creating Nodes]
 
     //! [Adding Nodes to the graph]
-    g.addNode( sourceNode );
-    g.addNode( mapSource );
-    g.addNode( transformNode );
-    g.addNode( reduceNode );
-    g.addNode( sinkNode );
-    g.addNode( scalarSinkNode );
+    g.addNode( std::unique_ptr<Node>( sourceNode ) );
+    g.addNode( std::unique_ptr<Node>( mapSource ) );
+    g.addNode( std::unique_ptr<Node>( transformNode ) );
+    g.addNode( std::unique_ptr<Node>( reduceNode ) );
+    g.addNode( std::unique_ptr<Node>( sinkNode ) );
+    g.addNode( std::unique_ptr<Node>( scalarSinkNode ) );
     //! [Adding Nodes to the graph]
 
     //! [Creating links between Nodes]

diff --git a/examples/DataflowExamples/GraphSerialization/main.cpp b/examples/DataflowExamples/GraphSerialization/main.cpp
@@ -51,9 +51,9 @@ int main( int argc, char* argv[] ) {
         //! [Creating Nodes]
 
         //! [Adding Nodes to the graph]
-        g.addNode( sourceNode );
-        g.addNode( filterNode );
-        g.addNode( sinkNode );
+        g.addNode( std::unique_ptr<Node>( sourceNode ) );
+        g.addNode( std::unique_ptr<Node>( filterNode ) );
+        g.addNode( std::unique_ptr<Node>( sinkNode ) );
         //! [Adding Nodes to the graph]
 
         //! [Creating links between Nodes]

diff --git a/examples/DataflowExamples/HelloGraph/main.cpp b/examples/DataflowExamples/HelloGraph/main.cpp
@@ -16,17 +16,22 @@ int main( int argc, char* argv[] ) {
     //! [Creating an empty graph]
 
     //! [Creating Nodes]
-    auto sourceNode    = new Sources::SingleDataSourceNode<RaVector>( "Source" );
-    auto predicateNode = new Sources::ScalarUnaryPredicateSource( "Selector" );
-    auto filterNode    = new Functionals::FilterNode<RaVector>( "Filter" );
-    auto sinkNode      = new Sinks::SinkNode<RaVector>( "Sink" );
+    auto addedSourceNode    = std::make_unique<Sources::SingleDataSourceNode<RaVector>>( "Source" );
+    auto addedPredicateNode = std::make_unique<Sources::ScalarUnaryPredicateSource>( "Selector" );
+    auto addedFilterNode    = std::make_unique<Functionals::FilterNode<RaVector>>( "Filter" );
+    auto addedSinkNode      = std::make_unique<Sinks::SinkNode<RaVector>>( "Sink" );
+    // get non-owning aliases to ease future node management
+    auto sourceNode    = addedSourceNode.get();
+    auto predicateNode = addedPredicateNode.get();
+    auto filterNode    = addedFilterNode.get();
+    auto sinkNode      = addedSinkNode.get();
     //! [Creating Nodes]
 
     //! [Adding Nodes to the graph]
-    g.addNode( sourceNode );
-    g.addNode( predicateNode );
-    g.addNode( filterNode );
-    g.addNode( sinkNode );
+    g.addNode( std::move( addedSourceNode ) );
+    g.addNode( std::move( addedPredicateNode ) );
+    g.addNode( std::move( addedFilterNode ) );
+    g.addNode( std::move( addedSinkNode ) );
     //! [Adding Nodes to the graph]
 
     //! [Creating links between Nodes]