modified dump and matrix example

Tsung-Wei Huang · Tsung-Wei Huang · commit f452f047d5fc · 2018-06-21T09:14:29.000-05:00
diff --git a/example/matrix.cpp b/example/matrix.cpp
@@ -118,21 +118,21 @@ void openmp(const std::vector<size_t>& D) {
   std::cout << "Generating matrix As ...\n";
   std::vector<matrix_t> As(D.size());
   #pragma omp parallel for
-  for(int j=0; j<D.size(); ++j) {
+  for(int j=0; j<(int)D.size(); ++j) {
     As[j] = random_matrix(D[j]);
   }
   
   std::cout << "Generating matrix Bs ...\n";
   std::vector<matrix_t> Bs(D.size());
   #pragma omp parallel for
-  for(int j=0; j<D.size(); ++j) {
+  for(int j=0; j<(int)D.size(); ++j) {
     Bs[j] = random_matrix(D[j]);
   }
   
   std::cout << "Computing matrix product values Cs ...\n";
   std::vector<matrix_t> Cs(D.size());
   #pragma omp parallel for
-  for(int j=0; j<D.size(); ++j) {
+  for(int j=0; j<(int)D.size(); ++j) {
     Cs[j] = As[j] * Bs[j];
   }
 
diff --git a/taskflow.hpp b/taskflow.hpp
@@ -1033,19 +1033,13 @@ std::string BasicTaskflow<F>::dump() const {
   
   for(const auto& node : _nodes) {
 
-    os << "  \"";
-    if(!node.name().empty()) os << node.name();
-    else os << &node;
-    os << "\";\n";
+    os << "  \"" << (node.name().empty() ? &node : node.name()) << "\";\n";
 
     for(const auto s : node._successors) {
-      os << "  \"";
-      if(!node.name().empty()) os << node.name();
-      else os << &node;
-      os << "\" -> \"";
-      if(s->name() != "") os << s->name();
-      else os << s;
-      os << "\";\n";  
+      os << "  \"" << (node.name().empty() ? &node : node.name())
+      << "\" -> \""
+      << (s->name().empty() ? s : s->name())
+      << "\";\n";
     }
   }
 
