mirror of
https://github.com/boostorg/graph_parallel.git
synced 2026-01-27 06:52:11 +00:00
Merged in comments 59-61 from #3134, plus other changes; all merges for 1.40 should be done now; closes #3134
[SVN r54751]
This commit is contained in:
@@ -359,7 +359,8 @@ void test_csr(const ProcessGroup& pg, RandomGenerator& gen, Distribution& distri
|
||||
typedef compressed_sparse_row_graph<directedS, no_property, WeightedEdge>
|
||||
seqGraph;
|
||||
|
||||
seqGraph sg(sorted_rmat_iterator<RandomGenerator, seqGraph>(gen, N, M, a, b, c, d),
|
||||
seqGraph sg(edges_are_sorted,
|
||||
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);
|
||||
@@ -394,7 +395,8 @@ void test_csr(const ProcessGroup& pg, RandomGenerator& gen, Distribution& distri
|
||||
typedef compressed_sparse_row_graph<directedS, no_property, WeightedEdge>
|
||||
seqGraph;
|
||||
|
||||
seqGraph sg(sorted_unique_rmat_iterator<RandomGenerator, seqGraph>(gen, N, M, a, b, c, d),
|
||||
seqGraph sg(edges_are_sorted,
|
||||
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);
|
||||
@@ -428,7 +430,8 @@ void test_csr(const ProcessGroup& pg, RandomGenerator& gen, Distribution& distri
|
||||
typedef compressed_sparse_row_graph<directedS, no_property, WeightedEdge>
|
||||
seqGraph;
|
||||
|
||||
seqGraph sg(sorted_erdos_renyi_iterator<RandomGenerator, seqGraph>(gen, N, _p/2),
|
||||
seqGraph sg(edges_are_sorted,
|
||||
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);
|
||||
@@ -463,7 +466,8 @@ void test_csr(const ProcessGroup& pg, RandomGenerator& gen, Distribution& distri
|
||||
typedef compressed_sparse_row_graph<directedS, no_property, WeightedEdge>
|
||||
seqGraph;
|
||||
|
||||
seqGraph sg(small_world_iterator<RandomGenerator, seqGraph>(gen, N, k, p),
|
||||
seqGraph sg(edges_are_sorted,
|
||||
small_world_iterator<RandomGenerator, seqGraph>(gen, N, k, p),
|
||||
small_world_iterator<RandomGenerator, seqGraph>(),
|
||||
make_generator_iterator(gen, uniform_int<int>(1, C)),
|
||||
N);
|
||||
|
||||
Reference in New Issue
Block a user