Mercurial Hosting > traffic-intelligence
comparison trafficintelligence/iframework.py @ 1164:f1a33f458d7e
changing ZonePassing to ZoneCrossing
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 23 Mar 2021 23:01:43 -0400 |
parents | fa9c358789ac |
children | f9ab0cbb92da |
comparison
equal
deleted
inserted
replaced
1163:fa9c358789ac | 1164:f1a33f458d7e |
---|---|
206 self.speed = speed | 206 self.speed = speed |
207 self.wrongDirection = wrongDirection | 207 self.wrongDirection = wrongDirection |
208 self.point = p | 208 self.point = p |
209 self.initPersonGroupPassing(group, person, transport, vehicle) | 209 self.initPersonGroupPassing(group, person, transport, vehicle) |
210 | 210 |
211 class ZonePassing(AbstractPassing,Base): | 211 class ZoneCrossing(AbstractPassing,Base): |
212 __tablename__ = 'zonepassings' | 212 __tablename__ = 'zonecrossings' |
213 idx = Column(Integer, primary_key=True) | 213 idx = Column(Integer, primary_key=True) |
214 zoneIdx = Column(Integer, ForeignKey('zones.idx')) | 214 zoneIdx = Column(Integer, ForeignKey('zones.idx')) |
215 groupIdx = Column(Integer, ForeignKey('groups.idx')) | 215 groupIdx = Column(Integer, ForeignKey('groups.idx')) |
216 pointIdx = Column(Integer, ForeignKey('points.idx')) | 216 pointIdx = Column(Integer, ForeignKey('points.idx')) |
217 instant = Column(DateTime) | 217 instant = Column(DateTime) |
296 counts.append(LinePassing(line, datetime(2020,7,2,23,11), person = Person(12, 'female'), transport = 'bike')) | 296 counts.append(LinePassing(line, datetime(2020,7,2,23,11), person = Person(12, 'female'), transport = 'bike')) |
297 counts.append(LinePassing(line, datetime(2020,7,2,23,13), person = Person(), transport = 'cardriver')) # example of counting cars without knowing the driver and passenger's attributes | 297 counts.append(LinePassing(line, datetime(2020,7,2,23,13), person = Person(), transport = 'cardriver')) # example of counting cars without knowing the driver and passenger's attributes |
298 counts.append(LinePassing(line, datetime(2020,7,2,23,15), group = Group([Person(34+i) for i in range(3)]), transport = 'carpassenger')) | 298 counts.append(LinePassing(line, datetime(2020,7,2,23,15), group = Group([Person(34+i) for i in range(3)]), transport = 'carpassenger')) |
299 | 299 |
300 | 300 |
301 counts.append(ZonePassing(zone, datetime(2020,7,7,9,5), True, person = Person(33, 'male', False, False, True, False))) | 301 counts.append(ZoneCrossing(zone, datetime(2020,7,7,9,5), True, person = Person(33, 'male', False, False, True, False))) |
302 | 302 |
303 session.add_all([line, p, zone, group1, destination]+modes+groupMode1+counts+activities) | 303 session.add_all([line, p, zone, group1, destination]+modes+groupMode1+counts+activities) |
304 | 304 |
305 session.commit() | 305 session.commit() |
306 session.close() | 306 session.close() |