[Boost-commit] svn:boost r38722 - sandbox/SOC/2007/graphs/libs/graph/test/concept

From: asutton_at_[hidden]
Date: 2007-08-16 12:23:51

Author: asutton
Date: 2007-08-16 12:23:50 EDT (Thu, 16 Aug 2007)
New Revision: 38722
URL: http://svn.boost.org/trac/boost/changeset/38722

Log:
Finished concept coverage for files in this directory

Text files modified: 
   sandbox/SOC/2007/graphs/libs/graph/test/concept/closeness_centrality_check.cpp |    20 +++++++++++-                            
   sandbox/SOC/2007/graphs/libs/graph/test/concept/degree_centrality_check.cpp    |    33 ++++++++++----------                    
   sandbox/SOC/2007/graphs/libs/graph/test/concept/eccentricity_check.cpp         |    64 ++++++++++++++++++++++++++++----------- 
   sandbox/SOC/2007/graphs/libs/graph/test/concept/mean_geodesic_check.cpp        |    37 +++++++++++++++++++++-                  
   4 files changed, 116 insertions(+), 38 deletions(-)

Modified: sandbox/SOC/2007/graphs/libs/graph/test/concept/closeness_centrality_check.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/concept/closeness_centrality_check.cpp	(original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/concept/closeness_centrality_check.cpp	2007-08-16 12:23:50 EDT (Thu, 16 Aug 2007)
@@ -14,12 +14,11 @@
 main(int argc, char *argv[])
 {
     {
-        typedef descriptor_archetype Vertex;
         typedef vertex_list_graph_archetype<
-                Vertex,
                 undirected_tag,
                 allow_parallel_edge_tag
             > Graph;
+        typedef Graph::vertex_descriptor Vertex;
         typedef writable_property_map_archetype<Vertex, float> CentralityMap;
         typedef readable_property_map_archetype<Vertex, size_t> DistanceMap;
         typedef readable_property_map_archetype<Vertex, DistanceMap> DistanceMatrix;
@@ -34,5 +33,22 @@
         closeness_centrality(g, dm, cm, m);
     }
 
+    {
+        typedef vertex_list_graph_archetype<
+                undirected_tag,
+                allow_parallel_edge_tag
+            > Graph;
+        typedef Graph::vertex_descriptor Vertex;
+        typedef readable_property_map_archetype<Vertex, size_t> DistanceMap;
+        typedef distance_measure_archetype<Graph, size_t, float> Measure;
+
+        Graph& g = static_object<Graph>::get();
+        DistanceMap dm;
+        Measure m;
+
+        vertex_closeness_centrality(g, dm);
+        vertex_closeness_centrality(g, dm, m);
+    }
+
     return 0;
 }

Modified: sandbox/SOC/2007/graphs/libs/graph/test/concept/degree_centrality_check.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/concept/degree_centrality_check.cpp	(original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/concept/degree_centrality_check.cpp	2007-08-16 12:23:50 EDT (Thu, 16 Aug 2007)
@@ -22,12 +22,12 @@
                 undirected_tag,
                 allow_parallel_edge_tag,
                 IncidenceGraph
-            > VertexListGraph;
-        typedef VertexListGraph::vertex_descriptor Vertex;
+            > Graph;
+        typedef Graph::vertex_descriptor Vertex;
         typedef writable_property_map_archetype<Vertex, size_t> CentralityMap;
-        typedef degree_measure_archetype<VertexListGraph> Measure;
+        typedef degree_measure_archetype<Graph> Measure;
 
-        VertexListGraph& g = static_object<VertexListGraph>::get();
+        Graph& g = static_object<Graph>::get();
         CentralityMap cm;
         Measure m;
 
@@ -44,12 +44,12 @@
                 directed_tag,
                 allow_parallel_edge_tag,
                 VertexListGraph
-            > BidirectionalGraph;
-        typedef BidirectionalGraph::vertex_descriptor Vertex;
+                        > Graph;
+        typedef Graph::vertex_descriptor Vertex;
         typedef read_write_property_map_archetype<Vertex, size_t> CentralityMap;
-        typedef degree_measure_archetype<BidirectionalGraph> Measure;
+        typedef degree_measure_archetype<Graph> Measure;
 
-        BidirectionalGraph& g = static_object<BidirectionalGraph>::get();
+        Graph& g = static_object<Graph>::get();
         CentralityMap cm;
         Measure m;
 
@@ -62,11 +62,11 @@
         typedef incidence_graph_archetype<
                 undirected_tag,
                 allow_parallel_edge_tag
-            > IncidenceGraph;
-        typedef IncidenceGraph::vertex_descriptor Vertex;
-        typedef degree_measure_archetype<IncidenceGraph> Measure;
+                        > Graph;
+        typedef Graph::vertex_descriptor Vertex;
+        typedef degree_measure_archetype<Graph> Measure;
 
-        IncidenceGraph& g = static_object<IncidenceGraph>::get();
+        Graph& g = static_object<Graph>::get();
         Vertex v = static_object<Vertex>::get();
         Measure m;
 
@@ -78,11 +78,11 @@
         typedef bidirectional_graph_archetype<
                 undirected_tag,
                 allow_parallel_edge_tag
-            > BidirectionalGraph;
-        typedef BidirectionalGraph::vertex_descriptor Vertex;
-        typedef degree_measure_archetype<BidirectionalGraph> Measure;
+                        > Graph;
+        typedef Graph::vertex_descriptor Vertex;
+        typedef degree_measure_archetype<Graph> Measure;
 
-        BidirectionalGraph& g = static_object<BidirectionalGraph>::get();
+        Graph& g = static_object<Graph>::get();
         Vertex v = static_object<Vertex>::get();
         Measure m;
 
@@ -90,5 +90,6 @@
         vertex_degree_centrality(g, v, measure_prestige(g));
         vertex_degree_centrality(g, v, m);
     }
+
     return 0;
 }

