COIN-OR::LEMON - Graph Library

Changeset 959:c80ef5912903 in lemon-0.x for src/test


Ignore:
Timestamp:
11/04/04 21:24:59 (16 years ago)
Author:
Mihaly Barasz
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1342
Message:

skeleton(s) -> concept renaming

Location:
src/test
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • src/test/bfs_test.cc

    r921 r959  
    1818#include <lemon/smart_graph.h>
    1919#include <lemon/bfs.h>
    20 #include<lemon/skeletons/graph.h>
     20#include<lemon/concept/graph.h>
    2121
    2222using namespace lemon;
     
    2727void check_Bfs_Compile()
    2828{
    29   typedef skeleton::StaticGraph Graph;
     29  typedef concept::StaticGraph Graph;
    3030
    3131  typedef Graph::Edge Edge;
  • src/test/dfs_test.cc

    r921 r959  
    1818#include <lemon/smart_graph.h>
    1919#include <lemon/dfs.h>
    20 #include<lemon/skeletons/graph.h>
     20#include <lemon/concept/graph.h>
    2121
    2222using namespace lemon;
     
    2727void check_Dfs_SmartGraph_Compile()
    2828{
    29   typedef skeleton::StaticGraph Graph;
     29  typedef concept::StaticGraph Graph;
    3030
    3131  typedef Graph::Edge Edge;
  • src/test/dijkstra_test.cc

    r921 r959  
    1818#include <lemon/smart_graph.h>
    1919#include <lemon/dijkstra.h>
    20 #include<lemon/skeletons/graph.h>
    21 #include<lemon/skeletons/maps.h>
     20#include <lemon/concept/graph.h>
     21#include <lemon/concept/maps.h>
    2222using namespace lemon;
    2323
     
    2828{
    2929  typedef int VType;
    30   typedef skeleton::StaticGraph Graph;
     30  typedef concept::StaticGraph Graph;
    3131
    3232  typedef Graph::Edge Edge;
     
    3434  typedef Graph::EdgeIt EdgeIt;
    3535  typedef Graph::NodeIt NodeIt;
    36   typedef skeleton::ReadMap<Edge,VType> LengthMap;
     36  typedef concept::ReadMap<Edge,VType> LengthMap;
    3737 
    3838  typedef Dijkstra<Graph, LengthMap> DType;
  • src/test/graph_factory_test.cc

    r946 r959  
    1717#include<iostream>
    1818#include<lemon/smart_graph.h>
    19 #include<lemon/skeletons/graph.h>
    20 #include<lemon/skeletons/maps.h>
     19#include<lemon/concept/graph.h>
     20#include<lemon/concept/maps.h>
    2121#include<lemon/list_graph_base.h>
    2222#include<lemon/full_graph.h>
     
    6969
    7070//Compile Graph
    71 template void lemon::skeleton::checkCompileStaticGraph<skeleton::StaticGraph>
    72 (skeleton::StaticGraph &);
     71template void lemon::concept::checkCompileStaticGraph<concept::StaticGraph>
     72(concept::StaticGraph &);
    7373
    7474template
    75 void lemon::skeleton::checkCompileExtendableGraph<skeleton::ExtendableGraph>
    76 (skeleton::ExtendableGraph &);
     75void lemon::concept::checkCompileExtendableGraph<concept::ExtendableGraph>
     76(concept::ExtendableGraph &);
    7777
    7878template
    79 void lemon::skeleton::checkCompileErasableGraph<skeleton::ErasableGraph>
    80 (skeleton::ErasableGraph &);
     79void lemon::concept::checkCompileErasableGraph<concept::ErasableGraph>
     80(concept::ErasableGraph &);
    8181
    8282//Compile SmartGraph
    8383template
    84 void lemon::skeleton::checkCompileExtendableGraph<SmartGraph>(SmartGraph &);
     84void lemon::concept::checkCompileExtendableGraph<SmartGraph>(SmartGraph &);
    8585template
    86 void lemon::skeleton::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
     86void lemon::concept::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
    8787
    8888//Compile SymSmartGraph
     
    9292//Compile ListGraph
    9393template
    94 void lemon::skeleton::checkCompileExtendableGraph<ListGraph>(ListGraph &);
     94void lemon::concept::checkCompileExtendableGraph<ListGraph>(ListGraph &);
    9595template
    96 void lemon::skeleton::checkCompileErasableGraph<ListGraph>(ListGraph &);
     96void lemon::concept::checkCompileErasableGraph<ListGraph>(ListGraph &);
    9797template
    98 void lemon::skeleton::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
     98void lemon::concept::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
    9999
    100100
     
    105105
    106106//Compile FullGraph
    107 template void lemon::skeleton::checkCompileStaticGraph<FullGraph>(FullGraph &);
     107template void lemon::concept::checkCompileStaticGraph<FullGraph>(FullGraph &);
    108108template
    109 void lemon::skeleton::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
     109void lemon::concept::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
    110110
    111111
     
    142142  // Some map tests.
    143143  // FIXME: These shouldn't be here.
    144   using namespace skeleton;
     144  using namespace concept;
    145145  function_requires< ReadMapConcept< ReadMap<int,int> > >();
    146146  function_requires< WriteMapConcept< WriteMap<int,int> > >();
  • src/test/graph_test.cc

    r946 r959  
    44#include <vector>
    55
    6 #include <lemon/skeletons/graph.h>
     6#include <lemon/concept/graph.h>
    77#include <lemon/list_graph.h>
    88#include <lemon/smart_graph.h>
     
    1515
    1616using namespace lemon;
    17 using namespace lemon::skeleton;
     17using namespace lemon::concept;
    1818
    1919
  • src/test/graph_wrapper_test.cc

    r946 r959  
    1919
    2020#include<lemon/smart_graph.h>
    21 #include<lemon/skeletons/graph.h>
     21#include<lemon/concept/graph.h>
    2222
    2323#include<lemon/list_graph.h>
     
    3636
    3737using namespace lemon;
    38 using namespace lemon::skeleton;
     38using namespace lemon::concept;
    3939
    4040
  • src/test/kruskal_test.cc

    r921 r959  
    2222#include <lemon/kruskal.h>
    2323#include <lemon/list_graph.h>
    24 #include <lemon/skeletons/maps.h>
    25 #include <lemon/skeletons/graph.h>
     24#include <lemon/concept/maps.h>
     25#include <lemon/concept/graph.h>
    2626
    2727
     
    3131void checkCompileKruskal()
    3232{
    33   skeleton::WriteMap<skeleton::StaticGraph::Edge,bool> w;
     33  concept::WriteMap<concept::StaticGraph::Edge,bool> w;
    3434
    35   kruskalEdgeMap(skeleton::StaticGraph(),
    36                  skeleton::ReadMap<skeleton::StaticGraph::Edge,int>(),
     35  kruskalEdgeMap(concept::StaticGraph(),
     36                 concept::ReadMap<concept::StaticGraph::Edge,int>(),
    3737                 w);
    3838}
  • src/test/new_graph_test.cc

    r946 r959  
    1515 */
    1616
    17 #include <lemon/skeletons/graph.h>
     17#include <lemon/concept/graph.h>
    1818// #include <boost/concept_check.hpp>
    1919
    20 using namespace lemon::skeleton;
     20using namespace lemon::concept;
    2121
    2222// Borrowed from boost:
  • src/test/path_test.cc

    r921 r959  
    1717#include <string>
    1818#include <iostream>
    19 #include <lemon/skeletons/path.h>
     19#include <lemon/concept/path.h>
    2020#include <lemon/path.h>
    2121#include <lemon/list_graph.h>
     
    2323using namespace std;
    2424using namespace lemon;
    25 using namespace skeleton;
     25using namespace lemon::concept;
    2626
    2727template<class Path> void checkCompilePath(Path &P)
     
    8787}
    8888
    89 template void checkCompilePath< skeleton::Path<ListGraph> >(skeleton::Path<ListGraph> &);
     89template void checkCompilePath< concept::Path<ListGraph> >(concept::Path<ListGraph> &);
    9090template void checkCompilePath< DirPath<ListGraph> >(DirPath<ListGraph> &);
    9191template void checkCompilePath< UndirPath<ListGraph> >(UndirPath<ListGraph> &);
  • src/test/preflow_test.cc

    r940 r959  
    2222#include <lemon/dimacs.h>
    2323#include <lemon/preflow.h>
    24 #include <lemon/skeletons/graph.h>
    25 #include <lemon/skeletons/maps.h>
     24#include <lemon/concept/graph.h>
     25#include <lemon/concept/maps.h>
    2626
    2727using namespace lemon;
     
    3030{
    3131  typedef int VType;
    32   typedef skeleton::StaticGraph Graph;
     32  typedef concept::StaticGraph Graph;
    3333
    3434  typedef Graph::Node Node;
    3535  typedef Graph::Edge Edge;
    36   typedef skeleton::ReadMap<Edge,VType> CapMap;
    37   typedef skeleton::ReadWriteMap<Edge,VType> FlowMap;
    38   typedef skeleton::ReadWriteMap<Node,bool> CutMap;
     36  typedef concept::ReadMap<Edge,VType> CapMap;
     37  typedef concept::ReadWriteMap<Edge,VType> FlowMap;
     38  typedef concept::ReadWriteMap<Node,bool> CutMap;
    3939 
    4040  typedef Preflow<Graph, int, CapMap, FlowMap> PType;
  • src/test/sym_graph_test.cc

    r938 r959  
    1717#include<iostream>
    1818
    19 #include<lemon/skeletons/sym_graph.h>
     19#include<lemon/concept/sym_graph.h>
    2020
    2121#include<lemon/list_graph.h>
     
    5555
    5656//Compile Graph
    57 template void lemon::checkCompileStaticSymGraph<skeleton::StaticSymGraph>
    58 (skeleton::StaticSymGraph &);
     57template void lemon::checkCompileStaticSymGraph<concept::StaticSymGraph>
     58(concept::StaticSymGraph &);
    5959
    60 template void lemon::checkCompileSymGraph<skeleton::ExtendableSymGraph>
    61 (skeleton::ExtendableSymGraph &);
     60template void lemon::checkCompileSymGraph<concept::ExtendableSymGraph>
     61(concept::ExtendableSymGraph &);
    6262
    63 template void lemon::checkCompileErasableSymGraph<skeleton::ErasableSymGraph>
    64 (skeleton::ErasableSymGraph &);
     63template void lemon::checkCompileErasableSymGraph<concept::ErasableSymGraph>
     64(concept::ErasableSymGraph &);
    6565
    6666
     
    6868template void lemon::checkCompileSymGraph<SymSmartGraph>(SymSmartGraph &);
    6969template
    70 void lemon::skeleton::checkCompileGraphFindEdge<SymSmartGraph>(SymSmartGraph &);
     70void lemon::concept::checkCompileGraphFindEdge<SymSmartGraph>(SymSmartGraph &);
    7171
    7272//Compile SymListGraph
     
    7474template void lemon::checkCompileErasableSymGraph<SymListGraph>(SymListGraph &);
    7575template
    76 void lemon::skeleton::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
     76void lemon::concept::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
    7777
    7878int main()
  • src/test/sym_graph_test.h

    r938 r959  
    2828  /// \e
    2929
    30   /// \todo This should go to lemon/skeleton/symgraph.h
     30  /// \todo This should go to lemon/concept/symgraph.h
    3131  ///
    3232  template<class Graph> void checkCompileStaticSymGraph(Graph &G)
     
    4141      typedef typename Graph::OutEdgeIt OutEdgeIt;
    4242
    43       lemon::skeleton::checkCompileStaticGraph(G);
     43      lemon::concept::checkCompileStaticGraph(G);
    4444 
    4545      {
     
    158158    {
    159159      checkCompileSymGraph(G);
    160       lemon::skeleton::checkCompileGraphEraseNode(G);
     160      lemon::concept::checkCompileGraphEraseNode(G);
    161161      checkCompileSymGraphEraseSymEdge(G);
    162162    }
Note: See TracChangeset for help on using the changeset viewer.