Skip to content

Commit 601d92a

Browse files
committed
removed RandomNumberGenerator class, included <random>, replaced random_shuffle with shuffle and used mersenne twister engine to generate uniform random bit generator for the shuffle.
1 parent 3feaa5d commit 601d92a

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

src/tri/_tri.cpp

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include <algorithm>
1414
#include <set>
15+
#include <random>
1516

1617

1718
TriEdge::TriEdge()
@@ -1465,8 +1466,8 @@ TrapezoidMapTriFinder::initialize()
14651466
_tree->assert_valid(false);
14661467

14671468
// Randomly shuffle all edges other than first 2.
1468-
RandomNumberGenerator rng(1234);
1469-
std::random_shuffle(_edges.begin()+2, _edges.end(), rng);
1469+
std::mt19937 rng(1234);
1470+
std::shuffle(_edges.begin()+2, _edges.end(), rng);
14701471

14711472
// Add edges, one at a time, to tree.
14721473
size_t nedges = _edges.size();
@@ -2055,17 +2056,4 @@ TrapezoidMapTriFinder::Trapezoid::set_upper_right(Trapezoid* upper_right_)
20552056
upper_right = upper_right_;
20562057
if (upper_right != 0)
20572058
upper_right->upper_left = this;
2058-
}
2059-
2060-
2061-
2062-
RandomNumberGenerator::RandomNumberGenerator(unsigned long seed)
2063-
: _m(21870), _a(1291), _c(4621), _seed(seed % _m)
2064-
{}
2065-
2066-
unsigned long
2067-
RandomNumberGenerator::operator()(unsigned long max_value)
2068-
{
2069-
_seed = (_seed*_a + _c) % _m;
2070-
return (_seed*max_value) / _m;
2071-
}
2059+
}

0 commit comments

Comments
 (0)