Applied r55027 from trunk, except cycle_ratio_example.cpp which was already fixed

[SVN r55045]
This commit is contained in:
Jeremiah Willcock
2009-07-20 15:07:14 +00:00
parent 5ee0472280
commit e38502c4c0
5 changed files with 33 additions and 33 deletions

View File

@@ -360,7 +360,7 @@ void test_csr(const ProcessGroup& pg, RandomGenerator& gen, Distribution& distri
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 @@ void test_csr(const ProcessGroup& pg, RandomGenerator& gen, Distribution& distri
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 @@ void test_csr(const ProcessGroup& pg, RandomGenerator& gen, Distribution& distri
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 @@ void test_csr(const ProcessGroup& pg, RandomGenerator& gen, Distribution& distri
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);