Changeset 498:eb8bfa683d92 in lemon-0.x for src/work/marci

Timestamp:

04/30/04 18:46:19 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

bipartite graphs

Location:

src/work/marci

Files:

• bipartite_graph_wrapper.h (modified) (1 diff)
• bipartite_matching_try.cc (modified) (1 diff)
• bipartite_matching_try_2.cc (copied) (copied from src/work/marci/bipartite_matching_try.cc) (1 diff)
• makefile (modified) (1 diff)

src/work/marci/bipartite_graph_wrapper.h

@@ -206 +206 @@
     /// the \c bool parameter which can be \c S_Class or \c T_Class shows 
     /// the color class where the new node is to be inserted.
-    void addNode(bool);
+    Node addNode(bool b) {
+      Node n=Parent::graph->addNode();
+      bipartite_map.update();
+      s_false_t_true_map.insert(n, b);
+      return n;
+    }
 
     /// A new edge is inserted.
     ///\pre \c tail have to be in \c S_Class and \c head in \c T_Class.
-    void addEdge(const Node& tail, const Node& head);
-
-    void erase(const Node&);
-    void erase(const Edge&);
+    Edge addEdge(const Node& tail, const Node& head) {
+      return Parent::graph->addEdge(tail, head);
+    }
+
+    void erase(const Node& n) {
+      s_false_t_true_map.remove(n);
+      Parent::graph->erase(n);
+    }
+    void erase(const Edge& e) {
+      Parent::graph->erase(e);
+    }
     
     void clear() {

src/work/marci/bipartite_matching_try.cc

@@ -113 +113 @@
 //   }
 
-  BGW::NodeMap<int> dbyj(bgw);
-  BGW::EdgeMap<int> dbyxcj(bgw);
+//  BGW::NodeMap<int> dbyj(bgw);
+//  BGW::EdgeMap<int> dbyxcj(bgw);
 
   typedef stGraphWrapper<BGW> stGW;

src/work/marci/bipartite_matching_try_2.cc

@@ -113 +113 @@
 //   }
 
-  BGW::NodeMap<int> dbyj(bgw);
-  BGW::EdgeMap<int> dbyxcj(bgw);
+//  BGW::NodeMap<int> dbyj(bgw);
+//  BGW::EdgeMap<int> dbyxcj(bgw);
 
   typedef stGraphWrapper<BGW> stGW;

src/work/marci/makefile

@@ -5 +5 @@
 
 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-BINARIES = max_flow_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
+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
 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda