mirror of
https://github.com/boostorg/graph.git
synced 2026-01-30 20:02:12 +00:00
23b3545c8d
The ->* syntax has been removed. Instead, one may use the member pointer as the key for the standard get/put functions of property maps. This makes graph adaptors work with bundled properties (automagically). Also added support for bundled properties in adjacency_matrix. index.htm: Announce the addition of bundled properties. boost/graph/adjacency_list.hpp: Updated to support get/put for bundled properties. boost/graph/adjacency_matrix.hpp: Added support for bundled properties. Suppressed some warnings and fixed a minor bug in add_edge(u, v, ep, g). boost/graph/properties.hpp: Added property_map specialization for bundled properties. libs/graph/doc/*.html: Document uses of bundled properties and direct anyone not using a broken compiler to bundled properties instead of property lists. libs/graph/test/bundled_properties.cpp: Test both adjacency_list and adjacency_matrix, along with filtered_graph. Makes sure all of the bundled properties operations work. [SVN r23125]
129 lines
3.9 KiB
C++
129 lines
3.9 KiB
C++
// Boost Graph library
|
|
|
|
// Copyright Doug Gregor 2004. Use, modification and
|
|
// distribution is subject to the Boost Software License, Version
|
|
// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
|
// http://www.boost.org/LICENSE_1_0.txt)
|
|
|
|
#include <boost/test/minimal.hpp>
|
|
#include <boost/graph/adjacency_list.hpp>
|
|
#include <boost/graph/adjacency_matrix.hpp>
|
|
#include <boost/graph/filtered_graph.hpp>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
using namespace std;
|
|
|
|
struct City
|
|
{
|
|
City() {}
|
|
City(const std::string& name, int pop, int zipcode) : name(name), population(pop)
|
|
{
|
|
zipcodes.push_back(zipcode);
|
|
}
|
|
|
|
string name;
|
|
int population;
|
|
vector<int> zipcodes;
|
|
};
|
|
|
|
struct Highway
|
|
{
|
|
Highway() {}
|
|
Highway(const string& name, double miles, int speed_limit = 65, int lanes = 4, bool divided = true)
|
|
: name(name), miles(miles), speed_limit(speed_limit), lanes(lanes), divided(divided) {}
|
|
|
|
string name;
|
|
double miles;
|
|
int speed_limit;
|
|
int lanes;
|
|
bool divided;
|
|
};
|
|
|
|
template<bool> struct truth {};
|
|
|
|
template<typename Map, typename VertexIterator, typename Bundle>
|
|
typename boost::graph_traits<Map>::vertex_descriptor
|
|
do_add_vertex(Map& map, VertexIterator, const Bundle& bundle, truth<true>)
|
|
{
|
|
return add_vertex(bundle, map);
|
|
}
|
|
|
|
template<typename Map, typename VertexIterator, typename Bundle>
|
|
typename boost::graph_traits<Map>::vertex_descriptor
|
|
do_add_vertex(Map& map, VertexIterator& vi, const Bundle& bundle, truth<false>)
|
|
{
|
|
get(boost::vertex_bundle, map)[*vi] = bundle;
|
|
return *vi++;
|
|
}
|
|
|
|
|
|
template<typename Map, bool CanAddVertex>
|
|
void test_bundled_properties(Map*, truth<CanAddVertex> can_add_vertex)
|
|
{
|
|
typedef typename boost::graph_traits<Map>::vertex_iterator vertex_iterator;
|
|
typedef typename boost::graph_traits<Map>::vertex_descriptor vertex_descriptor;
|
|
typedef typename boost::graph_traits<Map>::edge_descriptor edge_descriptor;
|
|
|
|
Map map(3);
|
|
|
|
vertex_iterator vi = vertices(map).first;
|
|
vertex_descriptor v = *vi;
|
|
map[v].name = "Troy";
|
|
map[v].population = 49170;
|
|
map[v].zipcodes.push_back(12180);
|
|
|
|
++vi;
|
|
vertex_descriptor u = *vi++;
|
|
map[u].name = "Albany";
|
|
map[u].population = 95658;
|
|
map[u].zipcodes.push_back(12201);
|
|
|
|
// Try adding a vertex with a property value
|
|
vertex_descriptor bloomington = do_add_vertex(map, vi, City("Bloomington", 39000, 47401),
|
|
can_add_vertex);
|
|
BOOST_TEST(get(boost::vertex_bundle, map)[bloomington].zipcodes[0] == 47401);
|
|
|
|
edge_descriptor e = add_edge(v, u, map).first;
|
|
map[e].name = "I-87";
|
|
map[e].miles = 10;
|
|
map[e].speed_limit = 65;
|
|
map[e].lanes = 4;
|
|
map[e].divided = true;
|
|
|
|
edge_descriptor our_trip = add_edge(v, bloomington, Highway("Long haul", 1000), map).first;
|
|
BOOST_TEST(get(boost::edge_bundle, map, our_trip).miles == 1000);
|
|
|
|
BOOST_TEST(get(get(&City::name, map), v) == "Troy");
|
|
BOOST_TEST(get(get(&Highway::name, map), e) == "I-87");
|
|
BOOST_TEST(get(&City::name, map, u) == "Albany");
|
|
BOOST_TEST(get(&Highway::name, map, e) == "I-87");
|
|
put(&City::population, map, v, 49168);
|
|
BOOST_TEST(get(&City::population, map)[v] == 49168);
|
|
|
|
boost::filtered_graph<Map, boost::keep_all> fmap(map, boost::keep_all());
|
|
BOOST_TEST(get(boost::edge_bundle, map, our_trip).miles == 1000);
|
|
|
|
BOOST_TEST(get(get(&City::name, fmap), v) == "Troy");
|
|
BOOST_TEST(get(get(&Highway::name, fmap), e) == "I-87");
|
|
BOOST_TEST(get(&City::name, fmap, u) == "Albany");
|
|
BOOST_TEST(get(&Highway::name, fmap, e) == "I-87");
|
|
put(&City::population, fmap, v, 49169);
|
|
BOOST_TEST(get(&City::population, fmap)[v] == 49169);
|
|
|
|
}
|
|
|
|
int test_main(int, char*[])
|
|
{
|
|
typedef boost::adjacency_list<
|
|
boost::listS, boost::vecS, boost::bidirectionalS,
|
|
City, Highway> Map1;
|
|
typedef boost::adjacency_matrix<boost::directedS,
|
|
City, Highway> Map2;
|
|
|
|
test_bundled_properties(static_cast<Map1*>(0), truth<true>());
|
|
test_bundled_properties(static_cast<Map2*>(0), truth<false>());
|
|
|
|
return 0;
|
|
}
|