[Boost-commit] svn:boost r54745 - trunk/libs/graph_parallel/test

Subject: [Boost-commit] svn:boost r54745 - trunk/libs/graph_parallel/test
From: ngedmond_at_[hidden]
Date: 2009-07-06 21:36:54

Author: ngedmond
Date: 2009-07-06 21:36:53 EDT (Mon, 06 Jul 2009)
New Revision: 54745
URL: http://svn.boost.org/trac/boost/changeset/54745

Log:
switched to tagged CSR ctor
Text files modified: 
   trunk/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp |    11 +++++++----                             
   1 files changed, 7 insertions(+), 4 deletions(-)

Modified: trunk/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp	(original)
+++ trunk/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp	2009-07-06 21:36:53 EDT (Mon, 06 Jul 2009)
@@ -96,9 +96,7 @@
 typedef int weight_type;
 
 struct WeightedEdge {
-  WeightedEdge(weight_type weight = 1) : weight(weight) { }
-
-  void operator=(weight_type x) { weight = x; }
+  WeightedEdge(weight_type weight = 0) : weight(weight) { }
   
   weight_type weight;
 
@@ -130,6 +128,7 @@
                          property<edge_weight_t, int> > seqGraph;
 #endif
 
+
   typedef sorted_erdos_renyi_iterator<minstd_rand, Graph> ERIter;
 
   typedef graph_traits<Graph>::vertex_descriptor vertex_descriptor;
@@ -152,7 +151,11 @@
 
   gen.seed(1);  // Re-seed PRNG so we get the same graph
 
-  seqGraph sg(edges_are_sorted, ERIter(gen, n, prob), ERIter(), 
+  seqGraph sg(
+#ifdef CSR
+	      edges_are_sorted,
+#endif
+	      ERIter(gen, n, prob), ERIter(), 
               make_generator_iterator(gen, uniform_int<int>(1, C)),
               n);