Mercurial Hosting > traffic-intelligence

changeset 684:6d2ece4aed7c dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bug forgot to svae objects
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Fri, 05 Jun 2015 13:26:51 +0200
parents f3a0b652b590
children 94b291a5f933
files scripts/classify-objects.py
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/classify-objects.py	Fri Jun 05 11:04:06 2015 +0200
+++ b/scripts/classify-objects.py	Fri Jun 05 13:26:51 2015 +0200
@@ -72,6 +72,7 @@
 width = int(capture.get(cv2.cv.CV_CAP_PROP_FRAME_WIDTH))
 height = int(capture.get(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT))
 
+pastObjects = []
 if params.undistort: # setup undistortion
     [map1, map2] = computeUndistortMaps(width, height, undistortedImageMultiplication, intrinsicCameraMatrix, distortionCoefficients)
 if capture.isOpened():
@@ -87,8 +88,9 @@
                 print('frame number: {}'.format(frameNum))
                 currentObjects = []
                 for obj in objects:
-                    if obj.getLastFrameNum() < frameNum:
+                    if obj.getLastInstant() < frameNum:
                         obj.classifyUserTypeHoGSVM(minSpeedEquiprobable = params.minSpeedEquiprobable, speedProbabilities = speedProbabilities)
+                        pastObjects.append(obj)
                     else:
                         currentObjects.append(obj)
                 objects = currentObjects
@@ -103,3 +105,6 @@
     
     for obj in objects:
         obj.classifyUserTypeHoGSVM(minSpeedEquiprobable = params.minSpeedEquiprobable, speedProbabilities = speedProbabilities)
+        pastObjects.append(obj)
+    print('Saving user types')
+    storage.setRoadUserTypes(params.databaseFilename, pastObjects)