1.1 --- a/src/work/jacint/max_flow.h Thu May 06 15:47:42 2004 +0000
1.2 +++ b/src/work/jacint/max_flow.h Thu May 06 16:54:54 2004 +0000
1.3 @@ -45,8 +45,8 @@
1.4
1.5 #include <graph_wrapper.h>
1.6 #include <bfs_iterator.h>
1.7 -#include <invalid.h>
1.8 -#include <maps.h>
1.9 +#include <hugo/invalid.h>
1.10 +#include <hugo/maps.h>
1.11 #include <for_each_macros.h>
1.12
1.13 /// \file
2.1 --- a/src/work/klao/iter_map.h Thu May 06 15:47:42 2004 +0000
2.2 +++ b/src/work/klao/iter_map.h Thu May 06 16:54:54 2004 +0000
2.3 @@ -10,7 +10,7 @@
2.4 // for memset
2.5 #include <cstring>
2.6
2.7 -#include <invalid.h>
2.8 +#include <hugo/invalid.h>
2.9
2.10 namespace hugo {
2.11
3.1 --- a/src/work/marci/bfsit_vs_byhand.cc Thu May 06 15:47:42 2004 +0000
3.2 +++ b/src/work/marci/bfsit_vs_byhand.cc Thu May 06 16:54:54 2004 +0000
3.3 @@ -4,8 +4,8 @@
3.4
3.5 #include <list_graph.h>
3.6 //#include <smart_graph.h>
3.7 -#include <dimacs.h>
3.8 -#include <time_measure.h>
3.9 +#include <hugo/dimacs.h>
3.10 +#include <hugo/time_measure.h>
3.11 #include <for_each_macros.h>
3.12 #include <bfs_iterator.h>
3.13
4.1 --- a/src/work/marci/bipartite_graph_wrapper.h Thu May 06 15:47:42 2004 +0000
4.2 +++ b/src/work/marci/bipartite_graph_wrapper.h Thu May 06 16:54:54 2004 +0000
4.3 @@ -10,7 +10,7 @@
4.4 ///
4.5 ///\author Marton Makai
4.6
4.7 -#include <invalid.h>
4.8 +#include <hugo/invalid.h>
4.9 #include <iter_map.h>
4.10 #include <graph_wrapper.h>
4.11
5.1 --- a/src/work/marci/bipartite_graph_wrapper_test.cc Thu May 06 15:47:42 2004 +0000
5.2 +++ b/src/work/marci/bipartite_graph_wrapper_test.cc Thu May 06 16:54:54 2004 +0000
5.3 @@ -6,12 +6,12 @@
5.4 #include <list_graph.h>
5.5 //#include <smart_graph.h>
5.6 //#include <dimacs.h>
5.7 -#include <time_measure.h>
5.8 +#include <hugo/time_measure.h>
5.9 #include <for_each_macros.h>
5.10 #include <bfs_iterator.h>
5.11 #include <graph_wrapper.h>
5.12 #include <bipartite_graph_wrapper.h>
5.13 -#include <maps.h>
5.14 +#include <hugo/maps.h>
5.15 #include <max_flow.h>
5.16
5.17 using namespace hugo;
6.1 --- a/src/work/marci/bipartite_matching_try.cc Thu May 06 15:47:42 2004 +0000
6.2 +++ b/src/work/marci/bipartite_matching_try.cc Thu May 06 16:54:54 2004 +0000
6.3 @@ -7,12 +7,12 @@
6.4 #include <list_graph.h>
6.5 //#include <smart_graph.h>
6.6 //#include <dimacs.h>
6.7 -#include <time_measure.h>
6.8 +#include <hugo/time_measure.h>
6.9 #include <for_each_macros.h>
6.10 #include <bfs_iterator.h>
6.11 #include <graph_wrapper.h>
6.12 #include <bipartite_graph_wrapper.h>
6.13 -#include <maps.h>
6.14 +#include <hugo/maps.h>
6.15 #include <max_flow.h>
6.16
6.17 /**
7.1 --- a/src/work/marci/bipartite_matching_try_2.cc Thu May 06 15:47:42 2004 +0000
7.2 +++ b/src/work/marci/bipartite_matching_try_2.cc Thu May 06 16:54:54 2004 +0000
7.3 @@ -7,11 +7,11 @@
7.4 #include <list_graph.h>
7.5 //#include <smart_graph.h>
7.6 //#include <dimacs.h>
7.7 -#include <time_measure.h>
7.8 +#include <hugo/time_measure.h>
7.9 #include <for_each_macros.h>
7.10 #include <bfs_iterator.h>
7.11 #include <bipartite_graph_wrapper.h>
7.12 -#include <maps.h>
7.13 +#include <hugo/maps.h>
7.14 #include <max_flow.h>
7.15
7.16 /**
8.1 --- a/src/work/marci/bipartite_matching_try_3.cc Thu May 06 15:47:42 2004 +0000
8.2 +++ b/src/work/marci/bipartite_matching_try_3.cc Thu May 06 16:54:54 2004 +0000
8.3 @@ -7,11 +7,11 @@
8.4 #include <list_graph.h>
8.5 //#include <smart_graph.h>
8.6 //#include <dimacs.h>
8.7 -#include <time_measure.h>
8.8 +#include <hugo/time_measure.h>
8.9 #include <for_each_macros.h>
8.10 #include <bfs_iterator.h>
8.11 #include <bipartite_graph_wrapper.h>
8.12 -#include <maps.h>
8.13 +#include <hugo/maps.h>
8.14 #include <max_flow.h>
8.15
8.16 using namespace hugo;
9.1 --- a/src/work/marci/lg_vs_sg.cc Thu May 06 15:47:42 2004 +0000
9.2 +++ b/src/work/marci/lg_vs_sg.cc Thu May 06 16:54:54 2004 +0000
9.3 @@ -4,10 +4,10 @@
9.4 #include <string>
9.5
9.6 #include <list_graph.h>
9.7 -#include <smart_graph.h>
9.8 -#include <dimacs.h>
9.9 +#include <hugo/smart_graph.h>
9.10 +#include <hugo/dimacs.h>
9.11 #include <max_flow.h>
9.12 -#include <time_measure.h>
9.13 +#include <hugo/time_measure.h>
9.14 #include <for_each_macros.h>
9.15
9.16 using namespace hugo;
10.1 --- a/src/work/marci/makefile Thu May 06 15:47:42 2004 +0000
10.2 +++ b/src/work/marci/makefile Thu May 06 16:54:54 2004 +0000
10.3 @@ -1,7 +1,7 @@
10.4 CXX2 = g++-2.95
10.5 CXX3=$(CXX)
10.6 BOOSTROOT ?= /home/marci/boost
10.7 -INCLUDEDIRS ?= -I../.. -I../../hugo -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
10.8 +INCLUDEDIRS ?= -I../.. -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
10.9
10.10 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
10.11 BINARIES = max_flow_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try bipartite_matching_try_2 bipartite_matching_try_3 top_sort_test
11.1 --- a/src/work/marci/max_flow_demo.cc Thu May 06 15:47:42 2004 +0000
11.2 +++ b/src/work/marci/max_flow_demo.cc Thu May 06 16:54:54 2004 +0000
11.3 @@ -3,9 +3,9 @@
11.4 #include <fstream>
11.5
11.6 #include <list_graph.h>
11.7 -#include <smart_graph.h>
11.8 -#include <dimacs.h>
11.9 -#include <time_measure.h>
11.10 +#include <hugo/smart_graph.h>
11.11 +#include <hugo/dimacs.h>
11.12 +#include <hugo/time_measure.h>
11.13 //#include <graph_wrapper.h>
11.14 #include <max_flow.h>
11.15 //#include <preflow_res.h>