1.1 --- a/src/test/graph_factory_test.cc Thu Nov 04 18:52:31 2004 +0000
1.2 +++ b/src/test/graph_factory_test.cc Thu Nov 04 20:24:59 2004 +0000
1.3 @@ -16,8 +16,8 @@
1.4
1.5 #include<iostream>
1.6 #include<lemon/smart_graph.h>
1.7 -#include<lemon/skeletons/graph.h>
1.8 -#include<lemon/skeletons/maps.h>
1.9 +#include<lemon/concept/graph.h>
1.10 +#include<lemon/concept/maps.h>
1.11 #include<lemon/list_graph_base.h>
1.12 #include<lemon/full_graph.h>
1.13
1.14 @@ -68,22 +68,22 @@
1.15 }
1.16
1.17 //Compile Graph
1.18 -template void lemon::skeleton::checkCompileStaticGraph<skeleton::StaticGraph>
1.19 -(skeleton::StaticGraph &);
1.20 +template void lemon::concept::checkCompileStaticGraph<concept::StaticGraph>
1.21 +(concept::StaticGraph &);
1.22
1.23 template
1.24 -void lemon::skeleton::checkCompileExtendableGraph<skeleton::ExtendableGraph>
1.25 -(skeleton::ExtendableGraph &);
1.26 +void lemon::concept::checkCompileExtendableGraph<concept::ExtendableGraph>
1.27 +(concept::ExtendableGraph &);
1.28
1.29 template
1.30 -void lemon::skeleton::checkCompileErasableGraph<skeleton::ErasableGraph>
1.31 -(skeleton::ErasableGraph &);
1.32 +void lemon::concept::checkCompileErasableGraph<concept::ErasableGraph>
1.33 +(concept::ErasableGraph &);
1.34
1.35 //Compile SmartGraph
1.36 template
1.37 -void lemon::skeleton::checkCompileExtendableGraph<SmartGraph>(SmartGraph &);
1.38 +void lemon::concept::checkCompileExtendableGraph<SmartGraph>(SmartGraph &);
1.39 template
1.40 -void lemon::skeleton::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
1.41 +void lemon::concept::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
1.42
1.43 //Compile SymSmartGraph
1.44 //template void hugo::checkCompileGraph<SymSmartGraph>(SymSmartGraph &);
1.45 @@ -91,11 +91,11 @@
1.46
1.47 //Compile ListGraph
1.48 template
1.49 -void lemon::skeleton::checkCompileExtendableGraph<ListGraph>(ListGraph &);
1.50 +void lemon::concept::checkCompileExtendableGraph<ListGraph>(ListGraph &);
1.51 template
1.52 -void lemon::skeleton::checkCompileErasableGraph<ListGraph>(ListGraph &);
1.53 +void lemon::concept::checkCompileErasableGraph<ListGraph>(ListGraph &);
1.54 template
1.55 -void lemon::skeleton::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
1.56 +void lemon::concept::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
1.57
1.58
1.59 //Compile SymListGraph
1.60 @@ -104,9 +104,9 @@
1.61 //template void hugo::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
1.62
1.63 //Compile FullGraph
1.64 -template void lemon::skeleton::checkCompileStaticGraph<FullGraph>(FullGraph &);
1.65 +template void lemon::concept::checkCompileStaticGraph<FullGraph>(FullGraph &);
1.66 template
1.67 -void lemon::skeleton::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
1.68 +void lemon::concept::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
1.69
1.70
1.71 int main()
1.72 @@ -141,7 +141,7 @@
1.73
1.74 // Some map tests.
1.75 // FIXME: These shouldn't be here.
1.76 - using namespace skeleton;
1.77 + using namespace concept;
1.78 function_requires< ReadMapConcept< ReadMap<int,int> > >();
1.79 function_requires< WriteMapConcept< WriteMap<int,int> > >();
1.80 function_requires< ReadWriteMapConcept< ReadWriteMap<int,int> > >();