Mercurial Hosting > traffic-intelligence
comparison scripts/process.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 | e6b791ad7f85 |
comparison
equal
deleted
inserted
replaced
1066:862b55a87e63 | 1067:092bd9c7deaf |
---|---|
252 headers = ['site', 'date', 'time', 'user_type'] | 252 headers = ['site', 'date', 'time', 'user_type'] |
253 aggFunctions, tmpheaders = utils.aggregationMethods(args.aggMethods, args.aggCentiles) | 253 aggFunctions, tmpheaders = utils.aggregationMethods(args.aggMethods, args.aggCentiles) |
254 headers.extend(tmpheaders) | 254 headers.extend(tmpheaders) |
255 if args.nProcesses == 1: | 255 if args.nProcesses == 1: |
256 for vs in videoSequences: | 256 for vs in videoSequences: |
257 data.extend(processing.extractVideoSequenceSpeeds(str(parentPath/vs.getDatabaseFilename()), vs.cameraView.site.name, args.nObjects, vs.startTime, vs.cameraView.cameraType.frameRate, args.minUserDuration, aggFunctions)) | 257 data.extend(processing.extractVideoSequenceSpeeds(str(parentPath/vs.getDatabaseFilename()), vs.cameraView.site.name, args.nObjects, vs.startTime, vs.cameraView.cameraType.frameRate, args.minUserDuration, args.aggMethods, args.aggCentiles)) |
258 else: | 258 else: |
259 jobs = [pool.apply_async(processing.extractVideoSequenceSpeeds, args = (str(parentPath/vs.getDatabaseFilename()), vs.cameraView.site.name, args.nObjects, vs.startTime, vs.cameraView.cameraType.frameRate, args.minUserDuration, aggFunctions)) for vs in videoSequences] | 259 jobs = [pool.apply_async(processing.extractVideoSequenceSpeeds, args = (str(parentPath/vs.getDatabaseFilename()), vs.cameraView.site.name, args.nObjects, vs.startTime, vs.cameraView.cameraType.frameRate, args.minUserDuration, args.aggMethods, args.aggCentiles)) for vs in videoSequences] |
260 for job in jobs: | 260 for job in jobs: |
261 data.extend(job.get()) | 261 data.extend(job.get()) |
262 pool.close() | 262 pool.close() |
263 | 263 |
264 data = pd.DataFrame(data, columns = headers) | 264 data = pd.DataFrame(data, columns = headers) |