updated dataflow

tsung-wei-huang · tsung-wei-huang · commit 764f93f57f5b · 2019-04-03T14:32:11.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -153,8 +153,11 @@ target_link_libraries(dynamic_traversal ${PROJECT_NAME} Threads::Threads)
 add_executable(framework ${TF_EXAMPLE_DIR}/framework.cpp)
 target_link_libraries(framework ${PROJECT_NAME} Threads::Threads) 
 
-#add_executable(dataflow ${TF_EXAMPLE_DIR}/dataflow.cpp)
-#target_link_libraries(dataflow ${PROJECT_NAME} Threads::Threads)  
+add_executable(dice_pools ${TF_EXAMPLE_DIR}/dice_pools.cpp)
+target_link_libraries(dice_pools ${PROJECT_NAME} Threads::Threads)  
+
+add_executable(get_best_dice ${TF_EXAMPLE_DIR}/get_best_dice.cpp)
+target_link_libraries(get_best_dice ${PROJECT_NAME} Threads::Threads)  
 
 add_executable(composition ${TF_EXAMPLE_DIR}/composition.cpp)
 target_link_libraries(composition ${PROJECT_NAME} Threads::Threads) 
diff --git a/example/dataflow.hpp b/example/dataflow.hpp
@@ -1,3 +1,6 @@
+// 2019/02/25 - contributed by Paolo Bolzoni
+//  - a generic wrapper for dataflow
+
 #ifndef DATAFLOW_HPP
 #define DATAFLOW_HPP 1
 
@@ -44,7 +47,8 @@ class Dataflow_generator;
 // For convenience output pads can be accessed with the [] operator
 template <typename T>
 class Node {
-public:
+  
+  public:
     // get input pad
     T const& ipad(Pad_id<T> id) const;
 
@@ -58,8 +62,7 @@ class Node {
     // get all the output pad ids
     std::vector< Pad_id<T> > const& opad_list() const;
 
-
-private:
+  private:
     std::vector<T>& pads_;
     std::vector< Pad_id<T> > ipads_;
     std::vector< Pad_id<T> > opads_;
@@ -86,7 +89,7 @@ class Node {
 // execution is done via taskflow taskflow.run_until
 template <typename T>
 class Dataflow_generator {
-public:
+  public:
     // creates a new node
     Node_id<T> create_node();
 
@@ -112,7 +115,7 @@ class Dataflow_generator {
     void start_flow_once();
 
     Dataflow_generator() = default;
-private:
+  private:
     std::vector<T> pads_;
     std::vector< Node<T> > nodes_;
     std::vector<tf::Task> tasks_;
diff --git a/example/get_best_dice.cpp b/example/get_best_dice.cpp
@@ -122,19 +122,20 @@ void write_out(Node& node) {
 
 
 int main() {
-    Dataflow_generator gg{};
 
-    auto output = gg.create_node(write_out);
-    auto pickup = gg.create_node(pick_up_max);
-    gg.create_arc(pickup, output);
+  Dataflow_generator gg{};
 
-    //try to increase or reduce the number of dice pools
-    int nr_dice_pools{ 5 };
-    while (nr_dice_pools-- > 0) {
-        gg.create_arc(gg.create_node(Fill_up_vector{}), pickup);
-    }
+  auto output = gg.create_node(write_out);
+  auto pickup = gg.create_node(pick_up_max);
+  gg.create_arc(pickup, output);
+
+  //try to increase or reduce the number of dice pools
+  int nr_dice_pools{ 5 };
+  while (nr_dice_pools-- > 0) {
+      gg.create_arc(gg.create_node(Fill_up_vector{}), pickup);
+  }
 
-    int times{ 10 };
-    gg.start_flow([&times]() { return times-- == 0; });
+  int times{ 10 };
+  gg.start_flow([&times]() { return times-- == 0; });
 }
 
