|
|
Boost-Commit : |
From: asutton_at_[hidden]
Date: 2007-08-17 15:22:02
Author: asutton
Date: 2007-08-17 15:22:02 EDT (Fri, 17 Aug 2007)
New Revision: 38750
URL: http://svn.boost.org/trac/boost/changeset/38750
Log:
Propagating function renames
Text files modified:
sandbox/SOC/2007/graphs/libs/graph/test/closeness_centrality.cpp | 5 ++---
sandbox/SOC/2007/graphs/libs/graph/test/constant_property_map.cpp | 3 ---
sandbox/SOC/2007/graphs/libs/graph/test/degree_centrality.cpp | 6 +++---
sandbox/SOC/2007/graphs/libs/graph/test/eccentricity.cpp | 20 ++++++++++----------
sandbox/SOC/2007/graphs/libs/graph/test/mean_geodesic.cpp | 15 ++++++++-------
5 files changed, 23 insertions(+), 26 deletions(-)
Modified: sandbox/SOC/2007/graphs/libs/graph/test/closeness_centrality.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/closeness_centrality.cpp (original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/closeness_centrality.cpp 2007-08-17 15:22:02 EDT (Fri, 17 Aug 2007)
@@ -77,7 +77,7 @@
WeightMap wm(1);
floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
- closeness_centrality(g, dm, cm);
+ all_closeness_centralities(g, dm, cm);
BOOST_ASSERT(cm[v[0]] == float(1)/5);
BOOST_ASSERT(cm[v[1]] == float(1)/7);
@@ -115,7 +115,7 @@
WeightMap wm(1);
floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
- closeness_centrality(g, dm, cm);
+ all_closeness_centralities(g, dm, cm);
BOOST_ASSERT(cm[v[0]] == float(0));
BOOST_ASSERT(cm[v[1]] == float(0));
@@ -124,7 +124,6 @@
BOOST_ASSERT(cm[v[4]] == float(0));
}
-
int
main(int argc, char *argv[])
{
Modified: sandbox/SOC/2007/graphs/libs/graph/test/constant_property_map.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/constant_property_map.cpp (original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/constant_property_map.cpp 2007-08-17 15:22:02 EDT (Fri, 17 Aug 2007)
@@ -9,10 +9,7 @@
#include <boost/graph/undirected_graph.hpp>
#include <boost/graph/directed_graph.hpp>
-#include <boost/graph/exterior_property.hpp>
#include <boost/graph/constant_property_map.hpp>
-#include <boost/graph/floyd_warshall_shortest.hpp>
-#include <boost/graph/closeness_centrality.hpp>
using namespace std;
using namespace boost;
Modified: sandbox/SOC/2007/graphs/libs/graph/test/degree_centrality.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/degree_centrality.cpp (original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/degree_centrality.cpp 2007-08-17 15:22:02 EDT (Fri, 17 Aug 2007)
@@ -52,7 +52,7 @@
CentralityContainer cents(num_vertices(g));
CentralityMap cm(cents, g);
- degree_centrality(g, cm);
+ all_degree_centralities(g, cm);
BOOST_ASSERT(cm[v[0]] == 3);
BOOST_ASSERT(cm[v[1]] == 2);
@@ -77,7 +77,7 @@
CentralityContainer cents(num_vertices(g));
CentralityMap cm(cents, g);
- degree_centrality(g, cm, measure_influence(g));
+ all_influence_values(g, cm);
BOOST_ASSERT(cm[v[0]] == 1);
BOOST_ASSERT(cm[v[1]] == 1);
@@ -102,7 +102,7 @@
CentralityContainer cents(num_vertices(g));
CentralityMap cm(cents, g);
- degree_centrality(g, cm, measure_prestige(g));
+ all_prestige_values(g, cm);
BOOST_ASSERT(cm[v[0]] == 2);
BOOST_ASSERT(cm[v[1]] == 1);
Modified: sandbox/SOC/2007/graphs/libs/graph/test/eccentricity.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/eccentricity.cpp (original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/eccentricity.cpp 2007-08-17 15:22:02 EDT (Fri, 17 Aug 2007)
@@ -77,17 +77,17 @@
WeightMap wm(1);
floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
- eccentricity(g, dm, em);
- int radius = graph_radius(g, em);
- int diameter = graph_diameter(g, em);
+ all_eccentricities(g, dm, em);
+ int rad = radius(g, em);
+ int dia = diameter(g, em);
BOOST_ASSERT(em[v[0]] == 2);
BOOST_ASSERT(em[v[1]] == 3);
BOOST_ASSERT(em[v[2]] == 3);
BOOST_ASSERT(em[v[3]] == 3);
BOOST_ASSERT(em[v[4]] == 2);
- BOOST_ASSERT(radius == 2);
- BOOST_ASSERT(diameter == 3);
+ BOOST_ASSERT(rad == 2);
+ BOOST_ASSERT(dia == 3);
}
template <typename Graph>
@@ -119,9 +119,9 @@
WeightMap wm(1);
floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
- eccentricity(g, dm, em);
- int radius = graph_radius(g, em);
- int diameter = graph_diameter(g, em);
+ all_eccentricities(g, dm, em);
+ int rad = radius(g, em);
+ int dia = diameter(g, em);
int inf = numeric_values<int>::infinity();
BOOST_ASSERT(em[v[0]] == inf);
@@ -129,8 +129,8 @@
BOOST_ASSERT(em[v[2]] == inf);
BOOST_ASSERT(em[v[3]] == 4);
BOOST_ASSERT(em[v[4]] == inf);
- BOOST_ASSERT(radius == 4);
- BOOST_ASSERT(diameter == inf);
+ BOOST_ASSERT(rad == 4);
+ BOOST_ASSERT(dia == inf);
}
Modified: sandbox/SOC/2007/graphs/libs/graph/test/mean_geodesic.cpp
==============================================================================
--- sandbox/SOC/2007/graphs/libs/graph/test/mean_geodesic.cpp (original)
+++ sandbox/SOC/2007/graphs/libs/graph/test/mean_geodesic.cpp 2007-08-17 15:22:02 EDT (Fri, 17 Aug 2007)
@@ -77,16 +77,16 @@
WeightMap wm(1);
floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
- mean_geodesic(g, dm, cm);
-
- float geo = graph_mean_geodesic(g, cm);
+ float geo1 = all_mean_geodesics(g, dm, cm);
+ float geo2 = small_world_distance(g, cm);
BOOST_ASSERT(cm[v[0]] == float(5)/4);
BOOST_ASSERT(cm[v[1]] == float(7)/4);
BOOST_ASSERT(cm[v[2]] == float(7)/4);
BOOST_ASSERT(cm[v[3]] == float(9)/4);
BOOST_ASSERT(cm[v[4]] == float(6)/4);
- BOOST_ASSERT(geo == float(34)/20);
+ BOOST_ASSERT(geo1 == float(34)/20);
+ BOOST_ASSERT(geo1 == geo2);
}
template <typename Graph>
@@ -118,8 +118,8 @@
WeightMap wm(1);
floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
- mean_geodesic(g, dm, cm);
- float geo = graph_mean_geodesic(g, cm);
+ float geo1 = all_mean_geodesics(g, dm, cm);
+ float geo2 = small_world_distance(g, cm);
float inf = numeric_values<float>::infinity();
BOOST_ASSERT(cm[v[0]] == inf);
@@ -127,7 +127,8 @@
BOOST_ASSERT(cm[v[2]] == inf);
BOOST_ASSERT(cm[v[3]] == float(10)/4);
BOOST_ASSERT(cm[v[4]] == inf);
- BOOST_ASSERT(geo == inf);
+ BOOST_ASSERT(geo1 == inf);
+ BOOST_ASSERT(geo1 == geo2);
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk