COIN-OR::LEMON - Graph Library

Changeset 870:9bde6cd8e3da in lemon-0.x


Ignore:
Timestamp:
09/16/04 17:05:10 (15 years ago)
Author:
marci
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1170
Message:
 
Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/hugo/graph_wrapper.h

    r861 r870  
    230230      NodeMap(const GraphWrapper<Graph>& gw) :  Parent(*(gw.graph)) { }
    231231      NodeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
    232 //       NodeMap(const NodeMap<T>& map) : Parent(map) { }
    233 //       template<typename Map>
    234 //       NodeMap(const Map& map) :  Parent(map) { }
     232      NodeMap(const NodeMap<T>& map) : Parent(map) { }
     233      template<typename Map>
     234      NodeMap(const Map& map) :  Parent(map) { }
    235235    };
    236236
     
    240240      EdgeMap(const GraphWrapper<Graph>& gw) : Parent(*(gw.graph)) { }
    241241      EdgeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
    242 //       EdgeMap(const EdgeMap<T>& map) : Parent(map) { }
    243 //       template<typename Map>
    244 //       EdgeMap(const Map& map) :  Parent(map) { }
     242      EdgeMap(const EdgeMap<T>& map) : Parent(map) { }
     243      template<typename Map>
     244      EdgeMap(const Map& map) :  Parent(map) { }
    245245    };
    246246  };
  • src/work/marci/graph_wrapper_test.cc

    r850 r870  
    66#include<hugo/graph_wrapper.h>
    77
    8 #include"test_tools.h"
    9 #include"graph_test.h"
     8#include"test/test_tools.h"
     9#include"test/graph_test.h"
    1010
    1111/**
     
    2121using namespace hugo;
    2222
    23 template<class Graph> void bidirPetersen(Graph &G)
    24 {
    25   typedef typename Graph::Edge Edge;
    26   typedef typename Graph::EdgeIt EdgeIt;
     23// template<class Graph> void bidirPetersen(Graph &G)
     24// {
     25//   typedef typename Graph::Edge Edge;
     26//   typedef typename Graph::EdgeIt EdgeIt;
    2727 
    28   checkGraphEdgeList(G,15);
     28//   checkGraphEdgeList(G,15);
    2929 
    30   std::vector<Edge> ee;
     30//   std::vector<Edge> ee;
    3131 
    32   for(EdgeIt e(G);e!=INVALID;++e) ee.push_back(e);
     32//   for(EdgeIt e(G);e!=INVALID;++e) ee.push_back(e);
    3333
    34   for(typename std::vector<Edge>::iterator p=ee.begin();p!=ee.end();p++)
    35     G.addEdge(G.head(*p),G.tail(*p));
    36 }
     34//   for(typename std::vector<Edge>::iterator p=ee.begin();p!=ee.end();p++)
     35//     G.addEdge(G.head(*p),G.tail(*p));
     36// }
    3737
    38 template<class Graph> void checkPetersen(Graph &G)
    39 {
    40   typedef typename Graph::Node Node;
     38// template<class Graph> void checkPetersen(Graph &G)
     39// {
     40//   typedef typename Graph::Node Node;
    4141
    42   typedef typename Graph::EdgeIt EdgeIt;
    43   typedef typename Graph::NodeIt NodeIt;
     42//   typedef typename Graph::EdgeIt EdgeIt;
     43//   typedef typename Graph::NodeIt NodeIt;
    4444
    45   checkGraphNodeList(G,10);
    46   checkGraphEdgeList(G,30);
     45//   checkGraphNodeList(G,10);
     46//   checkGraphEdgeList(G,30);
    4747
    48   for(NodeIt n(G);n!=INVALID;++n) {
    49     checkGraphInEdgeList(G,n,3);
    50     checkGraphOutEdgeList(G,n,3);
    51     ++n;
    52   } 
    53 }
     48//   for(NodeIt n(G);n!=INVALID;++n) {
     49//     checkGraphInEdgeList(G,n,3);
     50//     checkGraphOutEdgeList(G,n,3);
     51//     ++n;
     52//   } 
     53// }
    5454
    55 //Compile GraphSkeleton
    56 template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
    57 (skeleton::StaticGraphSkeleton &);
     55// //Compile GraphSkeleton
     56// template void checkCompileStaticGraph<skeleton::StaticGraphSkeleton>
     57// (skeleton::StaticGraphSkeleton &);
    5858
    59 template void checkCompileGraph<skeleton::GraphSkeleton>
    60 (skeleton::GraphSkeleton &);
     59// template void checkCompileGraph<skeleton::GraphSkeleton>
     60// (skeleton::GraphSkeleton &);
    6161
    62 template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
    63 (skeleton::ErasableGraphSkeleton &);
     62// template void checkCompileErasableGraph<skeleton::ErasableGraphSkeleton>
     63// (skeleton::ErasableGraphSkeleton &);
    6464
    6565//Compile SmartGraph
Note: See TracChangeset for help on using the changeset viewer.