From: asutton_at_[hidden]
Date: 2007-06-13 10:23:14
Author: asutton
Date: 2007-06-13 10:23:13 EDT (Wed, 13 Jun 2007)
New Revision: 7030
URL: http://svn.boost.org/trac/boost/changeset/7030
Log:
Fixing some naming and function call compiler errors.
Text files modified:
sandbox/SOC/2007/graphs/boost/graph/directed_graph.hpp | 4 ++--
sandbox/SOC/2007/graphs/boost/graph/graph_as_matrix.hpp | 22 +++++++++++-----------
sandbox/SOC/2007/graphs/boost/graph/undirected_graph.hpp | 6 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
Modified: sandbox/SOC/2007/graphs/boost/graph/directed_graph.hpp
==============================================================================
--- sandbox/SOC/2007/graphs/boost/graph/directed_graph.hpp (original)
+++ sandbox/SOC/2007/graphs/boost/graph/directed_graph.hpp 2007-06-13 10:23:13 EDT (Wed, 13 Jun 2007)
@@ -144,8 +144,8 @@
// BidirectionalGraph concepts
template <class VP, class EP, class GP>
inline typename directed_graph<VP,EP,GP>::degree_size_type
- in_degree(const directed_graph<VP,EP,GP> &g,
- typename directed_graph<VP,EP,GP>::vertex_descriptor v)
+ in_degree(typename directed_graph<VP,EP,GP>::vertex_descriptor v,
+ const directed_graph<VP,EP,GP> &g)
{
return in_degree(v, g.impl());
}
Modified: sandbox/SOC/2007/graphs/boost/graph/graph_as_matrix.hpp
==============================================================================
--- sandbox/SOC/2007/graphs/boost/graph/graph_as_matrix.hpp (original)
+++ sandbox/SOC/2007/graphs/boost/graph/graph_as_matrix.hpp 2007-06-13 10:23:13 EDT (Wed, 13 Jun 2007)
@@ -33,7 +33,7 @@
typename adjacency_list<OEL,VL,directedS,VP,EP,GP,EL>::edge_descriptor,
bool
>
- edges(typename adjacency_list<OEL,VL,directedS,VP,EP,GP,EL>::vertex_descriptor u,
+ edge(typename adjacency_list<OEL,VL,directedS,VP,EP,GP,EL>::vertex_descriptor u,
typename adjacency_list<OEL,VL,directedS,VP,EP,GP,EL>::vertex_descriptor v,
const adjacency_list<OEL,VL,directedS,VP,EP,GP,EL>& g)
{
@@ -60,7 +60,7 @@
typename adjacency_list<OEL,VL,bidirectionalS,VP,EP,GP,EL>::edge_descriptor,
bool
>
- edges(typename adjacency_list<OEL,VL,bidirectionalS,VP,EP,GP,EL>::vertex_descriptor u,
+ edge(typename adjacency_list<OEL,VL,bidirectionalS,VP,EP,GP,EL>::vertex_descriptor u,
typename adjacency_list<OEL,VL,bidirectionalS,VP,EP,GP,EL>::vertex_descriptor v,
const adjacency_list<OEL,VL,bidirectionalS,VP,EP,GP,EL>& g)
{
@@ -71,7 +71,7 @@
// iterate over either the out_edges or in_edges depending on the minimum
// degreer (this should save some time if done repeatedly).
- if(out_degree(u) < in_degree(v)) {
+ if(out_degree(u, g) < in_degree(v, g)) {
typename Graph::out_edge_iterator i, j;
for(tie(i, j) = out_edges(u, g); i != j; ++i) {
if(target(*i, g) == v) {
@@ -100,7 +100,7 @@
typename adjacency_list<OEL,VL,undirectedS,VP,EP,GP,EL>::edge_descriptor,
bool
>
- edges(typename adjacency_list<OEL,VL,undirectedS,VP,EP,GP,EL>::vertex_descriptor u,
+ edge(typename adjacency_list<OEL,VL,undirectedS,VP,EP,GP,EL>::vertex_descriptor u,
typename adjacency_list<OEL,VL,undirectedS,VP,EP,GP,EL>::vertex_descriptor v,
const adjacency_list<OEL,VL,undirectedS,VP,EP,GP,EL>& g)
{
@@ -109,7 +109,7 @@
bool found = false;
typename Graph::edge_descriptor edge;
- typename Graph::vertex_descriptor p = out_degree(u) < out_degree(v) ? u : v;
+ typename Graph::vertex_descriptor p = out_degree(u, g) < out_degree(v, g) ? u : v;
// iterate over the out_edges of u, looking for v
typename Graph::out_edge_iterator i, j;
@@ -124,21 +124,21 @@
}
template <typename VP, typename EP, typename GP>
- std::pair<undirected_graph<VP,EP,GP>, bool>
- edges(typename undirected_graph<VP,EP,GP>::vertex_descriptor u,
+ std::pair<typename undirected_graph<VP,EP,GP>::edge_descriptor, bool>
+ edge(typename undirected_graph<VP,EP,GP>::vertex_descriptor u,
typename undirected_graph<VP,EP,GP>::vertex_descriptor v,
const undirected_graph<VP,EP,GP>& g)
{
- edges(g.impl());
+ return edge(u, v, g.impl());
}
template <typename VP, typename EP, typename GP>
- std::pair<directed_graph<VP,EP,GP>, bool>
- edges(typename directed_graph<VP,EP,GP>::vertex_descriptor u,
+ std::pair<typename directed_graph<VP,EP,GP>::edge_descriptor, bool>
+ edge(typename directed_graph<VP,EP,GP>::vertex_descriptor u,
typename directed_graph<VP,EP,GP>::vertex_descriptor v,
const directed_graph<VP,EP,GP>& g)
{
- edges(g.impl());
+ return edge(u, v, g.impl());
}
}
Modified: sandbox/SOC/2007/graphs/boost/graph/undirected_graph.hpp
==============================================================================
--- sandbox/SOC/2007/graphs/boost/graph/undirected_graph.hpp (original)
+++ sandbox/SOC/2007/graphs/boost/graph/undirected_graph.hpp 2007-06-13 10:23:13 EDT (Wed, 13 Jun 2007)
@@ -143,8 +143,8 @@
// BidirectionalGraph concepts
template <class VP, class EP, class GP>
inline typename undirected_graph<VP,EP,GP>::degree_size_type
- in_degree(const undirected_graph<VP,EP,GP> &g,
- typename undirected_graph<VP,EP,GP>::vertex_descriptor v)
+ in_degree(typename undirected_graph<VP,EP,GP>::vertex_descriptor v,
+ const undirected_graph<VP,EP,GP> &g)
{
return in_degree(v, g.impl());
}
@@ -203,7 +203,7 @@
inline typename undirected_graph<VP,EP,GP>::edges_size_type
num_edges(const undirected_graph<VP,EP,GP>& g)
{
- return g.num_edges();
+ return num_edges(g.impl());
}
template <class VP, class EP, class GP>