From ad8b6b5bc98c041652c62d41ec40e35ace329576 Mon Sep 17 00:00:00 2001 From: Dang Date: Wed, 30 May 2018 05:50:26 +0000 Subject: [PATCH] Fix bbox sampling. --- fluid/face_detction/image_util.py | 8 +++++--- fluid/object_detection/image_util.py | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fluid/face_detction/image_util.py b/fluid/face_detction/image_util.py index 210c49720b..a264ed18a1 100644 --- a/fluid/face_detction/image_util.py +++ b/fluid/face_detction/image_util.py @@ -37,9 +37,11 @@ def bbox_area(src_bbox): def generate_sample(sampler): scale = random.uniform(sampler.min_scale, sampler.max_scale) - min_aspect_ratio = max(sampler.min_aspect_ratio, (scale**2.0)) - max_aspect_ratio = min(sampler.max_aspect_ratio, 1 / (scale**2.0)) - aspect_ratio = random.uniform(min_aspect_ratio, max_aspect_ratio) + aspect_ratio = random.uniform(sampler.min_aspect_ratio, + sampler.max_aspect_ratio) + aspect_ratio = max(aspect_ratio, (scale**2.0)) + aspect_ratio = min(aspect_ratio, 1 / (scale**2.0)) + bbox_width = scale * (aspect_ratio**0.5) bbox_height = scale / (aspect_ratio**0.5) xmin_bound = 1 - bbox_width diff --git a/fluid/object_detection/image_util.py b/fluid/object_detection/image_util.py index ca6963b6e1..63efeea9c9 100644 --- a/fluid/object_detection/image_util.py +++ b/fluid/object_detection/image_util.py @@ -37,9 +37,11 @@ def bbox_area(src_bbox): def generate_sample(sampler): scale = random.uniform(sampler.min_scale, sampler.max_scale) - min_aspect_ratio = max(sampler.min_aspect_ratio, (scale**2.0)) - max_aspect_ratio = min(sampler.max_aspect_ratio, 1 / (scale**2.0)) - aspect_ratio = random.uniform(min_aspect_ratio, max_aspect_ratio) + aspect_ratio = random.uniform(sampler.min_aspect_ratio, + sampler.max_aspect_ratio) + aspect_ratio = max(aspect_ratio, (scale**2.0)) + aspect_ratio = min(aspect_ratio, 1 / (scale**2.0)) + bbox_width = scale * (aspect_ratio**0.5) bbox_height = scale / (aspect_ratio**0.5) xmin_bound = 1 - bbox_width