boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-02-26 16:52:12 +00:00
Code Issues Projects Releases Wiki Activity

Added lookup_edge() function as wrapper for graphs that do not model AdjacencyMatrix; changed functions to use it instead of edge(); added is_adjacency_matrix traits class; updated docs to reflect Adjacency Matrix requirements and suggestions; fixes #3266

Browse Source 
[SVN r57928]
This commit is contained in:
Jeremiah Willcock
2009-11-25 21:56:36 +00:00
parent e47d3c4c5a
commit 8431fde428
8 changed files with 76 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/graph/bron_kerbosch_all_cliques.hpp
View File

@@ -12,6 +12,7 @@
#include <boost/config.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/graph/lookup_edge.hpp>
#include <boost/concept/detail/concept_def.hpp>
namespace boost {
@@ -125,9 +126,7 @@ namespace detail
typename graph_traits<Graph>::vertex_descriptor v,
typename graph_traits<Graph>::undirected_category)
{
function_requires< AdjacencyMatrixConcept<Graph> >();
return edge(u, v, g).second;
return lookup_edge(u, v, g).second;
}
template <typename Graph>
@@ -137,13 +136,12 @@ namespace detail
typename graph_traits<Graph>::vertex_descriptor v,
typename graph_traits<Graph>::directed_category)
{
function_requires< AdjacencyMatrixConcept<Graph> >();
// Note that this could alternate between using an || to determine
// full connectivity. I believe that this should produce strongly
// connected components. Note that using && instead of || will
// change the results to a fully connected subgraph (i.e., symmetric
// edges between all vertices s.t., if a->b, then b->a.
return edge(u, v, g).second && edge(v, u, g).second;
return lookup_edge(u, v, g).second && lookup_edge(v, u, g).second;
}
template <typename Graph, typename Container>
@@ -189,7 +187,7 @@ namespace detail
for(ni = nots.begin(); ni != nend; ++ni) {
for(ci = cands.begin(); ci != cend; ++ci) {
// if we don't find an edge, then we're okay.
if(!edge(*ni, *ci, g).second) break;
if(!lookup_edge(*ni, *ci, g).second) break;
}
// if we iterated all the way to the end, then *ni
// is connected to all *ci

7
include/boost/graph/clustering_coefficient.hpp
View File

@@ -10,6 +10,7 @@
#include <boost/utility.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/graph/lookup_edge.hpp>
namespace boost
{
@@ -42,8 +43,8 @@ namespace detail
{
function_requires< AdjacencyMatrixConcept<Graph> >();
return (edge(u, v, g).second ? 1 : 0) +
(edge(v, u, g).second ? 1 : 0);
return (lookup_edge(u, v, g).second ? 1 : 0) +
(lookup_edge(v, u, g).second ? 1 : 0);
}
// This template matches undirectedS
@@ -55,7 +56,7 @@ namespace detail
undirected_tag)
{
function_requires< AdjacencyMatrixConcept<Graph> >();
return edge(u, v, g).second ? 1 : 0;
return lookup_edge(u, v, g).second ? 1 : 0;
}
}

10
include/boost/graph/graph_traits.hpp
View File

@@ -181,6 +181,16 @@ namespace boost {
>::value
>
{ };
template <typename Graph>
struct is_adjacency_matrix
: mpl::bool_<
is_convertible<
typename graph_traits<Graph>::traversal_category,
adjacency_matrix_tag
>::value
>
{ };
//@}
/** @name Directed Graph Traits

3
include/boost/graph/kolmogorov_max_flow.hpp
View File

@@ -46,6 +46,7 @@
#include <boost/none_t.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/graph/named_function_params.hpp>
#include <boost/graph/lookup_edge.hpp>
namespace boost {
namespace detail {
@@ -161,7 +162,7 @@ namespace boost {
}
edge_descriptor to_sink;
bool is_there;
tie(to_sink, is_there) = edge(current_node, m_sink, m_g);
tie(to_sink, is_there) = lookup_edge(current_node, m_sink, m_g);
if(is_there){
tEdgeVal cap_from_source = m_res_cap_map[from_source];
tEdgeVal cap_to_sink = m_res_cap_map[to_sink];

48
include/boost/graph/lookup_edge.hpp Normal file
View File

@@ -0,0 +1,48 @@
//=======================================================================
// Copyright 2009 Trustees of Indiana University
// Author: Jeremiah Willcock
//
// Distributed under 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)
//=======================================================================
#ifndef BOOST_GRAPH_LOOKUP_EDGE_HPP
#define BOOST_GRAPH_LOOKUP_EDGE_HPP
#include <utility>
#include <boost/config.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/graph/graph_traits.hpp>
// lookup_edge: a function that acts like edge() but falls back to out_edges()
// and a search when edge() is not provided.
namespace boost {
template <typename Graph>
std::pair<typename boost::graph_traits<Graph>::edge_descriptor, bool>
lookup_edge(typename boost::graph_traits<Graph>::vertex_descriptor src,
typename boost::graph_traits<Graph>::vertex_descriptor tgt,
const Graph& g,
typename boost::enable_if<is_adjacency_matrix<Graph>, int>::type = 0) {
return edge(src, tgt, g);
}
template <typename Graph>
std::pair<typename boost::graph_traits<Graph>::edge_descriptor, bool>
lookup_edge(typename boost::graph_traits<Graph>::vertex_descriptor src,
typename boost::graph_traits<Graph>::vertex_descriptor tgt,
const Graph& g,
typename boost::disable_if<is_adjacency_matrix<Graph>, int>::type = 0) {
typedef typename boost::graph_traits<Graph>::out_edge_iterator it;
typedef typename boost::graph_traits<Graph>::edge_descriptor edesc;
std::pair<it, it> oe = out_edges(src, g);
for (; oe.first != oe.second; ++oe.first) {
edesc e = *oe.first;
if (target(e, g) == tgt) return std::make_pair(e, true);
}
return std::make_pair(edesc(), false);
}
}

3
include/boost/graph/metric_tsp_approx.hpp
View File

@@ -34,6 +34,7 @@
#include <boost/graph/graph_as_tree.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/prim_minimum_spanning_tree.hpp>
#include <boost/graph/lookup_edge.hpp>
namespace boost
@@ -284,7 +285,7 @@ namespace boost
// would require revisiting the core algorithm.
Edge e;
bool found;
tie(e, found) = edge(previous_, v, g);
tie(e, found) = lookup_edge(previous_, v, g);
if(!found) {
throw not_complete();
}