Changeset 989:ca95f8b5c931 in lemon-0.x for src/test

Timestamp:

11/13/04 22:37:54 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1379

Message:

XyzConcept? moved to Xyz::Constraints
use checkConcept in the next way:

checkConcept<ErasableGraph?, ListGraph?>();
checkConcept<ReadWriteMap?<Node, Node>, PredMap?>;

Location:

src/test

Files:

• graph_test.cc (modified) (3 diffs)
• graph_wrapper_test.cc (modified) (1 diff)

src/test/graph_test.cc

@@ -21 +21 @@
   ///\file
   { // checking graph components
-    function_requires<BaseGraphComponentConcept<BaseGraphComponent> >();
+    checkConcept<BaseGraphComponent, BaseGraphComponent >();
 
-    function_requires<BaseIterableGraphComponentConcept<BaseIterableGraphComponent> >();
+    checkConcept<BaseIterableGraphComponent, BaseIterableGraphComponent >();
 
-    function_requires<IDableGraphComponentConcept<IDableGraphComponent> >();
-    function_requires<MaxIDableGraphComponentConcept<MaxIDableGraphComponent> >();
+    checkConcept<IDableGraphComponent, IDableGraphComponent >();
+    checkConcept<MaxIDableGraphComponent, MaxIDableGraphComponent >();
 
-    function_requires<BaseExtendableGraphComponentConcept<BaseExtendableGraphComponent> >();
-    function_requires<BaseErasableGraphComponentConcept<BaseErasableGraphComponent> >();
-    function_requires<BaseClearableGraphComponentConcept<BaseClearableGraphComponent> >();
+    checkConcept<BaseExtendableGraphComponent, BaseExtendableGraphComponent >();
+    checkConcept<BaseErasableGraphComponent, BaseErasableGraphComponent >();
+    checkConcept<BaseClearableGraphComponent, BaseClearableGraphComponent >();
 
-    function_requires<IterableGraphComponentConcept<IterableGraphComponent> >();
+    checkConcept<IterableGraphComponent, IterableGraphComponent >();
 
-    function_requires<MappableGraphComponentConcept<MappableGraphComponent> >();
+    checkConcept<MappableGraphComponent, MappableGraphComponent >();
 
-    function_requires<ExtendableGraphComponentConcept<ExtendableGraphComponent> >();
-    function_requires<ErasableGraphComponentConcept<ErasableGraphComponent> >();
-    function_requires<ClearableGraphComponentConcept<ClearableGraphComponent> >();
+    checkConcept<ExtendableGraphComponent, ExtendableGraphComponent >();
+    checkConcept<ErasableGraphComponent, ErasableGraphComponent >();
+    checkConcept<ClearableGraphComponent, ClearableGraphComponent >();
   }
   { // checking skeleton graphs
-    function_requires<StaticGraphConcept<StaticGraph> >();
-    function_requires<ExtendableGraphConcept<ExtendableGraph> >();
-    function_requires<ErasableGraphConcept<ErasableGraph> >();
+    checkConcept<StaticGraph, StaticGraph >();
+    checkConcept<ExtendableGraph, ExtendableGraph >();
+    checkConcept<ErasableGraph, ErasableGraph >();
   }
   { // checking list graph
-    function_requires<ErasableGraphConcept<ListGraph> >();
+    checkConcept<ErasableGraph, ListGraph >();
 
     checkGraph<ListGraph>();
@@ -53 +53 @@
   }
   { // checking smart graph
-    function_requires<ExtendableGraphConcept<SmartGraph> >();
+    checkConcept<ExtendableGraph, SmartGraph >();
 
     checkGraph<SmartGraph>();
@@ -60 +60 @@
   }
   { // checking full graph
-    function_requires<StaticGraphConcept<FullGraph> >();
+    checkConcept<StaticGraph, FullGraph >();
   }
 

src/test/graph_wrapper_test.cc

@@ -39 +39 @@
 
 
-typedef SmartGraph Graph;
-
 
 int main() 
 {
   {
-    function_requires<StaticGraphConcept<GraphWrapper<Graph> > >();
+    checkConcept<StaticGraph, GraphWrapper<StaticGraph> >();
 
 //     function_requires<StaticGraphConcept<RevGraphWrapper<Graph> > >();