COIN-OR::LEMON - Graph Library

Changeset 892:004636791dd7 in lemon-0.x


Ignore:
Timestamp:
09/21/04 13:54:20 (15 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1200
Message:

graph_wrappers now pass the tests.

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/hugo/graph_wrapper.h

    r891 r892  
    809809      EdgeIt(const SubBidirGraphWrapper<Graph,
    810810             ForwardFilterMap, BackwardFilterMap>& _gw) :
    811         Edge(typename Graph::OutEdgeIt(*(_gw.graph)), false), gw(&_gw) {
     811        Edge(typename Graph::EdgeIt(*(_gw.graph)), false), gw(&_gw) {
    812812        while (*static_cast<GraphEdge*>(this)!=INVALID &&
    813813               !(*(gw->forward_filter))[*this])
  • src/test/graph_wrapper_test.cc

    r891 r892  
    4343//template void checkCompileStaticGraph<UndirG>(UndirG &);
    4444
    45 //typedef SubBidirGraphWrapper<Graph, Graph::EdgeMap<bool>,
    46 /// \bug SubBidirGraphWrapper cannot pass the StaticGraph test
    47 //                           Graph::EdgeMap<bool> > SubBDGW;
    48 //template void checkCompileStaticGraph<SubBDGW>(SubBDGW &);
     45//Compile SubBidirGraphWrapper
     46typedef SubBidirGraphWrapper<Graph, Graph::EdgeMap<bool>,
     47                             Graph::EdgeMap<bool> > SubBDGW;
     48template void checkCompileStaticGraph<SubBDGW>(SubBDGW &);
    4949
    5050//Compile BidirGraphWrapper
    51 //typedef BidirGraphWrapper<Graph> BidirGW;
    52 //template void checkCompileStaticGraph<BidirGW>(BidirGW &);
     51typedef BidirGraphWrapper<Graph> BidirGW;
     52template void checkCompileStaticGraph<BidirGW>(BidirGW &);
    5353
    5454//Compile BidirGraph
    55 //typedef BidirGraph<Graph> BidirG;
    56 //template void checkCompileStaticGraph<BidirG>(BidirG &);
     55typedef BidirGraph<Graph> BidirG;
     56template void checkCompileStaticGraph<BidirG>(BidirG &);
    5757
    5858//Compile ResGraphWrapper
    59 //typedef ResGraphWrapper<Graph, int, Graph::EdgeMap<int>,
    60 //                      Graph::EdgeMap<int> > ResGW;
    61 //template void checkCompileStaticGraph<ResGW>(ResGW &);
     59typedef ResGraphWrapper<Graph, int, Graph::EdgeMap<int>,
     60                        Graph::EdgeMap<int> > ResGW;
     61template void checkCompileStaticGraph<ResGW>(ResGW &);
    6262
    6363//Compile ErasingFirstGraphWrapper
Note: See TracChangeset for help on using the changeset viewer.