Commit 347257cb authored by Davis King's avatar Davis King

Made random_cropper use cleaner and unbiased dlib::rand interface.

parent faf8676a
...@@ -157,7 +157,7 @@ namespace dlib ...@@ -157,7 +157,7 @@ namespace dlib
DLIB_CASSERT(images.size() == rects.size()); DLIB_CASSERT(images.size() == rects.size());
size_t idx; size_t idx;
{ std::lock_guard<std::mutex> lock(rnd_mutex); { std::lock_guard<std::mutex> lock(rnd_mutex);
idx = rnd.get_random_64bit_number()%images.size(); idx = rnd.get_integer(images.size());
} }
(*this)(images[idx], rects[idx], crop, crop_rects); (*this)(images[idx], rects[idx], crop, crop_rects);
} }
...@@ -290,9 +290,9 @@ namespace dlib ...@@ -290,9 +290,9 @@ namespace dlib
) )
{ {
DLIB_CASSERT(has_non_ignored_box(rects)); DLIB_CASSERT(has_non_ignored_box(rects));
size_t idx = rnd.get_random_64bit_number()%rects.size(); size_t idx = rnd.get_integer(rects.size());
while(rects[idx].ignore) while(rects[idx].ignore)
idx = rnd.get_random_64bit_number()%rects.size(); idx = rnd.get_integer(rects.size());
return idx; return idx;
} }
...@@ -311,8 +311,8 @@ namespace dlib ...@@ -311,8 +311,8 @@ namespace dlib
auto scale = rnd.get_double_in_range(mins, maxs); auto scale = rnd.get_double_in_range(mins, maxs);
rectangle rect(scale*dims.cols, scale*dims.rows); rectangle rect(scale*dims.cols, scale*dims.rows);
// randomly shift the box around // randomly shift the box around
point offset(rnd.get_random_32bit_number()%(1+img.nc()-rect.width()), point offset(rnd.get_integer(1+img.nc()-rect.width()),
rnd.get_random_32bit_number()%(1+img.nr()-rect.height())); rnd.get_integer(1+img.nr()-rect.height()));
return move_rect(rect, offset); return move_rect(rect, offset);
} }
......
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