1.1 --- a/src/work/peter/edgepathgraph_test.cc	Sat Nov 13 12:24:01 2004 +0000
     1.2 +++ b/src/work/peter/edgepathgraph_test.cc	Sat Nov 13 12:53:28 2004 +0000
     1.3 @@ -135,15 +135,15 @@
     1.4  	typedef DPath::EdgeIt PEdgeIt;
     1.5  	PEdgeIt f;
     1.6  
     1.7 -	cout << "Edge " << EPGr.id(EPGr.tail(e)) << " - " << EPGr.id(EPGr.head(e)) << " in actual layer is";
     1.8 +	cout << "Edge " << EPGr.id(EPGr.source(e)) << " - " << EPGr.id(EPGr.target(e)) << " in actual layer is";
     1.9          if(EPGr.edgepath[e])
    1.10  	{
    1.11  	  cout << endl << "Path";
    1.12  	  for(EPGr.edgepath[e]->first(f); EPGr.edgepath[e]->valid(f); EPGr.edgepath[e]->next(f))
    1.13  	  {
    1.14 -	    cout << " " << EPGr2.id(EPGr2.tail(f)) << "-" << EPGr2.id(EPGr2.head(f));
    1.15 +	    cout << " " << EPGr2.id(EPGr2.source(f)) << "-" << EPGr2.id(EPGr2.target(f));
    1.16  	  }
    1.17 -	  //cout << EPGr2.id(EPGr2.head(f)) << endl;
    1.18 +	  //cout << EPGr2.id(EPGr2.target(f)) << endl;
    1.19  	  cout << endl;
    1.20  	}
    1.21  	else
    1.22 @@ -169,13 +169,13 @@
    1.23        cout << "actlaymap: ";
    1.24        for(EdgeIt e(EPGr.actuallayer);EPGr.actuallayer.valid(e);EPGr.actuallayer.next(e))
    1.25        {
    1.26 -	cout << EPGr.id(EPGr.tail(e)) << "-" << EPGr.id(EPGr.head(e)) << ":" << actlaymap[e] << " ";
    1.27 +	cout << EPGr.id(EPGr.source(e)) << "-" << EPGr.id(EPGr.target(e)) << ":" << actlaymap[e] << " ";
    1.28        }
    1.29        cout << endl;
    1.30        cout << "sublaymap: ";
    1.31        for(ListGraph::EdgeIt e(EPGr2.actuallayer);EPGr2.actuallayer.valid(e);EPGr2.actuallayer.next(e))
    1.32        {
    1.33 -	cout << EPGr2.id(EPGr2.tail(e)) << "-" << EPGr2.id(EPGr2.head(e)) << ":" << sublaymap[e] << " ";
    1.34 +	cout << EPGr2.id(EPGr2.source(e)) << "-" << EPGr2.id(EPGr2.target(e)) << ":" << sublaymap[e] << " ";
    1.35        }
    1.36        cout << endl;
    1.37        //EdgeMap-ok kiirasa#vege
    1.38 @@ -190,13 +190,13 @@
    1.39        cout << "actlaymap: ";
    1.40        for(EdgeIt e(EPGr.actuallayer);EPGr.actuallayer.valid(e);EPGr.actuallayer.next(e))
    1.41        {
    1.42 -	cout << EPGr.id(EPGr.tail(e)) << "-" << EPGr.id(EPGr.head(e)) << ":" << actlaymap[e] << " ";
    1.43 +	cout << EPGr.id(EPGr.source(e)) << "-" << EPGr.id(EPGr.target(e)) << ":" << actlaymap[e] << " ";
    1.44        }
    1.45        cout << endl;
    1.46        cout << "sublaymap: ";
    1.47        for(ListGraph::EdgeIt e(EPGr2.actuallayer);EPGr2.actuallayer.valid(e);EPGr2.actuallayer.next(e))
    1.48        {
    1.49 -	cout << EPGr2.id(EPGr2.tail(e)) << "-" << EPGr2.id(EPGr2.head(e)) << ":" << sublaymap[e] << " ";
    1.50 +	cout << EPGr2.id(EPGr2.source(e)) << "-" << EPGr2.id(EPGr2.target(e)) << ":" << sublaymap[e] << " ";
    1.51        }
    1.52        cout << endl;
    1.53        //EdgeMap-ok kiirasa#vege