[Boost-commit] svn:boost r55045 - in branches/release: boost/graph boost/graph/distributed libs/graph_parallel/test

Subject: [Boost-commit] svn:boost r55045 - in branches/release: boost/graph boost/graph/distributed libs/graph_parallel/test
From: jewillco_at_[hidden]
Date: 2009-07-20 11:07:15

Author: jewillco
Date: 2009-07-20 11:07:14 EDT (Mon, 20 Jul 2009)
New Revision: 55045
URL: http://svn.boost.org/trac/boost/changeset/55045

Log:
Applied r55027 from trunk, except cycle_ratio_example.cpp which was already fixed
Text files modified: 
   branches/release/boost/graph/compressed_sparse_row_graph.hpp                          |     6 ++--                                    
   branches/release/boost/graph/distributed/compressed_sparse_row_graph.hpp              |    44 ++++++++++++++++++++--------------------
   branches/release/libs/graph_parallel/test/algorithm_performance.cpp                   |     8 +++---                                  
   branches/release/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp |     4 +-                                      
   branches/release/libs/graph_parallel/test/distributed_st_connected_test.cpp           |     8 +++---                                  
   branches/release/libs/graph_parallel/test/ssca.cpp                                    |     2                                         
   6 files changed, 36 insertions(+), 36 deletions(-)

Modified: branches/release/boost/graph/compressed_sparse_row_graph.hpp
==============================================================================
--- branches/release/boost/graph/compressed_sparse_row_graph.hpp	(original)
+++ branches/release/boost/graph/compressed_sparse_row_graph.hpp	2009-07-20 11:07:14 EDT (Mon, 20 Jul 2009)
@@ -1104,7 +1104,7 @@
   }
 
   template <typename BidirectionalIteratorOrig, typename EPIterOrig, 
-	    typename GlobalToLocal>
+            typename GlobalToLocal>
   void
   add_edges_sorted_internal_global(
       BidirectionalIteratorOrig first_sorted,
@@ -1340,7 +1340,7 @@
       const GlobalToLocal& global_to_local,
       BOOST_CSR_GRAPH_TYPE& g) {
     g.add_edges_sorted_internal_global(first_sorted, last_sorted, ep_iter_sorted, 
-				       global_to_local);
+                                       global_to_local);
   }
 
   // Add edges from a sorted (smallest sources first) range of pairs
@@ -1360,7 +1360,7 @@
             typename GlobalToLocal>
   inline void
   add_edges_global(InputIterator first, InputIterator last, 
-		   const GlobalToLocal& global_to_local, BOOST_CSR_GRAPH_TYPE& g) {
+                   const GlobalToLocal& global_to_local, BOOST_CSR_GRAPH_TYPE& g) {
     g.add_edges_internal(first, last, global_to_local);
   }
 

Modified: branches/release/boost/graph/distributed/compressed_sparse_row_graph.hpp
==============================================================================
--- branches/release/boost/graph/distributed/compressed_sparse_row_graph.hpp	(original)
+++ branches/release/boost/graph/distributed/compressed_sparse_row_graph.hpp	2009-07-20 11:07:14 EDT (Mon, 20 Jul 2009)
@@ -441,7 +441,7 @@
             EdgePropertyIterator ep_iter,
             EdgePropertyIterator ep_iter_end)
   { boost::add_edges_global(first, last, ep_iter, ep_iter_end, 
-			    get(vertex_local, *this), m_base); }
+                            get(vertex_local, *this), m_base); }
 
   template <typename InputIterator>
   void 
@@ -454,7 +454,7 @@
   add_edges_sorted(InputIterator first_sorted, InputIterator last_sorted,
                    EdgePropertyIterator ep_iter_sorted)
   { boost::add_edges_sorted_global(first_sorted, last_sorted, ep_iter_sorted, 
-				   get(vertex_local, *this), m_base); }
+                                   get(vertex_local, *this), m_base); }
 
  protected:
   ProcessGroup m_process_group;
@@ -801,7 +801,7 @@
 template <typename IndexIterator, typename Distribution, typename Graph>
 boost::transform_iterator<index_to_vertex_func<Distribution, Graph>, IndexIterator>
 make_index_to_vertex_iterator(IndexIterator it, const Distribution& dist, 
-			      const Graph& g) {
+                              const Graph& g) {
   return boost::make_transform_iterator(
     it, index_to_vertex_func<Distribution, Graph>(dist, g));
 }
