support get_task, for set task name...

netcan · netcan · commit f1b730bba150 · 2020-08-30T14:33:51.000+08:00
diff --git a/examples/visualization_dsl.cpp b/examples/visualization_dsl.cpp
@@ -17,25 +17,24 @@ int main() {
   def_task(D, { std::cout << "TaskD\n"; };);
   def_task(E, { std::cout << "TaskE\n"; };);
 
-  taskbuild(
+  auto tasks = taskbuild(
     task(A)
       -> fork(B, C)
       -> task(D),
     merge(A, B)
       -> task(E)
   )(tf);
 
-  // std::cout << "[dump without name assignment]\n";
+  std::cout << "[dump without name assignment]\n";
   tf.dump(std::cout);
 
-  // TODO: support set name
-  // std::cout << "[dump with name assignment]\n";
-  // A.name("A");
-  // B.name("B");
-  // C.name("C");
-  // D.name("D");
-  // E.name("E");
-  // tf.dump(std::cout);
+  std::cout << "[dump with name assignment]\n";
+  tasks.get_task<A>().name("A");
+  tasks.get_task<B>().name("B");
+  tasks.get_task<C>().name("C");
+  tasks.get_task<D>().name("D");
+  tasks.get_task<E>().name("E");
+  tf.dump(std::cout);
 
   // ------------------------------------------------------
   // Dynamic Tasking
diff --git a/taskflow/dsl/connection.hpp b/taskflow/dsl/connection.hpp
@@ -36,13 +36,6 @@ struct Chain<auto (*)(F)->T, OUT> {
 
 template <typename FROM, typename TO> struct OneToOneLink {
   template <typename JobsCB> struct InstanceType {
-    template <typename J> struct IsJob {
-      template <typename JobCb> struct apply {
-        constexpr static bool value =
-            std::is_same<typename JobCb::JobType, J>::value;
-      };
-    };
-
     constexpr void build(JobsCB &jobsCb) {
       constexpr size_t JobsCBSize = std::tuple_size<JobsCB>::value;
       constexpr size_t FromJobIndex =
diff --git a/taskflow/dsl/job_trait.hpp b/taskflow/dsl/job_trait.hpp
@@ -18,6 +18,13 @@ template <typename J, typename CONTEXT> struct JobCb {
   Task job_;
 };
 
+template <typename J> struct IsJob {
+    template <typename JobCb> struct apply {
+    constexpr static bool value =
+        std::is_same<typename JobCb::JobType, J>::value;
+    };
+};
+
 template <typename J, typename = void> struct JobTrait;
 
 template <typename... J> struct SomeJob {
diff --git a/taskflow/dsl/task_dsl.hpp b/taskflow/dsl/task_dsl.hpp
@@ -17,12 +17,12 @@ template <typename CONTEXT = EmptyContext, typename... Chains> class TaskDsl {
   template <typename J> struct JobCbWithContext {
     using type = JobCb<J, CONTEXT>;
   };
-  using JobsCb =
+  using JobsCB =
       typename Map_t<AllJobs, JobCbWithContext>::template exportTo<std::tuple>;
 
   using OneToOneLinkSet = typename Analyzer::OneToOneLinkSet;
   template <typename OneToOneLink> struct OneToOneLinkInstanceType {
-    using type = typename OneToOneLink::template InstanceType<JobsCb>;
+    using type = typename OneToOneLink::template InstanceType<JobsCB>;
   };
   using OneToOneLinkInstances =
       typename Map_t<OneToOneLinkSet,
@@ -35,6 +35,15 @@ template <typename CONTEXT = EmptyContext, typename... Chains> class TaskDsl {
     build_links(std::make_index_sequence<OneToOneLinkSet::size>{});
   }
 
+  template<typename Job>
+  Task& get_task() {
+      constexpr size_t JobsCBSize = std::tuple_size<JobsCB>::value;
+      constexpr size_t JobIndex =
+          TupleElementByF_v<JobsCB, IsJob<Job>::template apply>;
+      static_assert(JobIndex < JobsCBSize, "fatal: not find JobCb in JobsCB");
+      return std::get<JobIndex>(jobsCb_).job_;
+  }
+
 private:
   template <size_t... Is>
   void build_jobs_cb(FlowBuilder &flow_builder, const CONTEXT &context,
@@ -49,7 +58,7 @@ template <typename CONTEXT = EmptyContext, typename... Chains> class TaskDsl {
   }
 
 private:
-  JobsCb jobsCb_;
+  JobsCB jobsCb_;
   OneToOneLinkInstances links_;
 };
 
