Changeset 559:82a8f2bc5758 in lemon-0.x for src/work/marci/bipartite_matching_try_3.cc

Timestamp:

05/06/04 19:45:12 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@732

Message:

A max bipartite matching class in src/work/marci/max_bipartite_matching.h
which can be used for computing maximum cardinality ordinary matching, b-matching and capacitated b-matching.

File:

• src/work/marci/bipartite_matching_try_3.cc (modified) (1 diff)

src/work/marci/bipartite_matching_try_3.cc

@@ -14 +14 @@
 #include <max_flow.h>
 #include <graph_gen.h>
+#include <max_bipartite_matching.h>
 
 using namespace hugo;
-
-// template <typename Graph, typename EdgeCap, typename NodeCap, 
-//        typename EdgeFlow, typename NodeFlow>
-// class MaxMatching : public MaxFlow<stGraphWrapper<Graph>, 
-//                                 stGraphWrapper<Graph>:: EdgeMapWrapper<EdgeCan, NodeCap>, stGraphWrapper<Graph>::EdgeMapWrapper<EdgeFlow, NodeFlow> > {
-//   typedef MaxFlow<stGraphWrapper<Graph>, 
-//                stGraphWrapper<Graph>::EdgeMapWrapper<EdgeCan, NodeCap>, 
-//                stGraphWrapper<Graph>::EdgeMapWrapper<EdgeFlow, NodeFlow> >
-//   Parent;
-// protected:
-//   stGraphWrapper<Graph> gw;
-//   stGraphWrapper<Graph>::EdgeMapWrapper<EdgeCap, NodeCap> cap;
-//   stGraphWrapper<Graph>::EdgeMapWrapper<EdgeFlow, NodeFlow> flow;
-//   //graph* g;
-//   //EdgeCap* edge_cap;
-//   //EdgeFlow* edge_flow;
-// public:
-//   MaxMatching(Graph& _g, EdgeCap& _edge_cap, NodeCap& _node_cap, 
-//            EdgeFlow& _edge_flow, NodeFlow& _node_flow) : 
-//     MaxFlow(), gw(_g), 
-//     cap(_edge_cap, _node_cap), flow(_edge_flow, _node_flow) {
-//     Parent::set(gw, cap, flow);
-//   }
-// };
-
-template <typename Graph, typename EdgeCap, typename NodeCap, 
-          typename EdgeFlow, typename NodeFlow>
-class MaxMatching {
-protected:
-//   EdgeCap* edge_cap;
-//   NodeCap* node_cap;
-//   EdgeFlow* edge_flow;
-//   NodeFlow* node_flow;
-  typedef  stGraphWrapper<Graph> stGW;
-  stGW stgw;
-  typedef typename stGW::template EdgeMapWrapper<EdgeCap, NodeCap> CapMap; 
-  CapMap cap;
-  NodeFlow* node_flow;
-  typedef typename stGW::template EdgeMapWrapper<EdgeFlow, NodeFlow> FlowMap;
-  FlowMap flow;
-  MaxFlow<stGW, int, CapMap, FlowMap> mf;
-  //graph* g;
-  //EdgeCap* edge_cap;
-  //EdgeFlow* edge_flow;
-public:
-  MaxMatching(Graph& _g, EdgeCap& _edge_cap, NodeCap& _node_cap, 
-              EdgeFlow& _edge_flow, NodeFlow& _node_flow) : 
-    stgw(_g), 
-    cap(_edge_cap, _node_cap), 
-    node_flow(0), 
-    flow(_edge_flow, _node_flow), 
-    mf(stgw, stgw.S_NODE, stgw.T_NODE, cap, flow) { }
-  MaxMatching(Graph& _g, EdgeCap& _edge_cap, NodeCap& _node_cap, 
-              EdgeFlow& _edge_flow/*, NodeFlow& _node_flow*/) : 
-    stgw(_g), 
-    cap(_edge_cap, _node_cap), 
-    node_flow(new NodeFlow(_g)), 
-    flow(_edge_flow, *node_flow), 
-    mf(stgw, stgw.S_NODE, stgw.T_NODE, cap, flow) { }
-  ~MaxMatching() { if (node_flow) delete node_flow; }
-  void run() { mf.run(); } 
-  int matchingValue() { return mf.flowValue(); }
-};
-
 
 int main() {