diff trafficintelligence/processing.py @ 1072:c67f8c36ebc7

interaction extraction
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 19 Jul 2018 01:44:11 -0400
parents 092bd9c7deaf
children
line wrap: on
line diff
--- a/trafficintelligence/processing.py	Wed Jul 18 02:12:47 2018 -0400
+++ b/trafficintelligence/processing.py	Thu Jul 19 01:44:11 2018 -0400
@@ -18,16 +18,15 @@
             objectsNotInZone.append(o)
     return speeds, objectsNotInZone
 
-def extractVideoSequenceSpeeds(dbFilename, siteName, nObjects, startTime, frameRate, minUserDurationSeconds, aggMethods, aggCentiles):
+def extractVideoSequenceSpeeds(dbFilename, siteName, nObjects, startTime, frameRate, minDuration, 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:
+        if o.length() > minDuration:
             row = [siteName, d, utils.framesToTime(o.getFirstInstant(), frameRate, t1), o.getUserType()]
             tmp = o.getSpeeds()
             for method,func in aggFunctions.items():