mirror of
https://github.com/a-b-street/abstreet.git
synced 2024-12-21 05:11:42 +03:00
39f5d50fcd
City names are now disambiguated by a two-letter country code. This commit handles almost everything needed to make this transition. Main next steps are fixing up map edits automatically and making the city picker UI understand the extra level of hierarchy. A little bit of fallout: lakeslice gridlocks again; this regression is actually from the recent traffic signal changes, but I'm just now regenerating everything. Will fix soon.
83 lines
2.5 KiB
Python
83 lines
2.5 KiB
Python
import requests
|
|
import statistics
|
|
|
|
|
|
def get(args, cmd, **kwargs):
|
|
resp = requests.get(args.api + cmd, **kwargs)
|
|
if resp.status_code != requests.codes.ok:
|
|
raise Exception(resp.text)
|
|
return resp
|
|
|
|
|
|
def post(args, cmd, **kwargs):
|
|
resp = requests.post(args.api + cmd, **kwargs)
|
|
if resp.status_code != requests.codes.ok:
|
|
raise Exception(resp.text)
|
|
return resp
|
|
|
|
|
|
# Returns Results
|
|
def run_sim(args, modifiers=[], edits=None):
|
|
post(args, '/sim/load', json={
|
|
'scenario': 'data/system/{}/{}/scenarios/{}/weekday.bin'.format(args.country_code, args.city_name, args.map_name),
|
|
'modifiers': modifiers,
|
|
'edits': edits,
|
|
})
|
|
post(args, '/sim/goto-time',
|
|
params={'t': '{}:00:00'.format(args.hours)})
|
|
raw_trips = get(args, '/data/get-finished-trips').json()
|
|
|
|
# Map trip ID to the duration (in seconds) of the trip. Filter out
|
|
# cancelled trips.
|
|
num_cancelled = 0
|
|
trip_times = {}
|
|
capped_trips = set()
|
|
for trip in raw_trips:
|
|
if trip['duration'] is None:
|
|
num_cancelled += 1
|
|
else:
|
|
trip_times[trip['id']] = trip['duration']
|
|
if trip['capped']:
|
|
capped_trips.add(trip['id'])
|
|
|
|
return Results(num_cancelled, trip_times, capped_trips)
|
|
|
|
|
|
class Results:
|
|
def __init__(self, num_cancelled, trip_times, capped_trips):
|
|
self.num_cancelled = num_cancelled
|
|
# Maps trip ID to seconds
|
|
self.trip_times = trip_times
|
|
# A set of trip IDs
|
|
self.capped_trips = capped_trips
|
|
|
|
# self is the baseline, results2 is the experiment
|
|
def compare(self, results2):
|
|
faster = []
|
|
slower = []
|
|
|
|
for trip, after_dt in results2.trip_times.items():
|
|
before_dt = self.trip_times.get(trip)
|
|
if not before_dt:
|
|
# The trip didn't finish in time in the baseline run
|
|
continue
|
|
if before_dt:
|
|
if before_dt > after_dt:
|
|
faster.append(before_dt - after_dt)
|
|
elif after_dt > before_dt:
|
|
slower.append(after_dt - before_dt)
|
|
|
|
print('{:,} trips faster, average {:.1f}s savings'.format(
|
|
len(faster), avg(faster)))
|
|
print('{:,} trips slower, average {:.1f}s loss'.format(
|
|
len(slower), avg(slower)))
|
|
print('{:,} trips cancelled before, {:,} after'.format(
|
|
self.num_cancelled, results2.num_cancelled))
|
|
|
|
|
|
def avg(data):
|
|
if data:
|
|
return statistics.mean(data)
|
|
else:
|
|
return 0.0
|