Changeset 501:20e4941a354a in lemon-0.x for src/work/marci

Timestamp:

04/30/04 20:43:18 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

bipatite

Location:

src/work/marci

Files:

• bipartite_graph_wrapper.h (modified) (3 diffs)
• bipartite_matching_try_2.cc (modified) (2 diffs)

src/work/marci/bipartite_graph_wrapper.h

@@ -32 +32 @@
     SFalseTTrueMap* s_false_t_true_map;
 
-    BipartiteGraphWrapper() : GraphWrapper<Graph>() { }
+    BipartiteGraphWrapper() : GraphWrapper<Graph>()/*, 
+                                                     S_CLASS(false), T_CLASS(true)*/ { }
     void setSFalseTTrueMap(SFalseTTrueMap& _s_false_t_true_map) { 
       s_false_t_true_map=&_s_false_t_true_map;
@@ -40 +41 @@
     //marci
     //FIXME vhogy igy kellene, csak az en forditom nem eszi meg
-    //static const bool S_CLASS=false;
-    //static const bool T_CLASS=true;
+    static const bool S_CLASS=false;
+    static const bool T_CLASS=true;
     
-    bool S_CLASS;
-    bool T_CLASS;
+    //bool S_CLASS;
+    //bool T_CLASS;
 
     BipartiteGraphWrapper(Graph& _graph, SFalseTTrueMap& _s_false_t_true_map) 
       : GraphWrapper<Graph>(_graph), 
-        s_false_t_true_map(&_s_false_t_true_map), 
-        S_CLASS(false), T_CLASS(true) { }
+        s_false_t_true_map(&_s_false_t_true_map)/*, 
+                                                  S_CLASS(false), T_CLASS(true)*/ { }
     typedef typename GraphWrapper<Graph>::Node Node;
     //using GraphWrapper<Graph>::NodeIt;
@@ -210 +211 @@
       Node n=Parent::graph->addNode();
       bipartite_map.update();
+      //bipartite_map.set(n, -1);
       s_false_t_true_map.insert(n, b);
       return n;

src/work/marci/bipartite_matching_try_2.cc

@@ -77 +77 @@
   std::cout << std::endl;
 
+  std::cout << "Nodes:" << std::endl;
+  FOR_EACH_LOC(Graph::NodeIt, v, g) std::cout << v << " ";
+  std::cout << std::endl;
   std::cout << "Nodes in T:" << std::endl;
-  FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, g.T_CLASS) std::cout << v << " ";
+  FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, Graph::T_CLASS) std::cout << v << " ";
   std::cout << std::endl;
   std::cout << "Nodes in S:" << std::endl;
-  FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, g.S_CLASS) std::cout << v << " ";
+  FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, Graph::S_CLASS) std::cout << v << " ";
   std::cout << std::endl;
 
@@ -93 +96 @@
 
   std::cout << "Nodes in T:" << std::endl;
-  FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, g.T_CLASS) std::cout << v << " ";
+  FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, Graph::T_CLASS) std::cout << v << " ";
   std::cout << std::endl;
   std::cout << "Nodes in S:" << std::endl;
-  FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, g.S_CLASS) std::cout << v << " ";
+  FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, Graph::S_CLASS) std::cout << v << " ";
   std::cout << std::endl;