CAMP/chaloBEST
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix_missing changed - algo tweak 2

Browse Source
This commit is contained in:
Johnson Chetty 2012-03-28 13:53:54 +02:00
parent dfb01db6e3
commit 880955fbe3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chaloBEST/imports/fix_missing_atlas_data.py
View File

@ -8,12 +8,13 @@ def fix_distances():
from_stop, to_stop = unique_route.from_stop.id, unique_route.to_stop.id from_stop, to_stop = unique_route.from_stop.id, unique_route.to_stop.id
details = list(unique_route.route.routedetail_set.all()) details = list(unique_route.route.routedetail_set.all())
# Sometimes to_stop comes before from_stop in RouteDetail. What is there to say. # Sometimes to_stop comes before from_stop in RouteDetail. What is there to say.
# so reverse the list if that happens.. so a from_stop will always come before a to_stop
for detail in details: for detail in details:
if detail.stop.id == from_stop: break if detail.stop.id == from_stop: break
if detail.stop.id == to_stop: if detail.stop.id == to_stop:
details.reverse() details.reverse()
break break
# setup vars
distance = 0.0 distance = 0.0
record = False record = False
last_stop_passed = False last_stop_passed = False
@ -21,6 +22,10 @@ def fix_distances():
# basic idea, run thru each detail, if it has km info, then add it, if to_stop reached, and if it did not have km info, then go to the next detail having km info add it and done. # basic idea, run thru each detail, if it has km info, then add it, if to_stop reached, and if it did not have km info, then go to the next detail having km info add it and done.
# For route 240RING, some detail.km is null??? # For route 240RING, some detail.km is null???
# distance > 0 because of 100RING returning 1 stop shy of its start
if distance > 0 and detail.stop.id == to_stop:
last_stop_passed = True
# is a stage # is a stage
if record and detail.km: if record and detail.km:
if not last_stop_passed: if not last_stop_passed:
@ -29,11 +34,8 @@ def fix_distances():
# if stage having km info reached after last stop, then add and exit loop # if stage having km info reached after last stop, then add and exit loop
distance += float(detail.km) distance += float(detail.km)
record=False record=False
last_stop_passed = False
break
# distance > 0 because of 100RING returning 1 stop shy of its start
if distance > 0 and detail.stop.id == to_stop:
last_stop_passed = True last_stop_passed = True
break
#if record and distance > 0 and detail.stop.id == to_stop and last_stop_reached: #if record and distance > 0 and detail.stop.id == to_stop and last_stop_reached:
# record = False # record = False