Modified: sandbox/SOC/2007/graphs/libs/graph/test/concept/eccentricity_check.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/concept/eccentricity_check.cpp	(original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/concept/eccentricity_check.cpp	2007-08-16 12:23:50 EDT (Thu, 16 Aug 2007)
@@ -13,24 +13,52 @@
 int
 main(int argc, char *argv[])
 {
-    typedef descriptor_archetype Vertex;
-    typedef vertex_list_graph_archetype<
-            Vertex,
-            undirected_tag,
-            allow_parallel_edge_tag
-        > Graph;
-    typedef read_write_property_map_archetype<Vertex, float> EccentricityMap;
-    typedef readable_property_map_archetype<Vertex, size_t> DistanceMap;
-    typedef readable_property_map_archetype<Vertex, DistanceMap> DistanceMatrix;
-
-    Graph& g = static_object<Graph>::get();
-    EccentricityMap em;
-    DistanceMatrix dm;
-
-    eccentricity(g, dm, em);
-    graph_radius(g, em);
-    graph_diameter(g, em);
-    graph_radius_diameter(g, em);
+    {
+        typedef vertex_list_graph_archetype<
+                undirected_tag,
+                allow_parallel_edge_tag
+            > Graph;
+        typedef graph_traits<Graph>::vertex_descriptor Vertex;
+        typedef writable_property_map_archetype<Vertex, float> EccentricityMap;
+        typedef readable_property_map_archetype<Vertex, size_t> DistanceMap;
+        typedef readable_property_map_archetype<Vertex, DistanceMap> DistanceMatrix;
+
+        Graph& g = static_object<Graph>::get();
+        EccentricityMap em;
+        DistanceMatrix dm;
+
+        eccentricity(g, dm, em);
+    }
+
+    {
+        typedef vertex_list_graph_archetype<
+                undirected_tag,
+                allow_parallel_edge_tag
+            > Graph;
+        typedef graph_traits<Graph>::vertex_descriptor Vertex;
+        typedef readable_property_map_archetype<Vertex, size_t> DistanceMap;
+
+        Graph& g = static_object<Graph>::get();
+        DistanceMap dm;
+
+        vertex_eccentricity(g, dm);
+    }
+
+    {
+        typedef vertex_list_graph_archetype<
+                undirected_tag,
+                allow_parallel_edge_tag
+            > Graph;
+        typedef graph_traits<Graph>::vertex_descriptor Vertex;
+        typedef readable_property_map_archetype<Vertex, size_t> EccentricityMap;
+
+        Graph& g = static_object<Graph>::get();
+        EccentricityMap em;
+
+        graph_radius(g, em);
+        graph_diameter(g, em);
+        graph_radius_diameter(g, em);
+    }
 
     return 0;
 }

Modified: sandbox/SOC/2007/graphs/libs/graph/test/concept/mean_geodesic_check.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/concept/mean_geodesic_check.cpp	(original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/concept/mean_geodesic_check.cpp	2007-08-16 12:23:50 EDT (Thu, 16 Aug 2007)
@@ -14,12 +14,11 @@
 main(int argc, char *argv[])
 {
     {
-        typedef descriptor_archetype Vertex;
         typedef vertex_list_graph_archetype<
-                Vertex,
                 undirected_tag,
                 allow_parallel_edge_tag
             > Graph;
+        typedef graph_traits<Graph>::vertex_descriptor Vertex;
         typedef writable_property_map_archetype<Vertex, float> CentralityMap;
         typedef readable_property_map_archetype<Vertex, size_t> DistanceMap;
         typedef readable_property_map_archetype<Vertex, DistanceMap> DistanceMatrix;
@@ -34,5 +33,39 @@
         mean_geodesic(g, dm, cm, m);
     }
 
+    {
+        typedef vertex_list_graph_archetype<
+                undirected_tag,
+                allow_parallel_edge_tag
+            > Graph;
+        typedef graph_traits<Graph>::vertex_descriptor Vertex;
+        typedef readable_property_map_archetype<Vertex, size_t> DistanceMap;
+        typedef distance_measure_archetype<Graph, size_t, float> Measure;
+
+        Graph& g = static_object<Graph>::get();
+        DistanceMap dm;
+        Measure m;
+
+        vertex_mean_geodesic(g, dm);
+        vertex_mean_geodesic(g, dm, m);
+    }
+
+    {
+        typedef vertex_list_graph_archetype<
+                undirected_tag,
+                allow_parallel_edge_tag
+            > Graph;
+        typedef graph_traits<Graph>::vertex_descriptor Vertex;
+        typedef readable_property_map_archetype<Vertex, float> CentralityMap;
+        typedef distance_measure_archetype<Graph, float, float> Measure;
+
+        Graph& g = static_object<Graph>::get();
+        CentralityMap cm;
+        Measure m;
+
+        graph_mean_geodesic(g, cm);
+        graph_mean_geodesic(g, cm, m);
+    }
+
     return 0;
 }