Fixed max-flow bug. Refactored max-flow tests.

Author: networmix

CMakeLists.txt

@@ -13,16 +13,16 @@ if(NETGRAPH_CORE_BUILD_TESTS)
   )
   FetchContent_MakeAvailable(googletest)
   enable_testing()
-  add_executable(netgraph_core_tests
-    tests/cpp/smoke_test.cpp
-    tests/cpp/flow_policy_tests.cpp
-    tests/cpp/strict_multidigraph_tests.cpp
-    tests/cpp/shortest_paths_tests.cpp
-    tests/cpp/flow_state_tests.cpp
-    tests/cpp/flow_graph_tests.cpp
-    tests/cpp/max_flow_tests.cpp
-    tests/cpp/k_shortest_paths_tests.cpp
-  )
+add_executable(netgraph_core_tests
+  tests/cpp/smoke_test.cpp
+  tests/cpp/flow_policy_tests.cpp
+  tests/cpp/strict_multidigraph_tests.cpp
+  tests/cpp/shortest_paths_tests.cpp
+  tests/cpp/flow_state_tests.cpp
+  tests/cpp/flow_graph_tests.cpp
+  tests/cpp/max_flow_tests.cpp
+  tests/cpp/k_shortest_paths_tests.cpp
+)
   target_link_libraries(netgraph_core_tests PRIVATE netgraph_core GTest::gtest_main)
   target_include_directories(netgraph_core_tests PRIVATE tests/cpp)
   if(NETGRAPH_CORE_COVERAGE AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang"))

src/flow_state.cpp

@@ -230,7 +230,6 @@ Flow FlowState::place_on_dag(NodeId src, NodeId dst, const PredDAG& dag,
         if (pushed < kMinFlow) break;
         pushed_layer += static_cast<Flow>(pushed);
         remaining -= pushed;
-        if (shortest_path) break;
         if (remaining <= kMinFlow) break;
       }
       if (pushed_layer < kMinFlow) break;