a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-29 04:35:51 +03:00
Code Issues Projects Releases Wiki Activity

start to figure out where to compress Analytics [rebuild]

Browse Source
This commit is contained in:
Dustin Carlino 2020-05-10 16:08:45 -07:00
parent 5ae94168f6
commit dbf4b15959
3 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/MANIFEST.txt
View File

@ -17,7 +17,7 @@ data/input/raw_maps/huge_seattle.bin,ceeb9fd22602acb59bade4a5a869fd2a,https://ww
data/input/raw_maps/intl_district.bin,565e354c7bf99be8b89e6de83250ca29,https://www.dropbox.com/s/yopzq58r9t4y93v/intl_district.bin.zip?dl=0
data/input/raw_maps/lakeslice.bin,4fe4c6edbb8a9e70615e75f7af5540a7,https://www.dropbox.com/s/4nmdtw0mgqe7tyg/lakeslice.bin.zip?dl=0
data/input/raw_maps/montlake.bin,49fe4a92059959360db4bab9a0e1c37b,https://www.dropbox.com/s/qk8rhwr6vdm79vz/montlake.bin.zip?dl=0
data/input/raw_maps/mt_baker.bin,3ba4cb2ec58c2a8b61359e051af12ac1,https://www.dropbox.com/s/nr18iu83lrcyg8e/mt_baker.bin.zip?dl=0
data/input/raw_maps/mt_baker.bin,bb1da8e15c50d0a9b64265a052bf966a,https://www.dropbox.com/s/nr18iu83lrcyg8e/mt_baker.bin.zip?dl=0
data/input/raw_maps/west_seattle.bin,97c1598ccd98a80701ec74685ee10307,https://www.dropbox.com/s/112ym2cwg643c9n/west_seattle.bin.zip?dl=0
data/input/screenshots/lakeslice/01x01_i325.gif,40b1e76bb29e46823fa52186c891578b,https://www.dropbox.com/s/uiodmxawv8sheb1/01x01_i325.gif.zip?dl=0
data/input/screenshots/lakeslice/01x02_i163.gif,bbe0f33acd8fa1cf8fe5028bea8cc9a2,https://www.dropbox.com/s/6zebcdhbeirab49/01x02_i163.gif.zip?dl=0
@ -171,7 +171,7 @@ data/input/seattle/osm/huge_seattle.osm,d434015a727ccf198f14e8766351f27b,https:/
data/input/seattle/osm/intl_district.osm,8a6a0f72b1eac409461bbff5c98c7df7,https://www.dropbox.com/s/fny0hr1fyiic9ih/intl_district.osm.zip?dl=0
data/input/seattle/osm/lakeslice.osm,d6c75da2be28e99a3b2d4b98ec105848,https://www.dropbox.com/s/vv90x69xvxx7o3s/lakeslice.osm.zip?dl=0
data/input/seattle/osm/montlake.osm,c19004a7ab9784ea9eee084aeff9e175,https://www.dropbox.com/s/qh1jiav783m60g1/montlake.osm.zip?dl=0
data/input/seattle/osm/mt_baker.osm,9c281a338541bd36bfbcb7d814c52781,https://www.dropbox.com/s/2tibw8w3q99u0f4/mt_baker.osm.zip?dl=0
data/input/seattle/osm/mt_baker.osm,ce3607ec8cc78dae440bf3eeacd58b20,https://www.dropbox.com/s/2tibw8w3q99u0f4/mt_baker.osm.zip?dl=0
data/input/seattle/osm/washington-latest.osm.pbf,eb3f93045609fce0329626fd72d66f0e,https://www.dropbox.com/s/xha9cx696czbzlf/washington-latest.osm.pbf.zip?dl=0
data/input/seattle/osm/west_seattle.osm,ac8fac599b5579023ae12092878490db,https://www.dropbox.com/s/8m0vmvwg5zz3uod/west_seattle.osm.zip?dl=0
data/input/seattle/parcels_urbansim.txt,db63d7d606e8702d12f9399e87e6a00f,https://www.dropbox.com/s/6g8rbsf200dssj3/parcels_urbansim.txt.zip?dl=0
@ -190,7 +190,7 @@ data/system/maps/huge_seattle.bin,3b2826d550145b0d04bc0e78b956cdb0,https://www.d
data/system/maps/intl_district.bin,1e9ed01458dbedb8951e5f851842db44,https://www.dropbox.com/s/fohppni52ekc5l3/intl_district.bin.zip?dl=0
data/system/maps/lakeslice.bin,43a4cbef0ec72c5e40a89a79e02226df,https://www.dropbox.com/s/99zi0gcbyvqrkud/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,4ab41cd303d31aec981ad680e007f00f,https://www.dropbox.com/s/zvhm2j5lavixxcr/montlake.bin.zip?dl=0
data/system/maps/mt_baker.bin,6f9355dfaf4824b521e95d54ab39b66d,https://www.dropbox.com/s/cetje663p04cbgp/mt_baker.bin.zip?dl=0
data/system/maps/mt_baker.bin,aed0421ffae0fcffe2009c9322bb2404,https://www.dropbox.com/s/cetje663p04cbgp/mt_baker.bin.zip?dl=0
data/system/maps/west_seattle.bin,2eb303dec989faecd052c753f05d09c4,https://www.dropbox.com/s/5pp1ik9l40yj3wh/west_seattle.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,0d8f50736c01d57ffbc42f568ea8bfd5,https://www.dropbox.com/s/1c1sohvy50263wg/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,951f6473d850f807a3466214d38178b7,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
@ -204,5 +204,5 @@ data/system/scenarios/intl_district/weekday.bin,bf7d7e16370d01b3d45648ddac536fd7
data/system/scenarios/lakeslice/weekday.bin,46687336be2c8ea5a219e3481ff4eeca,https://www.dropbox.com/s/858wxml3z0qlhxd/weekday.bin.zip?dl=0
data/system/scenarios/montlake/everyone_weekday.bin,71a4539819128ed9b97ecab013f2f60e,https://www.dropbox.com/s/44s818fimpu53v1/everyone_weekday.bin.zip?dl=0
data/system/scenarios/montlake/weekday.bin,7e6bb5d166b96a7d5363be23c19ff6d6,https://www.dropbox.com/s/yntrxxgv3yx75gd/weekday.bin.zip?dl=0
data/system/scenarios/mt_baker/weekday.bin,fa13347a87cfef015592b23f02895bc2,https://www.dropbox.com/s/5e36iyuha2ltyo8/weekday.bin.zip?dl=0
data/system/scenarios/mt_baker/weekday.bin,fe46217e135ae62a377cbb96686af3e6,https://www.dropbox.com/s/5e36iyuha2ltyo8/weekday.bin.zip?dl=0
data/system/scenarios/west_seattle/weekday.bin,d89dc3b36fe7b385ad8c1459e23c68c8,https://www.dropbox.com/s/n8ertmxn05yn0kj/weekday.bin.zip?dl=0

