diff scripts/classify-objects.py @ 1023:a13f47c8931d

work on processing large datasets (generate speed data)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 06 Jun 2018 16:51:15 -0400
parents b7689372c0ec
children cc5cb04b04b0
line wrap: on
line diff
--- a/scripts/classify-objects.py	Wed Jun 06 10:35:06 2018 -0400
+++ b/scripts/classify-objects.py	Wed Jun 06 16:51:15 2018 -0400
@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 
-import cvutils, moving, ml, storage
+import cvutils, moving, ml, storage, utils
 
 import numpy as np
 import sys, argparse
@@ -25,14 +25,8 @@
 classifierParams = storage.ClassifierParameters(params.classifierFilename)
 classifierParams.convertToFrames(params.videoFrameRate, 3.6) # conversion from km/h to m/frame
 
-if classifierParams.speedAggregationMethod == 'median':
-    speedAggregationFunc = np.median
-elif classifierParams.speedAggregationMethod == 'mean':
-    speedAggregationFunc = np.mean
-elif classifierParams.speedAggregationMethod == 'centile':
-    speedAggregationFunc = lambda speeds: np.percentile(speeds, args.speedAggregationCentile)
-else:
-    print('Unknown speed aggregation method: {}. Exiting'.format(classifierParams.speedAggregationMethod))
+speedAggregationFunc = utils.aggregationFunction(classifierParams.speedAggregationMethod)
+if speedAggregationFunc is None:
     sys.exit()
 
 pedBikeCarSVM = ml.SVM_load(classifierParams.pedBikeCarSVMFilename)