1.1 --- a/src/work/peter/hierarchygraph.h Sat Nov 13 12:24:01 2004 +0000
1.2 +++ b/src/work/peter/hierarchygraph.h Sat Nov 13 12:53:28 2004 +0000
1.3 @@ -60,9 +60,9 @@
1.4 cerr << "The given edge is not in the given network!" << endl;
1.5 return -1;
1.6 }
1.7 - else if ((actuallayer->id (actuallayer->tail (actedge)) !=
1.8 + else if ((actuallayer->id (actuallayer->source (actedge)) !=
1.9 actuallayer->id (*actuallayernode))
1.10 - && (actuallayer->id (actuallayer->head (actedge)) !=
1.11 + && (actuallayer->id (actuallayer->target (actedge)) !=
1.12 actuallayer->id (*actuallayernode)))
1.13 {
1.14 cerr << "The given edge does not connect to the given node!" <<
1.15 @@ -132,23 +132,23 @@
1.16 {
1.17 for (iei = actuallayer->first (iei, (*actuallayernode));
1.18 ((actuallayer->valid (iei))
1.19 - && (actuallayer->head (iei) == (*actuallayernode)));
1.20 + && (actuallayer->target (iei) == (*actuallayernode)));
1.21 actuallayer->next (iei))
1.22 {
1.23 cout << actuallayer->id (actuallayer->
1.24 - tail (iei)) << " " << actuallayer->
1.25 - id (actuallayer->head (iei)) << endl;
1.26 + source (iei)) << " " << actuallayer->
1.27 + id (actuallayer->target (iei)) << endl;
1.28 edgenumber++;
1.29 }
1.30 //cout << "Number of in-edges: " << edgenumber << endl;
1.31 for (oei = actuallayer->first (oei, (*actuallayernode));
1.32 ((actuallayer->valid (oei))
1.33 - && (actuallayer->tail (oei) == (*actuallayernode)));
1.34 + && (actuallayer->source (oei) == (*actuallayernode)));
1.35 actuallayer->next (oei))
1.36 {
1.37 cout << actuallayer->id (actuallayer->
1.38 - tail (oei)) << " " << actuallayer->
1.39 - id (actuallayer->head (oei)) << endl;
1.40 + source (oei)) << " " << actuallayer->
1.41 + id (actuallayer->target (oei)) << endl;
1.42 edgenumber++;
1.43 }
1.44 //cout << "Number of in+out-edges: " << edgenumber << endl;
1.45 @@ -327,15 +327,15 @@
1.46 return actuallayer.next (i);
1.47 }
1.48
1.49 - ///Gives back the head node of an edge.
1.50 - typename Gact::Node head (typename Gact::Edge edge) const
1.51 + ///Gives back the target node of an edge.
1.52 + typename Gact::Node target (typename Gact::Edge edge) const
1.53 {
1.54 - return actuallayer.head (edge);
1.55 + return actuallayer.target (edge);
1.56 }
1.57 - ///Gives back the tail node of an edge.
1.58 - typename Gact::Node tail (typename Gact::Edge edge) const
1.59 + ///Gives back the source node of an edge.
1.60 + typename Gact::Node source (typename Gact::Edge edge) const
1.61 {
1.62 - return actuallayer.tail (edge);
1.63 + return actuallayer.source (edge);
1.64 }
1.65
1.66 // Node aNode(InEdgeIt) const {}
1.67 @@ -393,8 +393,8 @@
1.68 }
1.69 ///Add a new edge to the graph.
1.70
1.71 - ///Add a new edge to the graph with tail node \c tail
1.72 - ///and head node \c head.
1.73 + ///Add a new edge to the graph with source node \c source
1.74 + ///and target node \c target.
1.75 ///\return the new edge.
1.76 typename Gact::Edge addEdge (typename Gact::Node node1,
1.77 typename Gact::Node node2)