--- a/scripts/classify-objects.py	Fri Apr 13 16:48:02 2018 -0400
+++ b/scripts/classify-objects.py	Wed May 16 21:06:52 2018 -0400
@@ -35,10 +35,8 @@
     print('Unknown speed aggregation method: {}. Exiting'.format(classifierParams.speedAggregationMethod))
     sys.exit()
 
-pedBikeCarSVM = ml.SVM()
-pedBikeCarSVM.load(classifierParams.pedBikeCarSVMFilename)
-bikeCarSVM = ml.SVM()
-bikeCarSVM.load(classifierParams.bikeCarSVMFilename)
+pedBikeCarSVM = ml.SVM_load(classifierParams.pedBikeCarSVMFilename)
+bikeCarSVM = ml.SVM_load(classifierParams.bikeCarSVMFilename)
 
 # log logistic for ped and bik otherwise ((pedBeta/pedAlfa)*((sMean/pedAlfa)**(pedBeta-1)))/((1+(sMean/pedAlfa)**pedBeta)**2.)
 carNorm = norm(classifierParams.meanVehicleSpeed, classifierParams.stdVehicleSpeed)
@@ -72,8 +70,8 @@
     timeInterval.first = 0
 
 capture = cv2.VideoCapture(videoFilename)
-width = int(capture.get(cv2.cv.CV_CAP_PROP_FRAME_WIDTH))
-height = int(capture.get(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT))
+width = int(capture.get(cv2.CAP_PROP_FRAME_WIDTH))
+height = int(capture.get(cv2.CAP_PROP_FRAME_HEIGHT))
 
 #if undistort: # setup undistortion
 #     [map1, map2] = cvutils.computeUndistortMaps(width, height, undistortedImageMultiplication, intrinsicCameraMatrix, distortionCoefficients)
@@ -89,7 +87,7 @@
     ret = True
     frameNum = timeInterval.first
     if not args.startFrame0:
-        capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, frameNum)
+        capture.set(cv2.CAP_PROP_POS_FRAMES, frameNum)
     lastFrameNum = timeInterval.last
 
     while ret and frameNum <= lastFrameNum: