From 62d83d2a3b2cd408ca87501a4a75dc17a818526d Mon Sep 17 00:00:00 2001
From: p-hamann <p.hamann@dareit.de>
Date: Tue, 28 May 2019 09:51:42 +0200
Subject: [PATCH] Integrate push relabel
---
bnb/bnb.cpp | 4 +++-
include/gp-bnb/bnb.hpp | 1 +
meson.build | 1 +
test/meson.build | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/bnb/bnb.cpp b/bnb/bnb.cpp
index 2bad4ef..54673de 100644
--- a/bnb/bnb.cpp
+++ b/bnb/bnb.cpp
@@ -53,7 +53,9 @@ unsigned int solver::get_lower(){
return i_bfs.get_max_flow();
}
else if(lb_algorithm_ == lb::pr){
-
+ auto pr = push_relabel(graph_, sources, sinks);
+ pr.run();
+ return pr.get_max_flow();
}
else if(lb_algorithm_ == lb::gp){
diff --git a/include/gp-bnb/bnb.hpp b/include/gp-bnb/bnb.hpp
index 61f47e2..12d9706 100644
--- a/include/gp-bnb/bnb.hpp
+++ b/include/gp-bnb/bnb.hpp
@@ -8,6 +8,7 @@
#include <gp-bnb/partition.hpp>
#include <gp-bnb/edmonds_karp.hpp>
#include <gp-bnb/incremental_bfs.hpp>
+#include <gp-bnb/push_relabel.hpp>
namespace gp_bnb {
diff --git a/meson.build b/meson.build
index f4edb2a..6459df6 100755
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,7 @@ executable('gp-bnb',
'bnb/edmonds_karp.cpp',
'bnb/incremental_bfs.cpp',
'bnb/ibfs_subtree.cpp',
+ 'bnb/push_relabel.cpp',
'bnb/bnb.cpp',
include_directories: inc)
diff --git a/test/meson.build b/test/meson.build
index f7c8829..54f7870 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -11,6 +11,7 @@ testexe = executable(
'../bnb/edmonds_karp.cpp',
'../bnb/incremental_bfs.cpp',
'../bnb/ibfs_subtree.cpp',
+ '../bnb/push_relabel.cpp',
'../bnb/bnb.cpp',
include_directories : inc) # declared include directories in root :code:`meson.build`
--
GitLab