Changeset 1401:9588dcef6793 in lemon-0.x for src/test

Timestamp:

05/04/05 15:07:10 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

wrapper -> adaptor

Location:

src/test

Files:

• Makefile.am (modified) (2 diffs)
• graph_adaptor_test.cc (moved) (moved from src/test/graph_wrapper_test.cc) (4 diffs)

src/test/Makefile.am

@@ -17 +17 @@
         dijkstra_test \
         graph_test \
-        graph_wrapper_test \
+        graph_adaptor_test \
         graph_utils_test \
         kruskal_test \
@@ -50 +50 @@
 graph_test_SOURCES = graph_test.cc
 graph_utils_test_SOURCES = graph_utils_test.cc
-graph_wrapper_test_SOURCES = graph_wrapper_test.cc
+graph_adaptor_test_SOURCES = graph_adaptor_test.cc
 kruskal_test_SOURCES = kruskal_test.cc
 maps_test_SOURCES = maps_test.cc

src/test/graph_adaptor_test.cc

@@ -1 +1 @@
 /* -*- C++ -*-
- * src/test/graph_wrapper_test.cc - Part of LEMON, a generic C++ optimization library
+ * src/test/graph_adaptor_test.cc - Part of LEMON, a generic C++ optimization library
  *
  * Copyright (C) 2005 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
@@ -24 +24 @@
 #include<lemon/list_graph.h>
 #include<lemon/full_graph.h>
-#include<lemon/graph_wrapper.h>
+#include<lemon/graph_adaptor.h>
 
 #include"test/test_tools.h"
@@ -31 +31 @@
 /**
 \file
-This test makes consistency checks of graph wrappers.
+This test makes consistency checks of graph adaptors.
 
 \todo More extensive tests are needed 
@@ -45 +45 @@
   {
     typedef StaticGraph Graph;
-    checkConcept<StaticGraph, GraphWrapper<Graph> >();
+    checkConcept<StaticGraph, GraphAdaptor<Graph> >();
 
-    checkConcept<StaticGraph, RevGraphWrapper<Graph> >();
+    checkConcept<StaticGraph, RevGraphAdaptor<Graph> >();
 
-    checkConcept<StaticGraph, SubGraphWrapper<Graph, 
+    checkConcept<StaticGraph, SubGraphAdaptor<Graph, 
       Graph::NodeMap<bool> , Graph::EdgeMap<bool> > >();
-    checkConcept<StaticGraph, NodeSubGraphWrapper<Graph, 
+    checkConcept<StaticGraph, NodeSubGraphAdaptor<Graph, 
       Graph::NodeMap<bool> > >();
-    checkConcept<StaticGraph, EdgeSubGraphWrapper<Graph, 
+    checkConcept<StaticGraph, EdgeSubGraphAdaptor<Graph, 
       Graph::EdgeMap<bool> > >();
     
-    checkConcept<StaticGraph, SubBidirGraphWrapper<Graph, 
+    checkConcept<StaticGraph, SubBidirGraphAdaptor<Graph, 
       Graph::EdgeMap<bool>, Graph::EdgeMap<bool> > >();
     //    checkConcept<StaticGraph, BidirGraph<Graph> >();
-    checkConcept<StaticGraph, ResGraphWrapper<Graph, int, 
+    checkConcept<StaticGraph, ResGraphAdaptor<Graph, int, 
       Graph::EdgeMap<int>, Graph::EdgeMap<int> > >();
 
-    checkConcept<StaticGraph, ErasingFirstGraphWrapper<Graph, 
+    checkConcept<StaticGraph, ErasingFirstGraphAdaptor<Graph, 
       Graph::NodeMap<Graph::Edge> > >(); 
 
     /// \bug why does not compile with StaticGraph
-    checkConcept<BaseIterableUndirGraphConcept, UndirGraphWrapper<ListGraph> >();
-    checkConcept<IterableUndirGraphConcept, UndirGraphWrapper<ListGraph> >();
-    checkConcept<MappableUndirGraphConcept, UndirGraphWrapper<ListGraph> >();
+    checkConcept<BaseIterableUndirGraphConcept, UndirGraphAdaptor<ListGraph> >();
+    checkConcept<IterableUndirGraphConcept, UndirGraphAdaptor<ListGraph> >();
+    checkConcept<MappableUndirGraphConcept, UndirGraphAdaptor<ListGraph> >();
   }
   std::cout << __FILE__ ": All tests passed.\n";