1.1 --- a/src/work/peter/edgepathgraph.h	Sat Nov 13 12:24:01 2004 +0000
     1.2 +++ b/src/work/peter/edgepathgraph.h	Sat Nov 13 12:53:28 2004 +0000
     1.3 @@ -73,7 +73,7 @@
     1.4  	typedef typename P::EdgeIt PEdgeIt;
     1.5  	PEdgeIt f;
     1.6  
     1.7 -	//dep//cout << "Edge " << id(tail(e)) << " - " << id(head(e)) << " in actual layer is";
     1.8 +	//dep//cout << "Edge " << id(source(e)) << " - " << id(target(e)) << " in actual layer is";
     1.9  	T1 incr=actmap[e];
    1.10  	//cout << incr << endl;
    1.11  
    1.12 @@ -82,10 +82,10 @@
    1.13  	  //dep//cout << endl << "Path";
    1.14  	  for(edgepath[e]->first(f); edgepath[e]->valid(f); edgepath[e]->next(f))
    1.15  	  {
    1.16 -	    //dep//cout << " " << sublayer->id(sublayer->tail(f)) << "-" << sublayer->id(sublayer->head(f));
    1.17 +	    //dep//cout << " " << sublayer->id(sublayer->source(f)) << "-" << sublayer->id(sublayer->target(f));
    1.18  	    submap[f]+=incr;
    1.19  	  }
    1.20 -	  //dep////cout << EPGr2.id(EPGr2.head(f)) << endl;
    1.21 +	  //dep////cout << EPGr2.id(EPGr2.target(f)) << endl;
    1.22  	  //dep//cout << endl;
    1.23  	}
    1.24  	else
    1.25 @@ -107,15 +107,15 @@
    1.26  	typedef typename P::EdgeIt PEdgeIt;
    1.27  	PEdgeIt f;
    1.28  
    1.29 -	cout << "Edge " << id(tail(e)) << " - " << id(head(e)) << " in actual layer is";
    1.30 +	cout << "Edge " << id(source(e)) << " - " << id(target(e)) << " in actual layer is";
    1.31          if(edgepath[e])
    1.32  	{
    1.33  	  cout << endl << "Path";
    1.34  	  for(edgepath[e]->first(f); edgepath[e]->valid(f); edgepath[e]->next(f))
    1.35  	  {
    1.36 -	    cout << " " << sublayer->id(sublayer->tail(f)) << "-" << sublayer->id(sublayer->head(f));
    1.37 +	    cout << " " << sublayer->id(sublayer->source(f)) << "-" << sublayer->id(sublayer->target(f));
    1.38  	  }
    1.39 -	  //cout << EPGr2.id(EPGr2.head(f)) << endl;
    1.40 +	  //cout << EPGr2.id(EPGr2.target(f)) << endl;
    1.41  	  cout << endl;
    1.42  	}
    1.43  	else
    1.44 @@ -234,10 +234,10 @@
    1.45      /// Go to the next edge.
    1.46      typename Gact::EdgeIt &next(typename Gact::EdgeIt &i) const { return actuallayer.next(i);}
    1.47  
    1.48 -    ///Gives back the head node of an edge.
    1.49 -    typename Gact::Node head(typename Gact::Edge edge) const { return actuallayer.head(edge); }
    1.50 -    ///Gives back the tail node of an edge.
    1.51 -    typename Gact::Node tail(typename Gact::Edge edge) const { return actuallayer.tail(edge); }
    1.52 +    ///Gives back the target node of an edge.
    1.53 +    typename Gact::Node target(typename Gact::Edge edge) const { return actuallayer.target(edge); }
    1.54 +    ///Gives back the source node of an edge.
    1.55 +    typename Gact::Node source(typename Gact::Edge edge) const { return actuallayer.source(edge); }
    1.56    
    1.57      //   Node aNode(InEdgeIt) const {}
    1.58      //   Node aNode(OutEdgeIt) const {}
    1.59 @@ -279,8 +279,8 @@
    1.60      typename Gact::Node addNode() { return actuallayer.addNode();}
    1.61      ///Add a new edge to the graph.
    1.62  
    1.63 -    ///Add a new edge to the graph with tail node \c tail
    1.64 -    ///and head node \c head.
    1.65 +    ///Add a new edge to the graph with source node \c source
    1.66 +    ///and target node \c target.
    1.67      ///\return the new edge.
    1.68      typename Gact::Edge addEdge(typename Gact::Node node1, typename Gact::Node node2) { return actuallayer.addEdge(node1, node2);}
    1.69