42
game/src/app.rs
View File

@ -88,6 +88,48 @@ impl App {
}
pub fn set_prebaked(&mut self, prebaked: Option<(String, String, Analytics)>) {
self.prebaked = prebaked;
if false {
if let Some((_, _, ref a)) = self.prebaked {
use abstutil::{prettyprint_usize, serialized_size_bytes};
println!(
"- raw_per_road: {} bytes",
prettyprint_usize(serialized_size_bytes(&a.thruput_stats.raw_per_road))
);
println!(
"- raw_per_intersection: {} bytes",
prettyprint_usize(serialized_size_bytes(&a.thruput_stats.raw_per_intersection))
);
println!(
"- bus_arrivals : {} bytes",
prettyprint_usize(serialized_size_bytes(&a.bus_arrivals))
);
println!(
"- bus_passengers_waiting: {} bytes",
prettyprint_usize(serialized_size_bytes(&a.bus_passengers_waiting))
);
println!(
"- started_trips: {} bytes",
prettyprint_usize(serialized_size_bytes(&a.started_trips))
);
println!(
"- finished_trips: {} bytes",
prettyprint_usize(serialized_size_bytes(&a.finished_trips))
);
println!(
"- trip_log: {} bytes",
prettyprint_usize(serialized_size_bytes(&a.trip_log))
);
println!(
"- intersection_delays: {} bytes",
prettyprint_usize(serialized_size_bytes(&a.intersection_delays))
);
println!(
"- parking_spot_changes: {} bytes",
prettyprint_usize(serialized_size_bytes(&a.parking_spot_changes))
);
}
}
}
pub fn switch_map(&mut self, ctx: &mut EventCtx, load: String) {

2
sim/src/analytics.rs
View File

@ -23,7 +23,7 @@ pub struct Analytics {
pub trip_log: Vec<(Time, TripID, Option<PathRequest>, TripPhaseType)>,
pub intersection_delays: BTreeMap<IntersectionID, Vec<(Time, Duration)>>,
// Per parking lane, when does a spot become filled (true) or free (false)
parking_spot_changes: BTreeMap<LaneID, Vec<(Time, bool)>>,
pub parking_spot_changes: BTreeMap<LaneID, Vec<(Time, bool)>>,
pub(crate) alerts: Vec<(Time, AlertLocation, String)>,
// After we restore from a savestate, don't record anything. This is only going to make sense