Changeset 38750


Ignore:
Timestamp:
Aug 17, 2007, 7:22:02 PM (11 years ago)
Author:
Andrew Sutton
Message:

Propagating function renames

Location:
sandbox/SOC/2007/graphs/libs/graph/test
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • sandbox/SOC/2007/graphs/libs/graph/test/closeness_centrality.cpp

    r38598 r38750  
    7878
    7979    floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
    80     closeness_centrality(g, dm, cm);
     80    all_closeness_centralities(g, dm, cm);
    8181
    8282    BOOST_ASSERT(cm[v[0]] == float(1)/5);
     
    116116
    117117    floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
    118     closeness_centrality(g, dm, cm);
     118    all_closeness_centralities(g, dm, cm);
    119119
    120120    BOOST_ASSERT(cm[v[0]] == float(0));
     
    124124    BOOST_ASSERT(cm[v[4]] == float(0));
    125125}
    126 
    127126
    128127int
  • sandbox/SOC/2007/graphs/libs/graph/test/constant_property_map.cpp

    r38598 r38750  
    1010#include <boost/graph/undirected_graph.hpp>
    1111#include <boost/graph/directed_graph.hpp>
    12 #include <boost/graph/exterior_property.hpp>
    1312#include <boost/graph/constant_property_map.hpp>
    14 #include <boost/graph/floyd_warshall_shortest.hpp>
    15 #include <boost/graph/closeness_centrality.hpp>
    1613
    1714using namespace std;
  • sandbox/SOC/2007/graphs/libs/graph/test/degree_centrality.cpp

    r38598 r38750  
    5353    CentralityContainer cents(num_vertices(g));
    5454    CentralityMap cm(cents, g);
    55     degree_centrality(g, cm);
     55    all_degree_centralities(g, cm);
    5656
    5757    BOOST_ASSERT(cm[v[0]] == 3);
     
    7878    CentralityContainer cents(num_vertices(g));
    7979    CentralityMap cm(cents, g);
    80     degree_centrality(g, cm, measure_influence(g));
     80    all_influence_values(g, cm);
    8181
    8282    BOOST_ASSERT(cm[v[0]] == 1);
     
    103103    CentralityContainer cents(num_vertices(g));
    104104    CentralityMap cm(cents, g);
    105     degree_centrality(g, cm, measure_prestige(g));
     105    all_prestige_values(g, cm);
    106106
    107107    BOOST_ASSERT(cm[v[0]] == 2);
  • sandbox/SOC/2007/graphs/libs/graph/test/eccentricity.cpp

    r38673 r38750  
    7878
    7979    floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
    80     eccentricity(g, dm, em);
    81     int radius = graph_radius(g, em);
    82     int diameter = graph_diameter(g, em);
     80    all_eccentricities(g, dm, em);
     81    int rad = radius(g, em);
     82    int dia = diameter(g, em);
    8383
    8484    BOOST_ASSERT(em[v[0]] == 2);
     
    8787    BOOST_ASSERT(em[v[3]] == 3);
    8888    BOOST_ASSERT(em[v[4]] == 2);
    89     BOOST_ASSERT(radius == 2);
    90     BOOST_ASSERT(diameter == 3);
     89    BOOST_ASSERT(rad == 2);
     90    BOOST_ASSERT(dia == 3);
    9191}
    9292
     
    120120
    121121    floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
    122     eccentricity(g, dm, em);
    123     int radius = graph_radius(g, em);
    124     int diameter = graph_diameter(g, em);
     122    all_eccentricities(g, dm, em);
     123    int rad = radius(g, em);
     124    int dia = diameter(g, em);
    125125
    126126    int inf = numeric_values<int>::infinity();
     
    130130    BOOST_ASSERT(em[v[3]] == 4);
    131131    BOOST_ASSERT(em[v[4]] == inf);
    132     BOOST_ASSERT(radius == 4);
    133     BOOST_ASSERT(diameter == inf);
     132    BOOST_ASSERT(rad == 4);
     133    BOOST_ASSERT(dia == inf);
    134134}
    135135
  • sandbox/SOC/2007/graphs/libs/graph/test/mean_geodesic.cpp

    r38673 r38750  
    7878
    7979    floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
    80     mean_geodesic(g, dm, cm);
    81 
    82     float geo = graph_mean_geodesic(g, cm);
     80    float geo1 = all_mean_geodesics(g, dm, cm);
     81    float geo2 = small_world_distance(g, cm);
    8382
    8483    BOOST_ASSERT(cm[v[0]] == float(5)/4);
     
    8786    BOOST_ASSERT(cm[v[3]] == float(9)/4);
    8887    BOOST_ASSERT(cm[v[4]] == float(6)/4);
    89     BOOST_ASSERT(geo == float(34)/20);
     88    BOOST_ASSERT(geo1 == float(34)/20);
     89    BOOST_ASSERT(geo1 == geo2);
    9090}
    9191
     
    119119
    120120    floyd_warshall_all_pairs_shortest_paths(g, dm, weight_map(wm));
    121     mean_geodesic(g, dm, cm);
    122     float geo = graph_mean_geodesic(g, cm);
     121    float geo1 = all_mean_geodesics(g, dm, cm);
     122    float geo2 = small_world_distance(g, cm);
    123123
    124124    float inf = numeric_values<float>::infinity();
     
    128128    BOOST_ASSERT(cm[v[3]] == float(10)/4);
    129129    BOOST_ASSERT(cm[v[4]] == inf);
    130     BOOST_ASSERT(geo == inf);
     130    BOOST_ASSERT(geo1 == inf);
     131    BOOST_ASSERT(geo1 == geo2);
    131132}
    132133
Note: See TracChangeset for help on using the changeset viewer.