nsaunier/traffic-intelligence: python/storage.py comparison

comparison python/storage.py @ 1012:01db14e947e4

resolved

author	Wendlasida
date	Fri, 01 Jun 2018 10:47:49 -0400
parents	933670761a57
children	75af46516b2b

comparison

equal deleted inserted replaced

-:4f0312bee393
+:01db14e947e4
 print('Unknown POI type {}. Exiting'.format(gmmType))
 import sys
 sys.exit()
 try:
 cursor.execute('CREATE TABLE IF NOT EXISTS gaussians2d (poi_id INTEGER, id INTEGER, type VARCHAR, x_center REAL, y_center REAL, covariance VARCHAR, covariance_type VARCHAR, weight, precisions_cholesky VARCHAR, PRIMARY KEY(poi_id, id))')
-for i in xrange(gmm.n_components):
+for i in range(gmm.n_components):
 cursor.execute('INSERT INTO gaussians2d VALUES(?,?,?,?,?,?,?,?,?)', (gmmId, i, gmmType, gmm.means_[i][0], gmm.means_[i][1], str(gmm.covariances_[i].tolist()), gmm.covariance_type, gmm.weights_[i], str(gmm.precisions_cholesky_[i].tolist())))
 connection.commit()
 except sqlite3.OperationalError as error:
 printDBError(error)
 connection = sqlite3.connect(outputFilename)
 cursor = connection.cursor()
 cursor.execute('CREATE TABLE IF NOT EXISTS prototypes (prototype_id INTEGER,routeIDstart INTEGER,routeIDend INTEGER, nMatching INTEGER, PRIMARY KEY(prototype_id))')
-for route in prototypes.keys():
+for route in prototypes:
 if prototypes[route]!=[]:
 for i in prototypes[route]:
 cursor.execute('insert into prototypes (prototype_id, routeIDstart,routeIDend, nMatching) values (?,?,?,?)',(i,route[0],route[1],nMatching[route][i]))
 connection.commit()
 printDBError(error)
 return []
 for row in cursor:
 route=(row[1],row[2])
-if route not in prototypes.keys():
+if route not in prototypes:
 prototypes[route]=[]
 prototypes[route].append(row[0])
 nMatching[row[0]]=row[3]
 connection.close()
 connection = sqlite3.connect(outputFilename)
 cursor = connection.cursor()
 cursor.execute("CREATE TABLE IF NOT EXISTS labels (object_id INTEGER,routeIDstart INTEGER,routeIDend INTEGER, prototype_id INTEGER, PRIMARY KEY(object_id))")
-for route in labels.keys():
+for route in labels:
 if labels[route]!=[]:
 for i in labels[route]:
 for j in labels[route][i]:
 cursor.execute("insert into labels (object_id, routeIDstart,routeIDend, prototype_id) values (?,?,?,?)",(j,route[0],route[1],i))
 return []
 for row in cursor:
 route=(row[1],row[2])
 p=row[3]
-if route not in labels.keys():
+if route not in labels:
 labels[route]={}
-if p not in labels[route].keys():
+if p not in labels[route]:
 labels[route][p]=[]
 labels[route][p].append(row[0])
 connection.close()
 return labels
 connection = sqlite3.connect(outFilename)
 cursor = connection.cursor()
 cursor.execute("CREATE TABLE IF NOT EXISTS speedprototypes (spdprototype_id INTEGER,prototype_id INTEGER,routeID_start INTEGER, routeID_end INTEGER, nMatching INTEGER, PRIMARY KEY(spdprototype_id))")
-for route in prototypes.keys():
+for route in prototypes:
 if prototypes[route]!={}:
 for i in prototypes[route]:
 if prototypes[route][i]!= []:
 for j in prototypes[route][i]:
 cursor.execute("insert into speedprototypes (spdprototype_id,prototype_id, routeID_start, routeID_end, nMatching) values (?,?,?,?,?)",(j,i,route[0],route[1],nmatching[j]))
 printDBError(error)
 return []
 for row in cursor:
 route=(row[2],row[3])
-if route not in prototypes.keys():
+if route not in prototypes:
 prototypes[route]={}
-if row[1] not in prototypes[route].keys():
+if row[1] not in prototypes[route]:
 prototypes[route][row[1]]=[]
 prototypes[route][row[1]].append(row[0])
 nMatching[row[0]]=row[4]
 connection.close()
 connection = sqlite3.connect(outputFilename)
 cursor = connection.cursor()
 cursor.execute("CREATE TABLE IF NOT EXISTS routes (object_id INTEGER,routeIDstart INTEGER,routeIDend INTEGER, PRIMARY KEY(object_id))")
-for route in Routes.keys():
+for route in Routes:
 if Routes[route]!=[]:
 for i in Routes[route]:
 cursor.execute("insert into routes (object_id, routeIDstart,routeIDend) values (?,?,?)",(i,route[0],route[1]))
 connection.commit()
 printDBError(error)
 return []
 for row in cursor:
 route=(row[1],row[2])
-if route not in Routes.keys():
+if route not in Routes:
 Routes[route]=[]
 Routes[route].append(row[0])
 connection.close()
 return Routes
 for l in loadListStrings(filename, commentCharacters):
 if l.startswith(option):
 values.append(l.split(delimiterChar)[1].strip())
 return values
