Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions example/fibonacci_heap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ int main()

for (int c = 0; c < w.size(); ++c)
w[c] = c;
#ifndef BOOST_NO_CXX98_RANDOM_SHUFFLE
std::random_shuffle(w.begin(), w.end());
#else
std::shuffle(w.begin(), w.end(), gen);
#endif

for (i = 0; i < N; ++i)
Q.push(i);
Expand Down
13 changes: 0 additions & 13 deletions test/isomorphism.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,11 @@ randomly_permute_graph(const Graph1& g1, Graph2& g2)

random_generator_type gen;

#ifndef BOOST_NO_CXX98_RANDOM_SHUFFLE
random_functor< random_generator_type > rand_fun(gen);
#endif

// Decide new order
std::vector< vertex1 > orig_vertices;
std::copy(vertices(g1).first, vertices(g1).second,
std::back_inserter(orig_vertices));
#ifndef BOOST_NO_CXX98_RANDOM_SHUFFLE
std::random_shuffle(orig_vertices.begin(), orig_vertices.end(), rand_fun);
#else
std::shuffle(orig_vertices.begin(), orig_vertices.end(), gen);
#endif
std::map< vertex1, vertex2 > vertex_map;

for (std::size_t i = 0; i < num_vertices(g1); ++i)
Expand Down Expand Up @@ -303,12 +295,7 @@ void test_colored_isomorphism(int n, double edge_probability)

random_generator_type gen;

#ifndef BOOST_NO_CXX98_RANDOM_SHUFFLE
random_functor< random_generator_type > rand_fun(gen);
std::random_shuffle(colors.begin(), colors.end(), rand_fun);
#else
std::shuffle(colors.begin(), colors.end(), gen);
#endif

int v_idx = 0;
for (graph1::vertex_iterator v = vertices(g1).first;
Expand Down
7 changes: 0 additions & 7 deletions test/vf2_sub_graph_iso_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,12 @@ void randomly_permute_graph(Graph1& g1, const Graph2& g2)
typedef typename graph_traits< Graph2 >::edge_iterator edge_iterator;

random_generator_type gen;
#ifndef BOOST_NO_CXX98_RANDOM_SHUFFLE
random_functor< random_generator_type > rand_fun(gen);
#endif

// Decide new order
std::vector< vertex2 > orig_vertices;
std::copy(vertices(g2).first, vertices(g2).second,
std::back_inserter(orig_vertices));
#ifndef BOOST_NO_CXX98_RANDOM_SHUFFLE
std::random_shuffle(orig_vertices.begin(), orig_vertices.end(), rand_fun);
#else
std::shuffle(orig_vertices.begin(), orig_vertices.end(), gen);
#endif
std::map< vertex2, vertex1 > vertex_map;

std::size_t i = 0;
Expand Down
Loading