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:
Jeremiah Willcock
2009-07-07 02:52:15 +00:00
parent 58892be918
commit 5ee0472280
12 changed files with 958 additions and 39 deletions

View File

@@ -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);