diff --git a/CMakeLists.txt b/CMakeLists.txt index 45cd6e054eca578caf63fd1a96c13384d6e699a8..e157c61221f77995bd72125ce848aa0024012a50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ set(module_name _${project}) # target name project(${project}) +set(CXX_STANDARD 14) ############################################## # Define options diff --git a/src/recipes/RemoveFlatten.cpp b/src/recipes/RemoveFlatten.cpp index c28c4794e9611cdedd0bd8c76a1e6d7580dc17b6..8c1bf1bcf0bf79fda275867ff6430d5a937da172 100644 --- a/src/recipes/RemoveFlatten.cpp +++ b/src/recipes/RemoveFlatten.cpp @@ -22,7 +22,6 @@ namespace Aidge { void removeFlatten(std::shared_ptr<Node> flatten) { - GraphView::replace({flatten}, {}); } diff --git a/unit_tests/recipes/Test_removeFlatten.cpp b/unit_tests/recipes/Test_removeFlatten.cpp index 84157f0c21aef2a775011e3ccd130511252e94e9..dd747cdea0020acc745237e30db88fc873109243 100644 --- a/unit_tests/recipes/Test_removeFlatten.cpp +++ b/unit_tests/recipes/Test_removeFlatten.cpp @@ -37,10 +37,12 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { removeFlatten(g); - CHECK(g->getOrderedInputs().size() == 1); CHECK(g->getOrderedOutputs().size() == 1); - CHECK(g->getOrderedInputs()[0].first == fc0); CHECK(g->getOrderedOutputs()[0].first == flatten); + + CHECK(g->getOrderedInputs().size() == 1); + CHECK(g->getOrderedInputs()[0].first == fc0); + CHECK(fc0->getParent(0) == nullptr); CHECK(fc0->getChildren(0).size() == 1); CHECK(g->getRootNode() == fc0); @@ -51,9 +53,11 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { removeFlatten(g); CHECK(g->getOrderedInputs().size() == 1); - CHECK(g->getOrderedOutputs().size() == 1); CHECK(g->getOrderedInputs()[0].first == fc0); + + CHECK(g->getOrderedOutputs().size() == 1); CHECK(g->getOrderedOutputs()[0].first == fc0); + CHECK(fc0->getParent(0) == nullptr); CHECK(fc0->getChildren(0).size() == 0); CHECK(g->getRootNode() == fc0); @@ -65,9 +69,11 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { removeFlatten(g); CHECK(g->getOrderedInputs().size() == 1); - CHECK(g->getOrderedOutputs().size() == 1); CHECK(g->getOrderedInputs()[0].first == fc0); + + CHECK(g->getOrderedOutputs().size() == 1); CHECK(g->getOrderedOutputs()[0].first == fc1); + CHECK(fc1->getParent(0) == fc0); CHECK(fc0->getChildren(0)[0] == fc1); CHECK(g->getRootNode() == fc0); @@ -81,11 +87,13 @@ TEST_CASE("[cpu/recipies] RemoveFlatten", "[RemoveFlatten][recipies]") { removeFlatten(g); CHECK(g->getOrderedInputs().size() == 0); + CHECK(g->getOrderedOutputs().size() == 1); - CHECK(g->getOrderedInputs()[0].first == fc0); CHECK(g->getOrderedOutputs()[0].first == fc0); + CHECK(fc0->getParent(0) == prod); CHECK(fc0->getChildren(0).size() == 0); + CHECK(g->getRootNode() == prod); } }