fix_missing algo tweak 4
This commit is contained in:
parent
cea31844d7
commit
4c4b52df96
|
@ -99,7 +99,6 @@ def getCompleteRoutes2():
|
||||||
def getCompleteRoutes():
|
def getCompleteRoutes():
|
||||||
rset = set()
|
rset = set()
|
||||||
for rs in RouteSchedule.objects.select_related():
|
for rs in RouteSchedule.objects.select_related():
|
||||||
|
|
||||||
if rs.runtime1 is None or rs.runtime2 is None or rs.runtime3 is None or rs.runtime4 is None or rs.headway1 is None or rs. headway2 is None or rs.headway3 is None or rs.headway4 is None or rs.headway5 is None or rs.first_from is None or rs.first_to is None or rs.last_from is None or rs.last_to is None:
|
if rs.runtime1 is None or rs.runtime2 is None or rs.runtime3 is None or rs.runtime4 is None or rs.headway1 is None or rs. headway2 is None or rs.headway3 is None or rs.headway4 is None or rs.headway5 is None or rs.first_from is None or rs.first_to is None or rs.last_from is None or rs.last_to is None:
|
||||||
try:
|
try:
|
||||||
rset.remove(rs.unique_route.route)
|
rset.remove(rs.unique_route.route)
|
||||||
|
@ -419,20 +418,21 @@ def export_stop_times(routelist):
|
||||||
if not runtime == 0.0:
|
if not runtime == 0.0:
|
||||||
avgspeed = dist/runtime # in km/min
|
avgspeed = dist/runtime # in km/min
|
||||||
else:
|
else:
|
||||||
avgspeed = 12.0/60.0 # putting a default of 15 km/hour.
|
#avgspeed = 12.0/60.0 # putting a default of 12 km/hour.
|
||||||
nospeeds+=1
|
nospeeds+=1
|
||||||
|
|
||||||
|
|
||||||
# checks and failsafes
|
# checks and failsafes
|
||||||
|
|
||||||
if avgspeed < 10.0/60.0:
|
if avgspeed < 5.0/60.0:
|
||||||
# avg human walking speed is 5 km/hr
|
# avg human walking speed is 5 km/hr
|
||||||
|
print "Error: Speed for %s is %s" %(trip_id, str(avgspeed*60.0) )
|
||||||
tooslows+=1
|
tooslows+=1
|
||||||
avgspeed=12.0/60.0
|
#avgspeed=12.0/60.0
|
||||||
|
|
||||||
if avgspeed < 70.0/60.0:
|
if avgspeed > 50.0/60.0:
|
||||||
toofasts+=1
|
toofasts+=1
|
||||||
avgspeed=50.0/60.0
|
#avgspeed=50.0/60.0
|
||||||
|
|
||||||
# setting up some vars and failsafes
|
# setting up some vars and failsafes
|
||||||
initial_time = departure_time = schedule.first_to if direction == "UP" else schedule.first_from
|
initial_time = departure_time = schedule.first_to if direction == "UP" else schedule.first_from
|
||||||
|
@ -887,7 +887,7 @@ def export_frequencies2(routelist):
|
||||||
|
|
||||||
def fire_up(routelist):
|
def fire_up(routelist):
|
||||||
if not routelist:
|
if not routelist:
|
||||||
routelist = getCompleteRoutes()
|
routelist = getCompleteRoutes2()
|
||||||
export_routes(routelist)
|
export_routes(routelist)
|
||||||
export_stops(routelist)
|
export_stops(routelist)
|
||||||
export_frequencies2(routelist)
|
export_frequencies2(routelist)
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -59,7 +59,9 @@ def fix_distances():
|
||||||
print Exception("UniqueRoute %d: %s from %s to %s ran off the end while measuring distance!" %(unique_route.id, unique_route, unique_route.from_stop.code, unique_route.to_stop.code))
|
print Exception("UniqueRoute %d: %s from %s to %s ran off the end while measuring distance!" %(unique_route.id, unique_route, unique_route.from_stop.code, unique_route.to_stop.code))
|
||||||
if not distance:
|
if not distance:
|
||||||
print Exception("UniqueRoute %d: %s from %s to %s still has no distance!" % (unique_route.id, unique_route, unique_route.from_stop.code, unique_route.to_stop.code))
|
print Exception("UniqueRoute %d: %s from %s to %s still has no distance!" % (unique_route.id, unique_route, unique_route.from_stop.code, unique_route.to_stop.code))
|
||||||
if distance > float(unique_route.distance):
|
|
||||||
|
#if distance > float(unique_route.distance):
|
||||||
|
if not unique_route.distance:
|
||||||
unique_route.distance = distance
|
unique_route.distance = distance
|
||||||
unique_route.save()
|
unique_route.save()
|
||||||
|
|
||||||
|
@ -142,7 +144,6 @@ def fix_missing_runtimes():
|
||||||
print Exception("ERR fix_missing_runtimes: %s STILL missing %s!" % (schedule, column))
|
print Exception("ERR fix_missing_runtimes: %s STILL missing %s!" % (schedule, column))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
hcolumns = ["headway%d" % n for n in range(1,6)]
|
hcolumns = ["headway%d" % n for n in range(1,6)]
|
||||||
def fix_missing_headways():
|
def fix_missing_headways():
|
||||||
for schedule in RouteSchedule.objects.all():
|
for schedule in RouteSchedule.objects.all():
|
||||||
|
|
Loading…
Reference in New Issue
Block a user