COIN-OR::LEMON - Graph Library

About

Downloads

Documentation

Development

Issue Tracker

Browse Tickets

Custom Query

Roadmap

Browse Source

Local Info

Mailing Lists

Search

Changeset 2111:ea1fa1bc3f6d in lemon-0.x for test


Ignore:
Timestamp:
06/28/06 17:06:24 (18 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2817
Message:

Removing concepts for extendable and erasable graphs
Renaming StaticGraph? to Graph

Location:
test
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • test/bfs_test.cc

    r1956 r2111  
    3030void check_Bfs_Compile()
    3131{
    32   typedef concept::StaticGraph Graph;
     32  typedef concept::Graph Graph;
    3333
    3434  typedef Graph::Edge Edge;
    … …  
    6767{
    6868  typedef int VType;
    69   typedef concept::StaticGraph Graph;
     69  typedef concept::Graph Graph;
    7070
    7171  typedef Graph::Edge Edge;

  • test/dfs_test.cc

    r1956 r2111  
    3030void check_Dfs_SmartGraph_Compile()
    3131{
    32   typedef concept::StaticGraph Graph;
     32  typedef concept::Graph Graph;
    3333
    3434  typedef Graph::Edge Edge;
    … …  
    6868{
    6969  typedef int VType;
    70   typedef concept::StaticGraph Graph;
     70  typedef concept::Graph Graph;
    7171
    7272  typedef Graph::Edge Edge;

  • test/dijkstra_test.cc

    r1956 r2111  
    3232{
    3333  typedef int VType;
    34   typedef concept::StaticGraph Graph;
     34  typedef concept::Graph Graph;
    3535
    3636  typedef Graph::Edge Edge;
    … …  
    7171{
    7272  typedef int VType;
    73   typedef concept::StaticGraph Graph;
     73  typedef concept::Graph Graph;
    7474
    7575  typedef Graph::Edge Edge;

  • test/edge_set_test.cc

    r1990 r2111  
    1818using namespace lemon::concept;
    1919
    20 typedef SmartGraph Graph;
     20typedef SmartGraph RGraph;
    2121
    2222int main() {
    2323  { // checking edge_sets
    24     checkConcept<StaticGraph, ListEdgeSet<Graph> >();
    25     checkConcept<UGraph, ListUEdgeSet<Graph> >();
    26     checkConcept<StaticGraph, SmartEdgeSet<Graph> >();
    27     checkConcept<UGraph, SmartUEdgeSet<Graph> >();
     24    checkConcept<Graph, ListEdgeSet<RGraph> >();
     25    checkConcept<UGraph, ListUEdgeSet<RGraph> >();
     26    checkConcept<Graph, SmartEdgeSet<RGraph> >();
     27    checkConcept<UGraph, SmartUEdgeSet<RGraph> >();
    2828  }
    2929

  • test/graph_adaptor_test.cc

    r1991 r2111  
    4747{
    4848  {
    49     typedef StaticGraph Graph;
    50     checkConcept<StaticGraph, GraphAdaptor<Graph> >();
     49    typedef Graph Graph;
     50    checkConcept<Graph, GraphAdaptor<Graph> >();
    5151
    52     checkConcept<StaticGraph, RevGraphAdaptor<Graph> >();
     52    checkConcept<Graph, RevGraphAdaptor<Graph> >();
    5353
    54     checkConcept<StaticGraph, SubGraphAdaptor<Graph,
     54    checkConcept<Graph, SubGraphAdaptor<Graph,
    5555      Graph::NodeMap<bool> , Graph::EdgeMap<bool> > >();
    56     checkConcept<StaticGraph, NodeSubGraphAdaptor<Graph,
     56    checkConcept<Graph, NodeSubGraphAdaptor<Graph,
    5757      Graph::NodeMap<bool> > >();
    58     checkConcept<StaticGraph, EdgeSubGraphAdaptor<Graph,
     58    checkConcept<Graph, EdgeSubGraphAdaptor<Graph,
    5959      Graph::EdgeMap<bool> > >();
    6060   
    61     checkConcept<StaticGraph, ResGraphAdaptor<Graph, int,
     61    checkConcept<Graph, ResGraphAdaptor<Graph, int,
    6262      Graph::EdgeMap<int>, Graph::EdgeMap<int> > >();
    6363
    64     checkConcept<StaticGraph, ErasingFirstGraphAdaptor<Graph,
     64    checkConcept<Graph, ErasingFirstGraphAdaptor<Graph,
    6565      Graph::NodeMap<Graph::Edge> > >();
    6666
    … …  
    7474      UGraph::UEdgeMap<bool> > >();
    7575
    76     checkConcept<StaticGraph, DirUGraphAdaptor<UGraph,
     76    checkConcept<Graph, DirUGraphAdaptor<UGraph,
    7777      UGraph::UEdgeMap<bool> > >();
    7878  }

  • test/graph_factory_test.cc

    r1956 r2111  
    7171
    7272//Compile Graph
    73 template void lemon::concept::checkCompileStaticGraph<concept::StaticGraph>
    74 (concept::StaticGraph &);
     73template void lemon::concept::checkCompileGraph<concept::Graph>
     74(concept::Graph &);
    7575
    7676template
    77 void lemon::concept::checkCompileExtendableGraph<concept::ExtendableGraph>
    78 (concept::ExtendableGraph &);
     77void lemon::concept::checkCompileGraph<concept::Graph>
     78(concept::Graph &);
    7979
    8080template
    81 void lemon::concept::checkCompileErasableGraph<concept::ErasableGraph>
    82 (concept::ErasableGraph &);
     81void lemon::concept::checkCompileGraph<concept::Graph>
     82(concept::Graph &);
    8383
    8484//Compile SmartGraph
    8585template
    86 void lemon::concept::checkCompileExtendableGraph<SmartGraph>(SmartGraph &);
     86void lemon::concept::checkCompileGraph<SmartGraph>(SmartGraph &);
    8787template
    8888void lemon::concept::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
    … …  
    9494//Compile ListGraph
    9595template
    96 void lemon::concept::checkCompileExtendableGraph<ListGraph>(ListGraph &);
     96void lemon::concept::checkCompileGraph<ListGraph>(ListGraph &);
    9797template
    98 void lemon::concept::checkCompileErasableGraph<ListGraph>(ListGraph &);
     98void lemon::concept::checkCompileGraph<ListGraph>(ListGraph &);
    9999template
    100100void lemon::concept::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
    … …  
    103103//Compile SymListGraph
    104104//template void hugo::checkCompileGraph<SymListGraph>(SymListGraph &);
    105 //template void hugo::checkCompileErasableGraph<SymListGraph>(SymListGraph &);
     105//template void hugo::checkCompileGraph<SymListGraph>(SymListGraph &);
    106106//template void hugo::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
    107107
    108108//Compile FullGraph
    109 template void lemon::concept::checkCompileStaticGraph<FullGraph>(FullGraph &);
     109template void lemon::concept::checkCompileGraph<FullGraph>(FullGraph &);
    110110template
    111111void lemon::concept::checkCompileGraphFindEdge<FullGraph>(FullGraph &);

  • test/graph_test.cc

    r1956 r2111  
    4444    checkConcept<MaxIDableGraphComponent, MaxIDableGraphComponent >();
    4545
    46     checkConcept<BaseExtendableGraphComponent, BaseExtendableGraphComponent >();
    47     checkConcept<BaseErasableGraphComponent, BaseErasableGraphComponent >();
    48 
    4946    checkConcept<IterableGraphComponent, IterableGraphComponent >();
    5047
    5148    checkConcept<MappableGraphComponent, MappableGraphComponent >();
    5249
    53     checkConcept<ExtendableGraphComponent, ExtendableGraphComponent >();
    54     checkConcept<ErasableGraphComponent, ErasableGraphComponent >();
    55     checkConcept<ClearableGraphComponent, ClearableGraphComponent >();
    5650  }
    5751  { // checking skeleton graphs
    58     checkConcept<StaticGraph, StaticGraph >();
    59     checkConcept<ExtendableGraph, ExtendableGraph >();
    60     checkConcept<ErasableGraph, ErasableGraph >();
     52    checkConcept<Graph, Graph >();
    6153  }
    6254  { // checking list graph
    63     checkConcept<ErasableGraph, ListGraph >();
     55    checkConcept<Graph, ListGraph >();
    6456
    6557    checkGraph<ListGraph>();
    … …  
    6860  }
    6961  { // checking smart graph
    70     checkConcept<ExtendableGraph, SmartGraph >();
     62    checkConcept<Graph, SmartGraph >();
    7163
    7264    checkGraph<SmartGraph>();
    … …  
    7567  }
    7668  { // checking full graph
    77     checkConcept<StaticGraph, FullGraph >();
     69    checkConcept<Graph, FullGraph >();
    7870  }
    7971  { // checking full graph
    80     checkConcept<StaticGraph, HyperCubeGraph >();
     72    checkConcept<Graph, HyperCubeGraph >();
    8173  }
    8274

  • test/kruskal_test.cc

    r1956 r2111  
    3333void checkCompileKruskal()
    3434{
    35   concept::WriteMap<concept::StaticGraph::Edge,bool> w;
     35  concept::WriteMap<concept::Graph::Edge,bool> w;
    3636
    37   kruskal(concept::StaticGraph(),
    38           concept::ReadMap<concept::StaticGraph::Edge,int>(),
     37  kruskal(concept::Graph(),
     38          concept::ReadMap<concept::Graph::Edge,int>(),
    3939          w);
    4040}

  • test/preflow_test.cc

    r2108 r2111  
    3232{
    3333  typedef int VType;
    34   typedef concept::StaticGraph Graph;
     34  typedef concept::Graph Graph;
    3535
    3636  typedef Graph::Node Node;

  • test/ugraph_test.cc

    r1979 r2111  
    3434void check_concepts() {
    3535  checkConcept<UGraph, ListUGraph>();
    36   checkConcept<ErasableUGraph, ListUGraph>();
    3736
    3837  checkConcept<UGraph, SmartUGraph>();
    39   checkConcept<ExtendableUGraph, SmartUGraph>();
    4038
    4139  checkConcept<UGraph, FullUGraph>();
Note: See TracChangeset for help on using the changeset viewer.