diff -r 741f3108a90f -r e997802b855c src/work/marci/bipartite_graph_wrapper.h --- a/src/work/marci/bipartite_graph_wrapper.h Sat Nov 13 12:24:01 2004 +0000 +++ b/src/work/marci/bipartite_graph_wrapper.h Sat Nov 13 12:53:28 2004 +0000 @@ -167,17 +167,17 @@ // OutEdgeIt& next(OutEdgeIt& i) const { this->graph->next(i.e); return i; } // InEdgeIt& next(InEdgeIt& i) const { this->graph->next(i.e); return i; } -// Node tail(const Edge& e) { -// if (!(*(this->s_false_t_true_map))[this->graph->tail(e)]) -// return Node(this->graph->tail(e)); +// Node source(const Edge& e) { +// if (!(*(this->s_false_t_true_map))[this->graph->source(e)]) +// return Node(this->graph->source(e)); // else -// return Node(this->graph->head(e)); +// return Node(this->graph->target(e)); // } -// Node head(const Edge& e) { -// if (!(*(this->s_false_t_true_map))[this->graph->tail(e)]) -// return Node(this->graph->head(e)); +// Node target(const Edge& e) { +// if (!(*(this->s_false_t_true_map))[this->graph->source(e)]) +// return Node(this->graph->target(e)); // else -// return Node(this->graph->tail(e)); +// return Node(this->graph->source(e)); // } // Node aNode(const OutEdgeIt& e) const { @@ -252,9 +252,9 @@ } /// A new edge is inserted. - ///\pre \c tail have to be in \c S_Class and \c head in \c T_Class. - Edge addEdge(const Node& tail, const Node& head) { - return Parent::graph->addEdge(tail, head); + ///\pre \c source have to be in \c S_Class and \c target in \c T_Class. + Edge addEdge(const Node& source, const Node& target) { + return Parent::graph->addEdge(source, target); } void erase(const Node& n) { @@ -695,10 +695,10 @@ return i; } - Node tail(const Edge& e) const { + Node source(const Edge& e) const { switch (e.spec) { case 0: - return Node(this->graph->tail(e)); + return Node(this->graph->source(e)); break; case 1: return S_NODE; @@ -709,10 +709,10 @@ break; } } - Node head(const Edge& e) const { + Node target(const Edge& e) const { switch (e.spec) { case 0: - return Node(this->graph->head(e)); + return Node(this->graph->target(e)); break; case 1: return Node(e.n); @@ -732,17 +732,17 @@ return this->graph->edgeNum()+this->graph->nodeNum(); } - Node aNode(const OutEdgeIt& e) const { return tail(e); } - Node aNode(const InEdgeIt& e) const { return head(e); } - Node bNode(const OutEdgeIt& e) const { return head(e); } - Node bNode(const InEdgeIt& e) const { return tail(e); } + Node aNode(const OutEdgeIt& e) const { return source(e); } + Node aNode(const InEdgeIt& e) const { return target(e); } + Node bNode(const OutEdgeIt& e) const { return target(e); } + Node bNode(const InEdgeIt& e) const { return source(e); } void addNode() const { } void addEdge() const { } // Node addNode() const { return Node(this->graph->addNode()); } -// Edge addEdge(const Node& tail, const Node& head) const { -// return Edge(this->graph->addEdge(tail, head)); } +// Edge addEdge(const Node& source, const Node& target) const { +// return Edge(this->graph->addEdge(source, target)); } // void erase(const Node& i) const { this->graph->erase(i); } // void erase(const Edge& i) const { this->graph->erase(i); }