Changeset 921:818510fa3d99 in lemon-0.x for src/work/marci/leda
- Timestamp:
- 09/29/04 17:30:04 (20 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1232
- Location:
- src/work/marci/leda
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/work/marci/leda/bipartite_matching_comparison.cc
r771 r921 14 14 //#include <smart_graph.h> 15 15 //#include <dimacs.h> 16 #include < hugo/time_measure.h>16 #include <lemon/time_measure.h> 17 17 #include <for_each_macros.h> 18 #include < hugo/graph_wrapper.h>18 #include <lemon/graph_wrapper.h> 19 19 #include <bipartite_graph_wrapper.h> 20 #include < hugo/maps.h>21 #include < hugo/max_flow.h>20 #include <lemon/maps.h> 21 #include <lemon/max_flow.h> 22 22 23 23 using std::cin; … … 25 25 using std::endl; 26 26 27 using namespace hugo;27 using namespace lemon; 28 28 29 29 int main() { … … 92 92 max_flow_test(stgw, stgw.S_NODE, stgw.T_NODE, const1map, flow/*, true*/); 93 93 max_flow_test.run(); 94 cout << " HUGOmax matching algorithm based on preflow." << endl94 cout << "LEMON max matching algorithm based on preflow." << endl 95 95 << "Size of matching: " 96 96 << max_flow_test.flowValue() << endl; … … 108 108 // typedef SageGraph MutableGraph; 109 109 // while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) { } 110 // cout << " HUGOmax matching algorithm based on blocking flow augmentation."110 // cout << "LEMON max matching algorithm based on blocking flow augmentation." 111 111 // << endl << "Matching size: " 112 112 // << max_flow_test.flowValue() << endl; … … 142 142 max_flow_test(hg, s, t, cm, flow); 143 143 max_flow_test.run(); 144 cout << " HUGOmax matching algorithm on SageGraph by copying the graph, based on preflow."144 cout << "LEMON max matching algorithm on SageGraph by copying the graph, based on preflow." 145 145 << endl 146 146 << "Size of matching: " -
src/work/marci/leda/bipartite_matching_leda.cc
r769 r921 14 14 //#include <smart_graph.h> 15 15 //#include <dimacs.h> 16 #include < hugo/time_measure.h>16 #include <lemon/time_measure.h> 17 17 #include <for_each_macros.h> 18 #include < hugo/graph_wrapper.h>18 #include <lemon/graph_wrapper.h> 19 19 #include <bipartite_graph_wrapper.h> 20 #include < hugo/maps.h>21 #include < hugo/max_flow.h>20 #include <lemon/maps.h> 21 #include <lemon/max_flow.h> 22 22 23 23 /** … … 43 43 } 44 44 45 using namespace hugo;45 using namespace lemon; 46 46 47 47 int main() { -
src/work/marci/leda/bipartite_matching_leda_gen.cc
r769 r921 14 14 //#include <smart_graph.h> 15 15 //#include <dimacs.h> 16 #include < hugo/time_measure.h>16 #include <lemon/time_measure.h> 17 17 #include <for_each_macros.h> 18 #include < hugo/graph_wrapper.h>18 #include <lemon/graph_wrapper.h> 19 19 #include <bipartite_graph_wrapper.h> 20 #include < hugo/maps.h>21 #include < hugo/max_flow.h>20 #include <lemon/maps.h> 21 #include <lemon/max_flow.h> 22 22 #include <augmenting_flow.h> 23 23 … … 44 44 } 45 45 46 using namespace hugo;46 using namespace lemon; 47 47 48 48 int main() { … … 111 111 max_flow_test(stgw, stgw.S_NODE, stgw.T_NODE, const1map, flow/*, true*/); 112 112 max_flow_test.run(); 113 std::cout << " HUGOmax matching algorithm based on preflow." << std::endl113 std::cout << "LEMON max matching algorithm based on preflow." << std::endl 114 114 << "Size of matching: " 115 115 << max_flow_test.flowValue() << std::endl; … … 130 130 max_flow_test_1(stgw, stgw.S_NODE, stgw.T_NODE, const1map, flow/*, true*/); 131 131 while (max_flow_test_1.augmentOnBlockingFlow<MutableGraph>()) { } 132 std::cout << " HUGOmax matching algorithm based on blocking flow augmentation."132 std::cout << "LEMON max matching algorithm based on blocking flow augmentation." 133 133 << std::endl << "Matching size: " 134 134 << max_flow_test_1.flowValue() << std::endl; -
src/work/marci/leda/leda_graph_wrapper.h
r650 r921 1 1 // -*- c++ -*- 2 #ifndef HUGO_LEDA_GRAPH_WRAPPER_H3 #define HUGO_LEDA_GRAPH_WRAPPER_H2 #ifndef LEMON_LEDA_GRAPH_WRAPPER_H 3 #define LEMON_LEDA_GRAPH_WRAPPER_H 4 4 5 5 #include <LEDA/graph.h> … … 15 15 //#endif 16 16 17 #include < hugo/invalid.h>18 19 namespace hugo{20 21 /// \brief A graph wrapper structure for wrapping LEDA graphs in HUGO.17 #include <lemon/invalid.h> 18 19 namespace lemon { 20 21 /// \brief A graph wrapper structure for wrapping LEDA graphs in LEMON. 22 22 /// 23 23 /// This graph wrapper class wraps LEDA graphs and LEDA parametrized graphs 24 /// to satisfy HUGOgraph concepts.25 /// Then the generic HUGOlibalgorithms and wrappers can be used24 /// to satisfy LEMON graph concepts. 25 /// Then the generic LEMON algorithms and wrappers can be used 26 26 /// with LEDA graphs. 27 27 /// \ingroup gwrapper … … 299 299 300 300 /// This class is to wrap existing 301 /// LEDA node-maps to HUGOones.301 /// LEDA node-maps to LEMON ones. 302 302 template<typename T> class NodeMapWrapper 303 303 { … … 321 321 322 322 /// This class is to wrap existing 323 /// LEDA edge-maps to HUGOones.323 /// LEDA edge-maps to LEMON ones. 324 324 template<typename T> class EdgeMapWrapper 325 325 { … … 380 380 }; 381 381 382 } //namespace hugo383 384 #endif // HUGO_LEDA_GRAPH_WRAPPER_H382 } //namespace lemon 383 384 #endif // LEMON_LEDA_GRAPH_WRAPPER_H -
src/work/marci/leda/max_bipartite_matching_demo.cc
r771 r921 37 37 } 38 38 39 using namespace hugo;39 using namespace lemon; 40 40 41 41 using std::cout;
Note: See TracChangeset
for help on using the changeset viewer.