diff -r 741f3108a90f -r e997802b855c src/work/marci/bfs_mm.h --- a/src/work/marci/bfs_mm.h Sat Nov 13 12:24:01 2004 +0000 +++ b/src/work/marci/bfs_mm.h Sat Nov 13 12:53:28 2004 +0000 @@ -71,7 +71,7 @@ actual_edge=OutEdgeIt(*graph, s); //graph->first(actual_edge, s); if (actual_edge!=INVALID) { - Node w=graph->head(actual_edge); + Node w=graph->target(actual_edge); if (!(*reached_map)[w]) { bfs_queue.push(w); reached_map->set(w, true); @@ -93,7 +93,7 @@ actual_edge=++OutEdgeIt(*graph, actual_edge); //++actual_edge; if (actual_edge!=INVALID) { - Node w=graph->head(actual_edge); + Node w=graph->target(actual_edge); if (!(*reached_map)[w]) { bfs_queue.push(w); reached_map->set(w, true); @@ -108,7 +108,7 @@ actual_edge=OutEdgeIt(*graph, bfs_queue.front()); //graph->first(actual_edge, bfs_queue.front()); if (actual_edge!=INVALID) { - Node w=graph->head(actual_edge); + Node w=graph->target(actual_edge); if (!(*reached_map)[w]) { bfs_queue.push(w); reached_map->set(w, true); @@ -132,9 +132,9 @@ /// Returns if a-node is examined. bool isANodeExamined() const { return actual_edge==INVALID; } /// Returns a-node of the actual edge, so does if the edge is invalid. - Node tail() const { return bfs_queue.front(); } + Node source() const { return bfs_queue.front(); } /// \pre The actual edge have to be valid. - Node head() const { return graph->head(actual_edge); } + Node target() const { return graph->target(actual_edge); } /// Guess what? /// \deprecated const ReachedMap& reachedMap() const { return *reached_map; } @@ -231,9 +231,9 @@ Parent::operator++(); if ((this->actual_edge)!=INVALID && this->b_node_newly_reached) { - pred_map->set(this->head(), this->actual_edge); - pred_node_map->set(this->head(), this->tail()); - dist_map->set(this->head(), (*dist_map)[this->tail()]); + pred_map->set(this->target(), this->actual_edge); + pred_node_map->set(this->target(), this->source()); + dist_map->set(this->target(), (*dist_map)[this->source()]); } return *this; } @@ -457,7 +457,7 @@ operator++() { actual_edge=dfs_stack.top(); if (actual_edge!=INVALID/*.valid()*/) { - Node w=graph->head(actual_edge); + Node w=graph->target(actual_edge); actual_node=w; if (!reached[w]) { OutEdgeIt e(*graph, w); @@ -466,7 +466,7 @@ reached.set(w, true); b_node_newly_reached=true; } else { - actual_node=graph->tail(actual_edge); + actual_node=graph->source(actual_edge); ++dfs_stack.top(); b_node_newly_reached=false; } @@ -487,10 +487,10 @@ /// Returns if a-node is examined. bool isANodeExamined() const { return actual_edge==INVALID; } /// Returns a-node of the actual edge, so does if the edge is invalid. - Node tail() const { return actual_node; /*FIXME*/} + Node source() const { return actual_node; /*FIXME*/} /// Returns b-node of the actual edge. /// \pre The actual edge have to be valid. - Node head() const { return graph->head(actual_edge); } + Node target() const { return graph->target(actual_edge); } /// Guess what? /// \deprecated const ReachedMap& getReachedMap() const { return reached; } @@ -544,7 +544,7 @@ Parent::operator++(); if (this->graph->valid(this->actual_edge) && this->b_node_newly_reached) { - pred.set(this->head(), this->actual_edge); + pred.set(this->target(), this->actual_edge); } return *this; }