graph_wrappers now pass the tests.
authormarci
Tue, 21 Sep 2004 11:54:20 +0000
changeset 892004636791dd7
parent 891 74589d20dbc3
child 893 89d5c283a485
graph_wrappers now pass the tests.
src/hugo/graph_wrapper.h
src/test/graph_wrapper_test.cc
     1.1 --- a/src/hugo/graph_wrapper.h	Mon Sep 20 22:57:48 2004 +0000
     1.2 +++ b/src/hugo/graph_wrapper.h	Tue Sep 21 11:54:20 2004 +0000
     1.3 @@ -808,7 +808,7 @@
     1.4        EdgeIt(Invalid i) : Edge(i) { }
     1.5        EdgeIt(const SubBidirGraphWrapper<Graph, 
     1.6  	     ForwardFilterMap, BackwardFilterMap>& _gw) : 
     1.7 -	Edge(typename Graph::OutEdgeIt(*(_gw.graph)), false), gw(&_gw) { 
     1.8 +	Edge(typename Graph::EdgeIt(*(_gw.graph)), false), gw(&_gw) { 
     1.9  	while (*static_cast<GraphEdge*>(this)!=INVALID && 
    1.10  	       !(*(gw->forward_filter))[*this]) 
    1.11  	  *(static_cast<GraphEdge*>(this))=
     2.1 --- a/src/test/graph_wrapper_test.cc	Mon Sep 20 22:57:48 2004 +0000
     2.2 +++ b/src/test/graph_wrapper_test.cc	Tue Sep 21 11:54:20 2004 +0000
     2.3 @@ -42,23 +42,23 @@
     2.4  //typedef UndirGraph<Graph> UndirG;
     2.5  //template void checkCompileStaticGraph<UndirG>(UndirG &);
     2.6  
     2.7 -//typedef SubBidirGraphWrapper<Graph, Graph::EdgeMap<bool>, 
     2.8 -/// \bug SubBidirGraphWrapper cannot pass the StaticGraph test
     2.9 -//			     Graph::EdgeMap<bool> > SubBDGW;
    2.10 -//template void checkCompileStaticGraph<SubBDGW>(SubBDGW &);
    2.11 +//Compile SubBidirGraphWrapper
    2.12 +typedef SubBidirGraphWrapper<Graph, Graph::EdgeMap<bool>, 
    2.13 +			     Graph::EdgeMap<bool> > SubBDGW;
    2.14 +template void checkCompileStaticGraph<SubBDGW>(SubBDGW &);
    2.15  
    2.16  //Compile BidirGraphWrapper
    2.17 -//typedef BidirGraphWrapper<Graph> BidirGW;
    2.18 -//template void checkCompileStaticGraph<BidirGW>(BidirGW &);
    2.19 +typedef BidirGraphWrapper<Graph> BidirGW;
    2.20 +template void checkCompileStaticGraph<BidirGW>(BidirGW &);
    2.21  
    2.22  //Compile BidirGraph
    2.23 -//typedef BidirGraph<Graph> BidirG;
    2.24 -//template void checkCompileStaticGraph<BidirG>(BidirG &);
    2.25 +typedef BidirGraph<Graph> BidirG;
    2.26 +template void checkCompileStaticGraph<BidirG>(BidirG &);
    2.27  
    2.28  //Compile ResGraphWrapper
    2.29 -//typedef ResGraphWrapper<Graph, int, Graph::EdgeMap<int>, 
    2.30 -//			Graph::EdgeMap<int> > ResGW;
    2.31 -//template void checkCompileStaticGraph<ResGW>(ResGW &);
    2.32 +typedef ResGraphWrapper<Graph, int, Graph::EdgeMap<int>, 
    2.33 +			Graph::EdgeMap<int> > ResGW;
    2.34 +template void checkCompileStaticGraph<ResGW>(ResGW &);
    2.35  
    2.36  //Compile ErasingFirstGraphWrapper
    2.37  typedef ErasingFirstGraphWrapper<Graph, Graph::NodeMap<Graph::Edge> > ErasingFirstGW;