added variadic arg to precede

tsung-wei-huang · tsung-wei-huang · commit 455652d873a3 · 2018-11-04T16:17:42.000-08:00
diff --git a/example/simple.cpp b/example/simple.cpp
@@ -19,7 +19,7 @@ int main(){
   A.precede(B);  // B runs after A         //  +---+           +-^-+          
   A.precede(C);  // C runs after A         //    |     +---+     |            
   B.precede(D);  // D runs after B         //    +---->| C |-----+            
-  C.precede(D);  // D runs after C         //          +---+                  
+  C.precede(D);  // D runs after C         //          +---+
 
   tf.wait_for_all();  // block until finished
 
diff --git a/taskflow/taskflow.hpp b/taskflow/taskflow.hpp
@@ -245,7 +245,7 @@ class Node {
     Node();
 
     template <typename C>
-    explicit Node(C&&);
+    Node(C&&);
 
     const std::string& name() const;
     
@@ -457,21 +457,25 @@ class Task {
     size_t num_dependents() const;
 
     Task& name(const std::string&);
-    Task& precede(Task);
-    Task& broadcast(std::vector<Task>&);
-    Task& broadcast(std::initializer_list<Task>);
-    Task& gather(std::vector<Task>&);
-    Task& gather(std::initializer_list<Task>);
 
     template <typename C>
     Task& work(C&&);
-  
+
+    template <typename... Ts>
+    Task& precede(Ts&&...);
+    
     template <typename... Bs>
     Task& broadcast(Bs&&...);
-
+    
+    Task& broadcast(std::vector<Task>&);
+    Task& broadcast(std::initializer_list<Task>);
+  
     template <typename... Bs>
     Task& gather(Bs&&...);
 
+    Task& gather(std::vector<Task>&);
+    Task& gather(std::initializer_list<Task>);
+
   private:
 
     Node* _node {nullptr};
@@ -491,15 +495,9 @@ inline Task::Task(Node& t) : _node {&t} {
 inline Task::Task(const Task& rhs) : _node {rhs._node} {
 }
 
-// Function: precede
-inline Task& Task::precede(Task tgt) {
-  _node->precede(*(tgt._node));
-  return *this;
-}
-
 // Function: broadcast
 template <typename... Bs>
-inline Task& Task::broadcast(Bs&&... tgts) {
+Task& Task::broadcast(Bs&&... tgts) {
   (_node->precede(*(tgts._node)), ...);
   return *this;
 }
@@ -524,16 +522,23 @@ inline Task& Task::broadcast(std::initializer_list<Task> tgts) {
   return *this;
 }
 
+// Function: precede
+template <typename... Ts>
+Task& Task::precede(Ts&&... tgts) {
+  (_node->precede(*(tgts._node)), ...);
+  return *this;
+}
+
 // Function: gather
 template <typename... Bs>
-inline Task& Task::gather(Bs&&... tgts) {
-  (tgts.precede(*this), ...);
+Task& Task::gather(Bs&&... tgts) {
+  (tgts._node->precede(*_node), ...);
   return *this;
 }
 
 // Procedure: _gather
 template <typename S>
-inline void Task::_gather(S& tgts) {
+void Task::_gather(S& tgts) {
   for(auto& from : tgts) {
     from._node->precede(*_node);
   }
@@ -1173,6 +1178,7 @@ class BasicTaskflow : public FlowBuilder {
     void wait_for_all();
     void wait_for_topologies();
     void dump(std::ostream&) const;
+    void dump_topologies(std::ostream&) const;
 
     size_t num_nodes() const;
     size_t num_workers() const;
@@ -1415,7 +1421,7 @@ void BasicTaskflow<E>::_schedule(Node& node) {
   _executor->emplace(*this, node);
 }
 
-// Function: dump_topology
+// Function: dump_topologies
 template <template <typename...> typename E>
 std::string BasicTaskflow<E>::dump_topologies() const {
   
@@ -1428,6 +1434,14 @@ std::string BasicTaskflow<E>::dump_topologies() const {
   return os.str();
 }
 
+// Function: dump_topologies
+template <template <typename...> typename E>
+void BasicTaskflow<E>::dump_topologies(std::ostream& os) const {
+  for(const auto& tpg : _topologies) {
+    tpg.dump(os);
+  }
+}
+
 // Function: dump
 template <template <typename...> typename E>
 void BasicTaskflow<E>::dump(std::ostream& os) const {
