Mercurial Hosting > traffic-intelligence

changeset 1126:2682b4696cdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 30 Jan 2020 10:18:50 -0500
parents b358bed29ab4 (diff) 91faf679e898 (current diff)
children 94ac9c16420f
files trafficintelligence/moving.py
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/trafficintelligence/cvutils.py	Fri Nov 29 00:59:46 2019 -0500
+++ b/trafficintelligence/cvutils.py	Thu Jan 30 10:18:50 2020 -0500
@@ -266,7 +266,7 @@
         ymax = max(y)
         xMm = px * (xmax - xmin)
         yMm = py * (ymax - ymin)
-        a = max(ymax - ymin + (2 * yMm), xmax - (xmin + 2 * xMm))
+        a = max(ymax - ymin + (2 * yMm), xmax - xmin + (2 * xMm))
         yCropMin = int(max(0, .5 * (ymin + ymax - a)))
         yCropMax = int(min(height - 1, .5 * (ymin + ymax + a)))
         xCropMin = int(max(0, .5 * (xmin + xmax - a)))
@@ -276,7 +276,7 @@
     def imageBox(img, obj, frameNum, width, height, px = 0.2, py = 0.2, minNPixels = 800):
         'Computes the bounding box of object at frameNum'
         yCropMin, yCropMax, xCropMin, xCropMax = imageBoxSize(obj, frameNum, width, height, px, py)
-        if yCropMax != yCropMin and xCropMax != xCropMin and (yCropMax - yCropMin) * (xCropMax - xCropMin) > minNPixels:
+        if yCropMax > yCropMin and xCropMax > xCropMin and (yCropMax - yCropMin) * (xCropMax - xCropMin) > minNPixels:
             return img[yCropMin : yCropMax, xCropMin : xCropMax]
         else:
             return None
--- a/trafficintelligence/moving.py	Fri Nov 29 00:59:46 2019 -0500
+++ b/trafficintelligence/moving.py	Thu Jan 30 10:18:50 2020 -0500
@@ -1216,7 +1216,8 @@
                  'motorcycle',
                  'bicycle',
                  'bus',
-                 'truck']
+                 'truck',
+                 'automated']
 
 userType2Num = utils.inverseEnumeration(userTypeNames)