Merge branch 'master' of gitlab.informatik.hu-berlin.de:scherzej/psco-2019-gp

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){
 

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 {
 

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)
 

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`