Mercurial Hosting > traffic-intelligence

comparison python/storage.py @ 685:94b291a5f933 dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
several updates for display
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Fri, 05 Jun 2015 17:13:28 +0200
parents da1352b89d02
children 463150a8e129
comparison
equal deleted inserted replaced
684:6d2ece4aed7c 685:94b291a5f933
370 userTypes = {} 370 userTypes = {}
371 for row in cursor: 371 for row in cursor:
372 userTypes[row[0]] = row[1] 372 userTypes[row[0]] = row[1]
373 return userTypes 373 return userTypes
374 374
375 def loadTrajectoriesFromSqlite(filename, trajectoryType, objectNumbers = None): 375 def loadTrajectoriesFromSqlite(filename, trajectoryType, objectNumbers = None, withFeatures = False):
376 '''Loads the first objectNumbers objects or the indices in objectNumbers from the database''' 376 '''Loads the first objectNumbers objects or the indices in objectNumbers from the database'''
377 connection = sqlite3.connect(filename) 377 connection = sqlite3.connect(filename)
378 378
379 objects = loadTrajectoriesFromTable(connection, 'positions', trajectoryType, objectNumbers) 379 objects = loadTrajectoriesFromTable(connection, 'positions', trajectoryType, objectNumbers)
380 objectVelocities = loadTrajectoriesFromTable(connection, 'velocities', trajectoryType, objectNumbers) 380 objectVelocities = loadTrajectoriesFromTable(connection, 'velocities', trajectoryType, objectNumbers)
409 409
410 # load userType 410 # load userType
411 userTypes = loadUserTypesFromTable(cursor, trajectoryType, objectNumbers) 411 userTypes = loadUserTypesFromTable(cursor, trajectoryType, objectNumbers)
412 for obj in objects: 412 for obj in objects:
413 obj.userType = userTypes[obj.getNum()] 413 obj.userType = userTypes[obj.getNum()]
414
415 if withFeatures:
416 nFeatures = 0
417 for obj in objects:
418 nFeatures = max(nFeatures, max(obj.featureNumbers))
419 features = loadTrajectoriesFromSqlite(filename, 'feature', nFeatures)
420 for obj in objects:
421 obj.setFeatures(features)
414 422
415 except sqlite3.OperationalError as error: 423 except sqlite3.OperationalError as error:
416 printDBError(error) 424 printDBError(error)
417 objects = [] 425 objects = []
418 426
904 # Classification parameters 912 # Classification parameters
905 self.speedAggregationMethod = config.get(self.sectionHeader, 'speed-aggregation-method') 913 self.speedAggregationMethod = config.get(self.sectionHeader, 'speed-aggregation-method')
906 self.nFramesIgnoreAtEnds = config.getint(self.sectionHeader, 'nframes-ignore-at-ends') 914 self.nFramesIgnoreAtEnds = config.getint(self.sectionHeader, 'nframes-ignore-at-ends')
907 self.speedAggregationQuantile = config.getint(self.sectionHeader, 'speed-aggregation-quantile') 915 self.speedAggregationQuantile = config.getint(self.sectionHeader, 'speed-aggregation-quantile')
908 self.minSpeedEquiprobable = config.getfloat(self.sectionHeader, 'min-speed-equiprobable') 916 self.minSpeedEquiprobable = config.getfloat(self.sectionHeader, 'min-speed-equiprobable')
917 self.minNPixels = config.getint(self.sectionHeader, 'min-npixels-crop')
909 self.pedBikeCarSVMFilename = config.get(self.sectionHeader, 'pbv-svm-filename') 918 self.pedBikeCarSVMFilename = config.get(self.sectionHeader, 'pbv-svm-filename')
910 self.bikeCarSVMFilename = config.get(self.sectionHeader, 'bv-svm-filename') 919 self.bikeCarSVMFilename = config.get(self.sectionHeader, 'bv-svm-filename')
911 self.maxPedestrianSpeed = config.getfloat(self.sectionHeader, 'max-ped-speed') 920 self.maxPedestrianSpeed = config.getfloat(self.sectionHeader, 'max-ped-speed')
912 self.maxCyclistSpeed = config.getfloat(self.sectionHeader, 'max-cyc-speed') 921 self.maxCyclistSpeed = config.getfloat(self.sectionHeader, 'max-cyc-speed')
913 self.meanPedestrianSpeed = config.getfloat(self.sectionHeader, 'mean-ped-speed') 922 self.meanPedestrianSpeed = config.getfloat(self.sectionHeader, 'mean-ped-speed')