Mercurial Hosting > traffic-intelligence
diff trafficintelligence/processing.py @ 1067:092bd9c7deaf
corrected bug with multiprocessing and centiles
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Mon, 16 Jul 2018 01:24:26 -0400 |
parents | 862b55a87e63 |
children | c67f8c36ebc7 |
line wrap: on
line diff
--- a/trafficintelligence/processing.py Mon Jul 16 01:14:37 2018 -0400 +++ b/trafficintelligence/processing.py Mon Jul 16 01:24:26 2018 -0400 @@ -18,12 +18,13 @@ objectsNotInZone.append(o) return speeds, objectsNotInZone -def extractVideoSequenceSpeeds(dbFilename, siteName, nObjects, startTime, frameRate, minUserDurationSeconds, aggFunctions): +def extractVideoSequenceSpeeds(dbFilename, siteName, nObjects, startTime, frameRate, minUserDurationSeconds, aggMethods, aggCentiles): data = [] d = startTime.date() t1 = startTime.time() minUserDuration = minUserDurationSeconds*frameRate print('Extracting speed from '+dbFilename) + aggFunctions, tmpheaders = utils.aggregationMethods(aggMethods, aggCentiles) objects = storage.loadTrajectoriesFromSqlite(dbFilename, 'object', nObjects) for o in objects: if o.length() > minUserDuration: @@ -32,7 +33,7 @@ for method,func in aggFunctions.items(): aggSpeeds = frameRate*3.6*func(tmp) if method == 'centile': - row += aggSpeeds.tolist() + row.extend(aggSpeeds.tolist()) else: row.append(aggSpeeds) data.append(row)