-class FakeSecHead(object):
+def addSectionHeader(propertiesFile, headerName = 'main'):
-'''Add fake section header [asection]
+'''Add fake section header
 from http://stackoverflow.com/questions/2819696/parsing-properties-file-in-python/2819788#2819788
 use read_file in Python 3.2+
 '''
-def __init__(self, fp):
+yield '[{}]\n'.format(headerName)
-self.fp = fp
+for line in propertiesFile:
-self.sechead = '[main]\n'
+yield line
-def readline(self):
-if self.sechead:
-try: return self.sechead
-finally: self.sechead = None
-else: return self.fp.readline()
 def loadPemsTraffic(filename):
 '''Loads traffic data downloaded from the http://pems.dot.ca.gov clearinghouse
 into pandas dataframe'''
 f = openCheck(filename)
 l = f.readline().strip()
 items = l.split(',')
 headers = ['time', 'station', 'district', 'route', 'direction', 'lanetype', 'length', 'nsamples', 'pctobserved', 'flow', 'occupancy', 'speed', 'delay35', 'delay40', 'delay45', 'delay50', 'delay55', 'delay60']
 nLanes = (len(items)-len(headers))/3
-for i in xrange(nLanes):
+for i in range(nLanes):
 headers += ['flow{}'.format(i+1), 'occupancy{}'.format(i+1), 'speed{}'.format(i+1)]
 f.close()
 return read_csv(filename, delimiter = ',', names = headers)
 def generatePDLaneColumn(data):
 tmp = data[data['NO'] == objNum]
 objects[objNum] = moving.MovingObject(num = objNum, timeInterval = moving.TimeInterval(row['first'], row['last']))
 # positions should be rounded to nDecimals decimals only
 objects[objNum].curvilinearPositions = moving.CurvilinearTrajectory(S = npround(tmp['POS'].tolist(), nDecimals), Y = npround(tmp['POSLAT'].tolist(), nDecimals), lanes = tmp['LANE'].tolist())
 if objectNumbers is not None and objectNumbers > 0 and len(objects) >= objectNumbers:
-objects.values()
+return list(objects.values())
 else:
 if filename.endswith(".fzp"):
 inputfile = openCheck(filename, quitting = True)
 line = readline(inputfile, '*$')
 while len(line) > 0:#for line in inputfile:
 objects[objNum].curvilinearPositions.addPositionSYL(s, y, lane)
 except sqlite3.OperationalError as error:
 printDBError(error)
 else:
 print("File type of "+filename+" not supported (only .sqlite and .fzp files)")
-return objects.values()
+return list(objects.values())
 def selectPDLanes(data, lanes = None):
 '''Selects the subset of data for the right lanes
 Lane format is a string 'x_y' where x is link index and y is lane index'''
 def savePositionsToCsv(f, obj):
 timeInterval = obj.getTimeInterval()
 positions = obj.getPositions()
 curvilinearPositions = obj.getCurvilinearPositions()
-for i in xrange(int(obj.length())):
+for i in range(int(obj.length())):
 p1 = positions[i]
 s = '{},{},{},{}'.format(obj.num,timeInterval[i],p1.x,p1.y)
 if curvilinearPositions is not None:
 p2 = curvilinearPositions[i]
 s += ',{},{}'.format(p2[0],p2[1])
 #########################
 class ClassifierParameters(VideoFilenameAddable):
 'Class for the parameters of object classifiers'
 def loadConfigFile(self, filename):
-from ConfigParser import ConfigParser
+from configparser import ConfigParser
 config = ConfigParser()
-config.readfp(FakeSecHead(openCheck(filename)))
+config.read_file(addSectionHeader(openCheck(filename)))
 self.sectionHeader = config.sections()[0]
 self.pedBikeCarSVMFilename = config.get(self.sectionHeader, 'pbv-svm-filename')
 self.bikeCarSVMFilename = config.get(self.sectionHeader, 'bv-svm-filename')
 self.percentIncreaseCrop = config.getfloat(self.sectionHeader, 'percent-increase-crop')
 method parameters, etc. for tracking and safety
 Note: framerate is already taken into account'''
 def loadConfigFile(self, filename):
-from ConfigParser import ConfigParser
+from configparser import ConfigParser
-config = ConfigParser()
+config = ConfigParser(strict=False)
-config.readfp(FakeSecHead(openCheck(filename)))
+config.read_file(addSectionHeader(openCheck(filename)))
 self.sectionHeader = config.sections()[0]
 # Tracking/display parameters
 self.videoFilename = config.get(self.sectionHeader, 'video-filename')
 self.databaseFilename = config.get(self.sectionHeader, 'database-filename')
 return params, videoFilename, databaseFilename, invHomography, intrinsicCameraMatrix, distortionCoefficients, undistortedImageMultiplication, undistort, firstFrameNum
 # deprecated
 class SceneParameters(object):
 def __init__(self, config, sectionName):
-from ConfigParser import NoOptionError
+from configparser import NoOptionError
 from ast import literal_eval
 try:
 self.sitename = config.get(sectionName, 'sitename')
 self.databaseFilename = config.get(sectionName, 'data-filename')
 self.homographyFilename = config.get(sectionName, 'homography-filename')
 print(e)
 print('Not a section for scene meta-data')
 @staticmethod
 def loadConfigFile(filename):
-from ConfigParser import ConfigParser
+from configparser import ConfigParser
 config = ConfigParser()
 config.readfp(openCheck(filename))
 configDict = dict()
 for sectionName in config.sections():
 configDict[sectionName] = SceneParameters(config, sectionName)

Mercurial > hg > nsaunier > traffic-intelligence

comparison python/storage.py @ 1012:01db14e947e4