Changeset 501:20e4941a354a in lemon-0.x for src/work
- Timestamp:
- 04/30/04 20:43:18 (21 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@661
- Location:
- src/work/marci
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/work/marci/bipartite_graph_wrapper.h
r500 r501 32 32 SFalseTTrueMap* s_false_t_true_map; 33 33 34 BipartiteGraphWrapper() : GraphWrapper<Graph>() { } 34 BipartiteGraphWrapper() : GraphWrapper<Graph>()/*, 35 S_CLASS(false), T_CLASS(true)*/ { } 35 36 void setSFalseTTrueMap(SFalseTTrueMap& _s_false_t_true_map) { 36 37 s_false_t_true_map=&_s_false_t_true_map; … … 40 41 //marci 41 42 //FIXME vhogy igy kellene, csak az en forditom nem eszi meg 42 //static const bool S_CLASS=false;43 //static const bool T_CLASS=true;43 static const bool S_CLASS=false; 44 static const bool T_CLASS=true; 44 45 45 bool S_CLASS;46 bool T_CLASS;46 //bool S_CLASS; 47 //bool T_CLASS; 47 48 48 49 BipartiteGraphWrapper(Graph& _graph, SFalseTTrueMap& _s_false_t_true_map) 49 50 : GraphWrapper<Graph>(_graph), 50 s_false_t_true_map(&_s_false_t_true_map) ,51 S_CLASS(false), T_CLASS(true){ }51 s_false_t_true_map(&_s_false_t_true_map)/*, 52 S_CLASS(false), T_CLASS(true)*/ { } 52 53 typedef typename GraphWrapper<Graph>::Node Node; 53 54 //using GraphWrapper<Graph>::NodeIt; … … 210 211 Node n=Parent::graph->addNode(); 211 212 bipartite_map.update(); 213 //bipartite_map.set(n, -1); 212 214 s_false_t_true_map.insert(n, b); 213 215 return n; -
src/work/marci/bipartite_matching_try_2.cc
r500 r501 77 77 std::cout << std::endl; 78 78 79 std::cout << "Nodes:" << std::endl; 80 FOR_EACH_LOC(Graph::NodeIt, v, g) std::cout << v << " "; 81 std::cout << std::endl; 79 82 std::cout << "Nodes in T:" << std::endl; 80 FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, g.T_CLASS) std::cout << v << " ";83 FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, Graph::T_CLASS) std::cout << v << " "; 81 84 std::cout << std::endl; 82 85 std::cout << "Nodes in S:" << std::endl; 83 FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, g.S_CLASS) std::cout << v << " ";86 FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, Graph::S_CLASS) std::cout << v << " "; 84 87 std::cout << std::endl; 85 88 … … 93 96 94 97 std::cout << "Nodes in T:" << std::endl; 95 FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, g.T_CLASS) std::cout << v << " ";98 FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, Graph::T_CLASS) std::cout << v << " "; 96 99 std::cout << std::endl; 97 100 std::cout << "Nodes in S:" << std::endl; 98 FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, g.S_CLASS) std::cout << v << " ";101 FOR_EACH_INC_LOC(Graph::ClassNodeIt, v, g, Graph::S_CLASS) std::cout << v << " "; 99 102 std::cout << std::endl; 100 103
Note: See TracChangeset
for help on using the changeset viewer.