sync up with dev

twhuang-utah · twhuang-utah · commit 7c2ef2d5112f · 2020-03-08T20:51:56.000-06:00
diff --git a/unittests/basics.cpp b/unittests/basics.cpp
@@ -1949,6 +1949,8 @@ void flip_coin_cond(unsigned w) {
   executor.run_n(taskflow, 10000).wait();
   
   REQUIRE(std::fabs(avg-32.0)<1.0);
+
+  taskflow.dump(std::cout);
 }
 
 TEST_CASE("FlipCoinCond.1thread" * doctest::timeout(300)) {
diff --git a/unittests/sort.cpp b/unittests/sort.cpp
@@ -205,7 +205,7 @@ TEST_CASE("MergeSort" * doctest::timeout(300)) {
       return;
     }
 
-    if(beg - end <= 5) {
+    if(end - beg <= 5) {
       std::sort(data.begin() + beg, data.begin() + end);
       return;
     }

Original file line number	Diff line number	Diff line change
`@@ -1949,6 +1949,8 @@ void flip_coin_cond(unsigned w) {`
`1949`	`1949`	`executor.run_n(taskflow, 10000).wait();`
`1950`	`1950`
`1951`	`1951`	`REQUIRE(std::fabs(avg-32.0)<1.0);`
	`1952`	`+`
	`1953`	`+ taskflow.dump(std::cout);`
`1952`	`1954`	`}`
`1953`	`1955`
`1954`	`1956`	`TEST_CASE("FlipCoinCond.1thread" * doctest::timeout(300)) {`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ TEST_CASE("MergeSort" * doctest::timeout(300)) {`
`205`	`205`	`return;`
`206`	`206`	`}`
`207`	`207`
`208`		`- if(beg - end <= 5) {`
	`208`	`+ if(end - beg <= 5) {`
`209`	`209`	`std::sort(data.begin() + beg, data.begin() + end);`
`210`	`210`	`return;`
`211`	`211`	`}`