Mercurial Hosting > traffic-intelligence
diff scripts/classify-objects.py @ 935:0e63a918a1ca
updated classify-objects
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Fri, 14 Jul 2017 16:30:57 -0400 |
parents | 063d1267585d |
children | e5970606066f |
line wrap: on
line diff
--- a/scripts/classify-objects.py Fri Jul 14 15:36:59 2017 -0400 +++ b/scripts/classify-objects.py Fri Jul 14 16:30:57 2017 -0400 @@ -74,13 +74,13 @@ width = int(capture.get(cv2.cv.CV_CAP_PROP_FRAME_WIDTH)) height = int(capture.get(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT)) -if undistort: # setup undistortion +#if undistort: # setup undistortion # [map1, map2] = cvutils.computeUndistortMaps(width, height, undistortedImageMultiplication, intrinsicCameraMatrix, distortionCoefficients) # height, width = map1.shape - newImgSize = (int(round(width*undistortedImageMultiplication)), int(round(height*undistortedImageMultiplication))) - newCameraMatrix = cv2.getDefaultNewCameraMatrix(intrinsicCameraMatrix, newImgSize, True) -else: - newCameraMatrix = None +# newImgSize = (int(round(width*undistortedImageMultiplication)), int(round(height*undistortedImageMultiplication))) +# newCameraMatrix = cv2.getDefaultNewCameraMatrix(intrinsicCameraMatrix, newImgSize, True) +#else: +# newCameraMatrix = None pastObjects = [] currentObjects = [] @@ -100,7 +100,7 @@ # img = cv2.remap(img, map1, map2, interpolation=cv2.INTER_LINEAR) for obj in objects: if obj.getFirstInstant() <= frameNum: # if images are skipped - obj.initClassifyUserTypeHoGSVM(speedAggregationFunc, pedBikeCarSVM, bikeCarSVM, classifierParams.maxPedestrianSpeed, classifierParams.maxCyclistSpeed, classifierParams.nFramesIgnoreAtEnds, invHomography, newCameraMatrix, distortionCoefficients) + obj.initClassifyUserTypeHoGSVM(speedAggregationFunc, pedBikeCarSVM, bikeCarSVM, classifierParams.maxPedestrianSpeed, classifierParams.maxCyclistSpeed, classifierParams.nFramesIgnoreAtEnds, invHomography, intrinsicCameraMatrix, distortionCoefficients) currentObjects.append(obj) objects.remove(obj)