Commit 7cb946de authored by Davis King's avatar Davis King
Browse files

Renamed all the rand::kernel_1a and rand::float_1a declarations

to just say rand.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%404250
parent 98045930
...@@ -523,7 +523,7 @@ namespace ...@@ -523,7 +523,7 @@ namespace
} }
dlib::rand::float_1a rnd; dlib::rand rnd;
for (int i = 0; i < 1; ++i) for (int i = 0; i < 1; ++i)
{ {
matrix<double> d1 = randm(4,1,rnd); matrix<double> d1 = randm(4,1,rnd);
......
...@@ -24,7 +24,7 @@ namespace ...@@ -24,7 +24,7 @@ namespace
logger dlog("test.matrix_chol"); logger dlog("test.matrix_chol");
dlib::rand::float_1a rnd; dlib::rand rnd;
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
...@@ -24,7 +24,7 @@ namespace ...@@ -24,7 +24,7 @@ namespace
logger dlog("test.matrix_eig"); logger dlog("test.matrix_eig");
dlib::rand::float_1a rnd; dlib::rand rnd;
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
...@@ -24,7 +24,7 @@ namespace ...@@ -24,7 +24,7 @@ namespace
logger dlog("test.matrix_lu"); logger dlog("test.matrix_lu");
dlib::rand::float_1a rnd; dlib::rand rnd;
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
...@@ -24,7 +24,7 @@ namespace ...@@ -24,7 +24,7 @@ namespace
logger dlog("test.matrix_qr"); logger dlog("test.matrix_qr");
dlib::rand::float_1a rnd; dlib::rand rnd;
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
...@@ -98,7 +98,7 @@ namespace ...@@ -98,7 +98,7 @@ namespace
"Runs tests on the max_cost_assignment function.") "Runs tests on the max_cost_assignment function.")
{} {}
dlib::rand::float_1a rnd; dlib::rand rnd;
template <typename T> template <typename T>
void test_hungarian() void test_hungarian()
......
...@@ -43,7 +43,7 @@ namespace ...@@ -43,7 +43,7 @@ namespace
const int num const int num
) )
{ {
static dlib::rand::kernel_1a rnd; static dlib::rand rnd;
matrix<int> mat, mask; matrix<int> mat, mask;
......
...@@ -44,7 +44,7 @@ namespace ...@@ -44,7 +44,7 @@ namespace
sample_type m; sample_type m;
dlib::rand::float_1a rnd; dlib::rand rnd;
// make some samples near the origin // make some samples near the origin
......
...@@ -45,7 +45,7 @@ namespace ...@@ -45,7 +45,7 @@ namespace
sample_type m; sample_type m;
dlib::rand::float_1a rnd; dlib::rand rnd;
// make some samples near the origin // make some samples near the origin
......
...@@ -93,7 +93,7 @@ namespace ...@@ -93,7 +93,7 @@ namespace
} }
time_t thetime; time_t thetime;
dlib::rand::float_1a rnd; dlib::rand rnd;
void perform_test( void perform_test(
) )
......
...@@ -857,7 +857,7 @@ namespace ...@@ -857,7 +857,7 @@ namespace
// test apq with a big vector // test apq with a big vector
p.set_size(500); p.set_size(500);
dlib::rand::float_1a rnd; dlib::rand rnd;
for (long i = 0; i < p.size(); ++i) for (long i = 0; i < p.size(); ++i)
{ {
p(i) = rnd.get_random_double()*20 - 10; p(i) = rnd.get_random_double()*20 - 10;
......
...@@ -217,8 +217,8 @@ namespace ...@@ -217,8 +217,8 @@ namespace
) )
{ {
dlog << LINFO << "testing kernel_1a"; dlog << LINFO << "testing kernel_1a";
rand_test<dlib::rand::kernel_1a>(); rand_test<dlib::rand>();
rand_test<dlib::rand::float_1a>(); rand_test<dlib::rand>();
} }
} a; } a;
......
...@@ -36,7 +36,7 @@ namespace ...@@ -36,7 +36,7 @@ namespace
{ {
} }
dlib::rand::float_1a rnd; dlib::rand rnd;
void perform_test ( void perform_test (
......
...@@ -133,7 +133,7 @@ namespace ...@@ -133,7 +133,7 @@ namespace
void test_running_covariance ( void test_running_covariance (
) )
{ {
dlib::rand::float_1a rnd; dlib::rand rnd;
std::vector<matrix<double,0,1> > vects; std::vector<matrix<double,0,1> > vects;
running_covariance<matrix<double,0,1> > cov, cov2; running_covariance<matrix<double,0,1> > cov, cov2;
......
...@@ -58,7 +58,7 @@ namespace ...@@ -58,7 +58,7 @@ namespace
sample_type m; sample_type m;
dlib::rand::float_1a rnd; dlib::rand rnd;
print_spinner(); print_spinner();
// we will make 50 points from each class // we will make 50 points from each class
...@@ -549,7 +549,7 @@ namespace ...@@ -549,7 +549,7 @@ namespace
offset_kernel<sigmoid_kernel<sample_type> > k5; offset_kernel<sigmoid_kernel<sample_type> > k5;
offset_kernel<radial_basis_kernel<sample_type> > k6; offset_kernel<radial_basis_kernel<sample_type> > k6;
dlib::rand::float_1a rnd; dlib::rand rnd;
sample_type x, y; sample_type x, y;
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
......
...@@ -33,7 +33,7 @@ namespace ...@@ -33,7 +33,7 @@ namespace
{ {
} }
dlib::rand::float_1a rnd; dlib::rand rnd;
// ----------------------------------- // -----------------------------------
......
...@@ -51,7 +51,7 @@ namespace ...@@ -51,7 +51,7 @@ namespace
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
dlib::rand::float_1a rnd; dlib::rand rnd;
template <typename T> template <typename T>
void test_with_rosen() void test_with_rosen()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment