add age (real, apparent), gender predictor

1 files changed, 8 insertions, 8 deletions

diff --git a/megapixels/app/models/bbox.py b/megapixels/app/models/bbox.py
index 04ee4a70..40874691 100644
--- a/megapixels/app/models/bbox.py
+++ b/megapixels/app/models/bbox.py
@@ -130,10 +130,10 @@ class BBox:
   # -----------------------------------------------------------------
   # Modify
 
-  def expand_dim(self, amt, dim):
+  def expand_dim(self, amt, bounds):
     """Expands BBox within dim
     :param box: (tuple) left, top, right, bottom
-    :param dim: (tuple) width, height
+    :param bounds: (tuple) width, height
     :returns (BBox) in pixel dimensions
     """
     # expand
@@ -142,8 +142,8 @@ class BBox:
     oob = list(range(4))
     oob[0] = min(r[0], 0)
     oob[1] = min(r[1], 0)
-    oob[2] = dim[0] - r[2]
-    oob[3] = dim[1] - r[3]
+    oob[2] = bounds[0] - r[2]
+    oob[3] = bounds[1] - r[3]
     oob = np.array(oob)
     oob[oob > 0] = 0
     # absolute amount
@@ -151,16 +151,16 @@ class BBox:
     # threshold expanded rectangle
     r[0] = max(r[0], 0)
     r[1] = max(r[1], 0)
-    r[2] = min(r[2], dim[0])
-    r[3] = min(r[3], dim[1])
+    r[2] = min(r[2], bounds[0])
+    r[3] = min(r[3], bounds[1])
     # redistribute oob amounts
     oob = np.array([-oob[2], -oob[3], oob[0], oob[1]])
     r = np.add(np.array(r), oob)
     # find overage
     oob[0] = min(r[0], 0)
     oob[1] = min(r[1], 0)
-    oob[2] = dim[0] - r[2]
-    oob[3] = dim[1] - r[3]
+    oob[2] = bounds[0] - r[2]
+    oob[3] = bounds[1] - r[3]
     oob = np.array(oob)
     oob[oob > 0] = 0
     oob = np.absolute(oob)