1.1 --- a/src/work/marci/bipartite_graph_wrapper.h	Sat Nov 13 12:24:01 2004 +0000
     1.2 +++ b/src/work/marci/bipartite_graph_wrapper.h	Sat Nov 13 12:53:28 2004 +0000
     1.3 @@ -167,17 +167,17 @@
     1.4  //     OutEdgeIt& next(OutEdgeIt& i) const { this->graph->next(i.e); return i; }
     1.5  //     InEdgeIt& next(InEdgeIt& i) const { this->graph->next(i.e); return i; }
     1.6  
     1.7 -//     Node tail(const Edge& e) { 
     1.8 -//       if (!(*(this->s_false_t_true_map))[this->graph->tail(e)]) 
     1.9 -// 	return Node(this->graph->tail(e));
    1.10 +//     Node source(const Edge& e) { 
    1.11 +//       if (!(*(this->s_false_t_true_map))[this->graph->source(e)]) 
    1.12 +// 	return Node(this->graph->source(e));
    1.13  //       else
    1.14 -// 	return Node(this->graph->head(e));	
    1.15 +// 	return Node(this->graph->target(e));	
    1.16  //     }
    1.17 -//     Node head(const Edge& e) { 
    1.18 -//       if (!(*(this->s_false_t_true_map))[this->graph->tail(e)]) 
    1.19 -// 	return Node(this->graph->head(e));
    1.20 +//     Node target(const Edge& e) { 
    1.21 +//       if (!(*(this->s_false_t_true_map))[this->graph->source(e)]) 
    1.22 +// 	return Node(this->graph->target(e));
    1.23  //       else
    1.24 -// 	return Node(this->graph->tail(e));	
    1.25 +// 	return Node(this->graph->source(e));	
    1.26  //     }
    1.27  
    1.28  //     Node aNode(const OutEdgeIt& e) const { 
    1.29 @@ -252,9 +252,9 @@
    1.30      }
    1.31  
    1.32      /// A new edge is inserted.
    1.33 -    ///\pre \c tail have to be in \c S_Class and \c head in \c T_Class.
    1.34 -    Edge addEdge(const Node& tail, const Node& head) {
    1.35 -      return Parent::graph->addEdge(tail, head);
    1.36 +    ///\pre \c source have to be in \c S_Class and \c target in \c T_Class.
    1.37 +    Edge addEdge(const Node& source, const Node& target) {
    1.38 +      return Parent::graph->addEdge(source, target);
    1.39      }
    1.40  
    1.41      void erase(const Node& n) {
    1.42 @@ -695,10 +695,10 @@
    1.43        return i; 
    1.44      }    
    1.45  
    1.46 -    Node tail(const Edge& e) const { 
    1.47 +    Node source(const Edge& e) const { 
    1.48        switch (e.spec) {
    1.49        case 0: 
    1.50 -	return Node(this->graph->tail(e));
    1.51 +	return Node(this->graph->source(e));
    1.52  	break;
    1.53        case 1:
    1.54  	return S_NODE;
    1.55 @@ -709,10 +709,10 @@
    1.56  	break;
    1.57        }
    1.58      }
    1.59 -    Node head(const Edge& e) const { 
    1.60 +    Node target(const Edge& e) const { 
    1.61        switch (e.spec) {
    1.62        case 0: 
    1.63 -	return Node(this->graph->head(e));
    1.64 +	return Node(this->graph->target(e));
    1.65  	break;
    1.66        case 1:
    1.67  	return Node(e.n);
    1.68 @@ -732,17 +732,17 @@
    1.69        return this->graph->edgeNum()+this->graph->nodeNum(); 
    1.70      }
    1.71    
    1.72 -    Node aNode(const OutEdgeIt& e) const { return tail(e); }
    1.73 -    Node aNode(const InEdgeIt& e) const { return head(e); }
    1.74 -    Node bNode(const OutEdgeIt& e) const { return head(e); }
    1.75 -    Node bNode(const InEdgeIt& e) const { return tail(e); }
    1.76 +    Node aNode(const OutEdgeIt& e) const { return source(e); }
    1.77 +    Node aNode(const InEdgeIt& e) const { return target(e); }
    1.78 +    Node bNode(const OutEdgeIt& e) const { return target(e); }
    1.79 +    Node bNode(const InEdgeIt& e) const { return source(e); }
    1.80  
    1.81      void addNode() const { }
    1.82      void addEdge() const { }
    1.83      
    1.84  //    Node addNode() const { return Node(this->graph->addNode()); }
    1.85 -//    Edge addEdge(const Node& tail, const Node& head) const { 
    1.86 -//      return Edge(this->graph->addEdge(tail, head)); }
    1.87 +//    Edge addEdge(const Node& source, const Node& target) const { 
    1.88 +//      return Edge(this->graph->addEdge(source, target)); }
    1.89  
    1.90  //    void erase(const Node& i) const { this->graph->erase(i); }
    1.91  //    void erase(const Edge& i) const { this->graph->erase(i); }