@@ -1000,8 +1000,8 @@
   : m_process_group(pg),
     m_distribution(parallel::block(m_process_group, numverts)),
     m_base(edges_are_unsorted_multi_pass_global,
- 	   make_index_to_vertex_iterator(edge_begin, parallel::block(m_process_group, numverts), *this),
- 	   make_index_to_vertex_iterator(edge_end, parallel::block(m_process_group, numverts), *this),
+           make_index_to_vertex_iterator(edge_begin, parallel::block(m_process_group, numverts), *this),
+           make_index_to_vertex_iterator(edge_end, parallel::block(m_process_group, numverts), *this),
            m_distribution.block_size(process_id(m_process_group), numverts),
            get(vertex_local, *this),
            local_edge<csr_vertex_owner_map<process_id_type, vertex_descriptor>, 
@@ -1022,8 +1022,8 @@
   : m_process_group(pg),
     m_distribution(dist),
     m_base(edges_are_unsorted_multi_pass_global,
- 	   make_index_to_vertex_iterator(edge_begin, parallel::block(m_process_group, numverts), *this),
- 	   make_index_to_vertex_iterator(edge_end, parallel::block(m_process_group, numverts), *this),
+           make_index_to_vertex_iterator(edge_begin, parallel::block(m_process_group, numverts), *this),
+           make_index_to_vertex_iterator(edge_end, parallel::block(m_process_group, numverts), *this),
            m_distribution.block_size(process_id(m_process_group), numverts),
            get(vertex_local, *this),
            local_edge<csr_vertex_owner_map<process_id_type, vertex_descriptor>, 
@@ -1045,8 +1045,8 @@
   : m_process_group(pg),
     m_distribution(parallel::block(m_process_group, numverts)),
     m_base(edges_are_unsorted_multi_pass_global,
- 	   make_index_to_vertex_iterator(edge_begin, parallel::block(m_process_group, numverts), *this),
- 	   make_index_to_vertex_iterator(edge_end, parallel::block(m_process_group, numverts), *this),
+           make_index_to_vertex_iterator(edge_begin, parallel::block(m_process_group, numverts), *this),
+           make_index_to_vertex_iterator(edge_end, parallel::block(m_process_group, numverts), *this),
            ep_iter,
            m_distribution.block_size(process_id(m_process_group), numverts),
            get(vertex_local, *this),
@@ -1070,8 +1070,8 @@
   : m_process_group(pg),
     m_distribution(dist),
     m_base(edges_are_unsorted_multi_pass_global,
- 	   make_index_to_vertex_iterator(edge_begin, parallel::block(m_process_group, numverts), *this),
- 	   make_index_to_vertex_iterator(edge_end, parallel::block(m_process_group, numverts), *this),
+           make_index_to_vertex_iterator(edge_begin, parallel::block(m_process_group, numverts), *this),
+           make_index_to_vertex_iterator(edge_end, parallel::block(m_process_group, numverts), *this),
            ep_iter,
            m_distribution.block_size(process_id(m_process_group), numverts),
            get(vertex_local, *this),
@@ -1538,42 +1538,42 @@
 template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS>
 typename BOOST_DISTRIB_CSR_GRAPH_TYPE::vertex_descriptor
 add_vertex(const typename BOOST_DISTRIB_CSR_GRAPH_TYPE::vertex_bundled& p, 
-	   BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
+           BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
 { return g.add_vertex(p); }
 
 template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS>
 typename BOOST_DISTRIB_CSR_GRAPH_TYPE::vertex_descriptor
 add_vertices(typename BOOST_DISTRIB_CSR_GRAPH_TYPE::vertices_size_type count, 
-	     BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
+             BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
 { return g.add_vertices(count); }
 
 template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS, typename InputIterator>
 void 
 add_edges(InputIterator first, InputIterator last,
-	  BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
+          BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
 { g.add_edges(first, last); }
 
 template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS, typename InputIterator, 
-	 typename EdgePropertyIterator>
+         typename EdgePropertyIterator>
 void 
 add_edges(InputIterator first, InputIterator last,
-	  EdgePropertyIterator ep_iter,
-	  EdgePropertyIterator ep_iter_end,
-	  BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
+          EdgePropertyIterator ep_iter,
+          EdgePropertyIterator ep_iter_end,
+          BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
 { return g.add_edges(first, last, ep_iter, ep_iter_end); }
 
 template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS, typename InputIterator>
 void 
 add_edges_sorted(InputIterator first, InputIterator last,
-		 BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
+                 BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
 { return g.add_edges_sorted(first, last); }
 
 template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS, typename InputIterator, 
-	 typename EdgePropertyIterator>
+         typename EdgePropertyIterator>
 void 
 add_edges_sorted(InputIterator first_sorted, InputIterator last_sorted,
-		 EdgePropertyIterator ep_iter_sorted,
-		 BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
+                 EdgePropertyIterator ep_iter_sorted,
+                 BOOST_DISTRIB_CSR_GRAPH_TYPE& g)
 { g.add_edges_sorted(first_sorted, last_sorted, ep_iter_sorted); }
 #endif
 

Modified: branches/release/libs/graph_parallel/test/algorithm_performance.cpp
==============================================================================
--- branches/release/libs/graph_parallel/test/algorithm_performance.cpp	(original)
+++ branches/release/libs/graph_parallel/test/algorithm_performance.cpp	2009-07-20 11:07:14 EDT (Mon, 20 Jul 2009)
@@ -360,7 +360,7 @@
       seqGraph;
     
     seqGraph sg(edges_are_sorted,
-		sorted_rmat_iterator<RandomGenerator, seqGraph>(gen, N, M, a, b, c, d),
+                sorted_rmat_iterator<RandomGenerator, seqGraph>(gen, N, M, a, b, c, d),
                 sorted_rmat_iterator<RandomGenerator, seqGraph>(),
                 make_generator_iterator(gen, uniform_int<int>(1, C)),
                 N);
@@ -396,7 +396,7 @@
       seqGraph;
     
     seqGraph sg(edges_are_sorted,
-		sorted_unique_rmat_iterator<RandomGenerator, seqGraph>(gen, N, M, a, b, c, d),
+                sorted_unique_rmat_iterator<RandomGenerator, seqGraph>(gen, N, M, a, b, c, d),
                 sorted_unique_rmat_iterator<RandomGenerator, seqGraph>(),
                 make_generator_iterator(gen, uniform_int<int>(1, C)),
                 N);
@@ -431,7 +431,7 @@
       seqGraph;
     
     seqGraph sg(edges_are_sorted,
-		sorted_erdos_renyi_iterator<RandomGenerator, seqGraph>(gen, N, _p/2),
+                sorted_erdos_renyi_iterator<RandomGenerator, seqGraph>(gen, N, _p/2),
                 sorted_erdos_renyi_iterator<RandomGenerator, seqGraph>(),
                 make_generator_iterator(gen, uniform_int<int>(1, C)),
                 N);
@@ -467,7 +467,7 @@
       seqGraph;
     
     seqGraph sg(edges_are_sorted,
-		small_world_iterator<RandomGenerator, seqGraph>(gen, N, k, p),
+                small_world_iterator<RandomGenerator, seqGraph>(gen, N, k, p),
                 small_world_iterator<RandomGenerator, seqGraph>(),
                 make_generator_iterator(gen, uniform_int<int>(1, C)),
                 N);

Modified: branches/release/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp
==============================================================================
--- branches/release/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp	(original)
+++ branches/release/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp	2009-07-20 11:07:14 EDT (Mon, 20 Jul 2009)
@@ -153,9 +153,9 @@
 
   seqGraph sg(
 #ifdef CSR
-	      edges_are_sorted,
+              edges_are_sorted,
 #endif
-	      ERIter(gen, n, prob), ERIter(), 
+              ERIter(gen, n, prob), ERIter(), 
               make_generator_iterator(gen, uniform_int<int>(1, C)),
               n);
 

Modified: branches/release/libs/graph_parallel/test/distributed_st_connected_test.cpp
==============================================================================
--- branches/release/libs/graph_parallel/test/distributed_st_connected_test.cpp	(original)
+++ branches/release/libs/graph_parallel/test/distributed_st_connected_test.cpp	2009-07-20 11:07:14 EDT (Mon, 20 Jul 2009)
@@ -55,11 +55,11 @@
   {
     typedef std::pair<int, int> E;
     E edge_array[] = { E(u, u), E(u, v), E(u, w), E(v, w), E(x, y), 
-		       E(x, z), E(z, y), E(z, z) };
+                       E(x, z), E(z, y), E(z, z) };
     Graph g(edge_array, edge_array + sizeof(edge_array) / sizeof(E), N);
 
     bool connected = st_connected(g, vertex(u, g), vertex(z, g), 
-				  get(vertex_color, g), get(vertex_owner, g));
+                                  get(vertex_color, g), get(vertex_owner, g));
 
     assert(!connected);
   }
@@ -67,11 +67,11 @@
   {
     typedef std::pair<int, int> E;
     E edge_array[] = { E(u, v), E(u, w), E(u, x), E(x, v), E(y, x),
-		       E(v, y), E(w, y), E(w, z), E(z, z) };
+                       E(v, y), E(w, y), E(w, z), E(z, z) };
     Graph g(edge_array, edge_array + sizeof(edge_array) / sizeof(E), N);
 
     bool connected = st_connected(g, vertex(u, g), vertex(z, g), 
-				  get(vertex_color, g), get(vertex_owner, g));
+                                  get(vertex_color, g), get(vertex_owner, g));
 
     assert(connected);
   }

Modified: branches/release/libs/graph_parallel/test/ssca.cpp
==============================================================================
--- branches/release/libs/graph_parallel/test/ssca.cpp	(original)
+++ branches/release/libs/graph_parallel/test/ssca.cpp	2009-07-20 11:07:14 EDT (Mon, 20 Jul 2009)
@@ -617,7 +617,7 @@
 
 #ifdef CSR
   seqGraph sg(edges_are_sorted,
-	      sorted_unique_rmat_iterator<RandomGenerator, seqGraph>(gen, n, m, a, b, c, d),
+              sorted_unique_rmat_iterator<RandomGenerator, seqGraph>(gen, n, m, a, b, c, d),
               sorted_unique_rmat_iterator<RandomGenerator, seqGraph>(),
               make_generator_iterator(gen, uniform_int<int>(0, maxEdgeWeight)),
               n);