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

comparison python/storage.py @ 636:3058e00887bc

removed all issues because of tests with None, using is instead of == or !=

author	Nicolas Saunier <nicolas.saunier@polymtl.ca>
date	Tue, 24 Mar 2015 18:11:28 +0100
parents	977407c9f815
children	932f96c89212

comparison

equal deleted inserted replaced

-:6ae68383071e
+:3058e00887bc
 obj = None
 objects = []
 for row in cursor:
 if row[0] != objId:
 objId = row[0]
-if obj != None and obj.length() == obj.positions.length():
+if obj is not None and obj.length() == obj.positions.length():
 objects.append(obj)
-elif obj != None:
+elif obj is not None:
 print('Object {} is missing {} positions'.format(obj.getNum(), int(obj.length())-obj.positions.length()))
 obj = moving.MovingObject(row[0], timeInterval = moving.TimeInterval(row[1], row[1]), positions = moving.Trajectory([[row[2]],[row[3]]]))
 else:
 obj.timeInterval.last = row[1]
 obj.positions.addPositionXY(row[2],row[3])
-if obj != None and obj.length() == obj.positions.length():
+if obj is not None and obj.length() == obj.positions.length():
 objects.append(obj)
-elif obj != None:
+elif obj is not None:
 print('Object {} is missing {} positions'.format(obj.getNum(), int(obj.length())-obj.positions.length()))
 return objects
 def loadUserTypesFromTable(cursor, trajectoryType, objectNumbers):
 createIndicatorTables(cursor)
 for inter in interactions:
 saveInteraction(cursor, inter)
 for indicatorName in indicatorNames:
 indicator = inter.getIndicator(indicatorName)
-if indicator != None:
+if indicator is not None:
 saveIndicator(cursor, inter.getNum(), indicator)
 except sqlite3.OperationalError as error:
 printDBError(error)
 connection.commit()
 connection.close()
 if self.sechead:
 try: return self.sechead
 finally: self.sechead = None
 else: return self.fp.readline()
-def loadTrajectoriesFromVissimFile(filename, simulationStepsPerTimeUnit, nObjects = -1, warmUpLastInstant = None):
+def loadTrajectoriesFromVissimFile(filename, simulationStepsPerTimeUnit, nObjects = -1, warmUpLastInstant = None, usePandas = False):
 '''Reads data from VISSIM .fzp trajectory file
 simulationStepsPerTimeUnit is the number of simulation steps per unit of time used by VISSIM
 for example, there seems to be 5 simulation steps per simulated second in VISSIM,
 so simulationStepsPerTimeUnit should be 5,
 so that all times correspond to the number of the simulation step (and can be stored as integers)
 Assumed to be sorted over time'''
 objects = {} # dictionary of objects index by their id
 firstInstants = {}
-inputfile = openCheck(filename, quitting = True)
+if usePandas:
+from pandas import read_csv
-# data = pd.read_csv(filename, skiprows=15, delimiter=';')
+data = read_csv(filename, delimiter=';', skiprows=16)
-# skip header: 15 lines + 1
+print('Work in progress')
-line = readline(inputfile, '*$')
+return []
-while len(line) > 0:#for line in inputfile:
+else:
-data = line.strip().split(';')
+inputfile = openCheck(filename, quitting = True)
-objNum = int(data[1])
-instant = int(float(data[0])*simulationStepsPerTimeUnit)
+# data = pd.read_csv(filename, skiprows=15, delimiter=';')
-s = float(data[4])
+# skip header: 15 lines + 1
-y = float(data[5])
-lane = data[2]+'_'+data[3]
-if objNum not in firstInstants:
-firstInstants[objNum] = instant
-if warmUpLastInstant == None or firstInstants[objNum] >= warmUpLastInstant:
-if nObjects < 0 or len(objects) < nObjects:
-objects[objNum] = moving.MovingObject(num = objNum, timeInterval = moving.TimeInterval(instant, instant))
-objects[objNum].curvilinearPositions = moving.CurvilinearTrajectory()
-if (warmUpLastInstant == None or firstInstants[objNum] >= warmUpLastInstant) and objNum in objects:
-objects[objNum].timeInterval.last = instant
-objects[objNum].curvilinearPositions.addPositionSYL(s, y, lane)
 line = readline(inputfile, '*$')
+while len(line) > 0:#for line in inputfile:
-return objects.values()
+data = line.strip().split(';')
+objNum = int(data[1])
+instant = int(float(data[0])*simulationStepsPerTimeUnit)
+s = float(data[4])
+y = float(data[5])
+lane = data[2]+'_'+data[3]
+if objNum not in firstInstants:
+firstInstants[objNum] = instant
+if warmUpLastInstant is None or firstInstants[objNum] >= warmUpLastInstant:
+if nObjects < 0 or len(objects) < nObjects:
+objects[objNum] = moving.MovingObject(num = objNum, timeInterval = moving.TimeInterval(instant, instant))
+objects[objNum].curvilinearPositions = moving.CurvilinearTrajectory()
+if (warmUpLastInstant is None or firstInstants[objNum] >= warmUpLastInstant) and objNum in objects:
+objects[objNum].timeInterval.last = instant
+objects[objNum].curvilinearPositions.addPositionSYL(s, y, lane)
+line = readline(inputfile, '*$')
+return objects.values()
 def loadTrajectoriesFromNgsimFile(filename, nObjects = -1, sequenceNum = -1):
 '''Reads data from the trajectory data provided by NGSIM project
 and returns the list of Feature objects'''
 objects = []
 positions = obj.getPositions()
 curvilinearPositions = obj.getCurvilinearPositions()
 for i in xrange(int(obj.length())):
 p1 = positions[i]
 s = '{},{},{},{}'.format(obj.num,timeInterval[i],p1.x,p1.y)
-if curvilinearPositions != None:
+if curvilinearPositions is not None:
 p2 = curvilinearPositions[i]
 s += ',{},{}'.format(p2[0],p2[1])
 f.write(s+'\n')
 def writeTrajectoriesToCsv(filename, objects):
 self.maxExtremeAcceleration = config.getfloat(self.sectionHeader, 'max-extreme-acceleration')/self.videoFrameRate**2
 self.maxExtremeSteering = config.getfloat(self.sectionHeader, 'max-extreme-steering')/self.videoFrameRate
 self.useFeaturesForPrediction = config.getboolean(self.sectionHeader, 'use-features-prediction')
 def __init__(self, filename = None):
-if filename != None:
+if filename is not None:
 self.loadConfigFile(filename)
 class SceneParameters:
 def __init__(self, config, sectionName):
 from ConfigParser import NoOptionError

Mercurial Hosting > traffic-intelligence

comparison python/storage.py @ 636:3058e00887bc