Commit Graph

511 Commits

Author SHA1 Message Date
Dustin Carlino
73b2d0ac24 ah, was forgeting multiple ped turns in sequence 2018-11-30 08:47:46 -08:00
Dustin Carlino
87a357d67c adjusting pathfinding costs, trying to figure out why walking routes are awful 2018-11-29 16:47:04 -08:00
Dustin Carlino
ecc5a6efb1 make some percentage of walking trips use transit, if it's reasonable.
haven't observed it working yet.
2018-11-29 14:53:11 -08:00
Dustin Carlino
14097bebfc moving BusRouteID to map_model layer from sim 2018-11-29 12:38:06 -08:00
Dustin Carlino
17262063a1 following logic wasn't considering length of lead vehicle properly?
adjusted code a bit, but still seeing a violation
2018-11-28 14:27:12 -08:00
Dustin Carlino
6bdb28cced oops, bike starting at border was using a router to car-style park 2018-11-28 13:53:36 -08:00
Dustin Carlino
211019efd2 no more VanishAtDeadEnd. if it's happening, let's notice it. 2018-11-28 13:42:40 -08:00
Dustin Carlino
34f8e93bad dont need pt_and_angle, just pt of Positions 2018-11-28 13:14:49 -08:00
Dustin Carlino
bdd07a7246 woops, missed a should-be caller of equiv_pos 2018-11-28 13:13:12 -08:00
Dustin Carlino
5c3ca41722 associate buses with trips, so some UI plugins can handle them 2018-11-27 14:33:35 -08:00
Dustin Carlino
c2783ab56e making a new Position tuple and equiv_dist_along 2018-11-27 09:55:37 -08:00
Dustin Carlino
d0beb7f41e simplify get_draw_blah API by just having one call for traversable. simplify inner walking state 2018-11-26 15:53:04 -08:00
Dustin Carlino
cd8d9adec4 radical speedup and simplification to driving state: only store SimQueues for active lanes/turns 2018-11-26 15:40:22 -08:00
Dustin Carlino
f26de57039 revive the other transit test 2018-11-26 14:36:59 -08:00
Dustin Carlino
56c885e7ab revive the first parking test. make helpers to look up labeled stuff from synthetic maps. make helpers to seed specific parked cars and start certain trips again. 2018-11-26 11:22:17 -08:00
Dustin Carlino
6fbb22d9e4 port over the last two tests, partly 2018-11-25 08:57:33 -08:00
Dustin Carlino
cec29beda5 moving two sim tests over to the new runner 2018-11-23 16:11:27 -08:00
Dustin Carlino
fcf7ea161c prototyping a better rust test runner that captures output in files
and prints results nicely
2018-11-23 14:51:14 -08:00
Dustin Carlino
2e8cd7ff7a dont spawn bikes on highway border nodes 2018-11-23 11:03:45 -08:00
Dustin Carlino
9368c42c6e improve error message for cars too close, and add error dumping to headless 2018-11-23 10:03:33 -08:00
Dustin Carlino
b55d609c37 fix a bug where car drives from border to a parking spot 2018-11-23 09:02:09 -08:00
Dustin Carlino
e6b1188874 add some debugging to kinematics and... seemingly solve the
stop-too-late bug, by arbitrarily increasing the time allowed for a
stop.
2018-11-22 19:53:08 -08:00
Dustin Carlino
c808d60fd5 woops, can't just scrape active agents 2018-11-22 14:57:57 -08:00
Dustin Carlino
b2c976b439 make Sim or TimeTravel be able to serve up Draw agents 2018-11-22 14:46:28 -08:00
Dustin Carlino
ced04798b4 basic controls for time travel, showing state in OSD 2018-11-22 11:53:35 -08:00
Dustin Carlino
29e1f3f6c0 starting a plugin to scrape agents... 2018-11-22 11:38:00 -08:00
Dustin Carlino
20b79038f4 dont clone bounds by default 2018-11-21 14:55:26 -08:00
Dustin Carlino
ca95c58b3b fix a path trace bug for paths with one step, but no geometry 2018-11-21 10:00:40 -08:00
Dustin Carlino
f3c76c4416 hack around accel_to_stop_in_dist problem, for now 2018-11-21 09:39:26 -08:00
Dustin Carlino
e2d2660b38 reproducing the bike accel_to_stop problem 2018-11-21 09:35:11 -08:00
Dustin Carlino
b22cfe7c9b gets tests to at least build again, by commenting out some of them 2018-11-20 14:36:11 -08:00
Dustin Carlino
7278719a04 consolidating all of the road query methods 2018-11-20 13:36:10 -08:00
Dustin Carlino
37c5a1ddb5 lookup sidewalk properly when bike reaches end 2018-11-18 19:10:14 -08:00
Dustin Carlino
30a03d3159 fix ped<->bike animation 2018-11-18 17:08:59 -08:00
Dustin Carlino
b618842ad2 WIP woops, found a bug with bike_reached_end 2018-11-18 17:02:30 -08:00
Dustin Carlino
fb298e4706 animate bike parking better 2018-11-18 16:53:11 -08:00
Dustin Carlino
044a25fce2 give up on Sim being Eq; settle for PartialEq, get rid of all of the annoying 'ignore this field' hacks. also getting rid of unnecessary PartialEq impls in map_model 2018-11-18 16:28:43 -08:00
Dustin Carlino
71d4df2e6d save editor view when sim 'gracefully' blows up 2018-11-18 15:16:39 -08:00
Dustin Carlino
99d0d27837 adjust debug logs 2018-11-18 15:03:02 -08:00
Dustin Carlino
a863283571 different parser for ticks from filenames 2018-11-18 14:54:36 -08:00
Dustin Carlino
0df92bab75 debug from the most recent but relevant savestate 2018-11-17 20:10:00 -08:00
Dustin Carlino
889214ccdf splitting off just the scheduling portion of spawn. no more
recalculating paths!
2018-11-17 18:41:53 -08:00
Dustin Carlino
6dbdfcb18b proper enum for vehicle type 2018-11-17 17:38:10 -08:00
Dustin Carlino
343aeba3b6 deleted some aging code only used for tests that definitely needs overhaul anyway 2018-11-17 17:28:19 -08:00
Dustin Carlino
9084f0060b PathRequest instead of massive confusing tuples. also can now use bike lanes from spawn layer 2018-11-17 17:12:03 -08:00
Dustin Carlino
0b53b2e44f make bike from border work by adding a bit in spawn 2018-11-17 07:34:06 -08:00
Dustin Carlino
d7efdfc86d rendering bikes differently 2018-11-16 14:51:41 -08:00
Dustin Carlino
3036511c9e another darn bike/parking lane case, unrelated 2018-11-16 14:34:01 -08:00
Dustin Carlino
1e43f33939 render peds preparing bikes 2018-11-16 14:28:36 -08:00
Dustin Carlino
5db8b4edb6 make finished bikes become peds 2018-11-16 14:14:36 -08:00
Dustin Carlino
b9770dc4bd plumbing through the commands in spawn, finally... 2018-11-16 13:40:14 -08:00
Dustin Carlino
705adfcf08 representing the preparing-to-bike state in walking sim 2018-11-16 12:07:26 -08:00
Dustin Carlino
a2a6b16fdc plumbing biking option from scenario all the way down... incomplete 2018-11-16 11:31:27 -08:00
Dustin Carlino
fb2ec0bcd0 plumbing some bits for bikes 2018-11-16 10:38:05 -08:00
Dustin Carlino
ee9f2a0430 make a vehicle type for bikes and introduce a cap speed 2018-11-16 09:44:04 -08:00
Dustin Carlino
952e97d942 starting to write down an enum for the massive FSM revamp. having more
reservations about going this direction.
2018-11-15 18:58:03 -08:00
Dustin Carlino
febf3a1cad saving and loading synthetic models 2018-11-14 10:54:07 -08:00
Dustin Carlino
88334d50ca WIP rewriting pathfinding natively in terms of PathSteps 2018-11-13 14:06:52 -08:00
Dustin Carlino
a002e034d7 splitting out physics types 2018-11-13 11:48:35 -08:00
Dustin Carlino
6b5a012038 organizing sim drawing things 2018-11-13 11:38:35 -08:00
Dustin Carlino
11c2bbd11e grouping sim query methods 2018-11-13 11:32:17 -08:00
Dustin Carlino
af7785d6a3 always send along CarState in DrawCarInput, removing an annoying query method 2018-11-13 10:57:28 -08:00
Dustin Carlino
b2e3f25393 moving RNG helpers from sim to abstutil 2018-11-13 10:50:54 -08:00
Dustin Carlino
df5a151f8b rearranging some sim code into make/ 2018-11-13 10:39:42 -08:00
Dustin Carlino
ecae90eb8a refactor scenario instantiate 2018-11-13 10:11:32 -08:00
Dustin Carlino
462539b558 spawning cars at a border 2018-11-13 08:50:12 -08:00
Dustin Carlino
62182e6736 make cars end at borders properly by slightly extending the protocol for routers 2018-11-12 21:05:50 -08:00
Dustin Carlino
7214cd43d2 model cars finishing at a border... with a hack. :( 2018-11-12 20:51:13 -08:00
Dustin Carlino
98620ece6b sending some peds to border nodes, testing it 2018-11-12 17:20:09 -08:00
Dustin Carlino
7f62537085 oops. border could have been represented in sidewalkspot. merge the madness. 2018-11-12 17:01:49 -08:00
Dustin Carlino
257d051585 update walking model to handle ending at a border 2018-11-12 16:45:33 -08:00
Dustin Carlino
70c1fae4f1 encoding ability to go to a border node in scenarios 2018-11-12 16:02:14 -08:00
Dustin Carlino
8e7021e958 update walking model to handle starting at a border 2018-11-12 15:34:09 -08:00
Dustin Carlino
0c95122576 encoding spawn-peds-at-border in scenario layer 2018-11-12 14:11:50 -08:00
Dustin Carlino
7cf6aa0eeb new_trip API was needlessly complicated; ditched start/end_bldg 2018-11-12 13:39:26 -08:00
Dustin Carlino
f577cc9948 consolidate the panic/unwind code 2018-11-12 11:20:26 -08:00
Dustin Carlino
474d92f5db modeling border nodes in map, control, sim, editor layers 2018-11-11 14:49:27 -08:00
Dustin Carlino
40cc81ca6f make intersection policies handle one agent with multiple turns 2018-11-10 15:39:02 -08:00
Dustin Carlino
7ddbd753f4 storing neighborhoods as GPS 2018-11-09 14:12:20 -08:00
Dustin Carlino
9ba9acb3d2 modeling bus lanes 2018-11-07 13:50:22 -08:00
Dustin Carlino
c6cd36071c make the large maps still work: fixes to bus route verification and
degenerate stop sign handling
2018-11-06 12:39:27 -08:00
Dustin Carlino
02f24bfe15 removing annoying duplicated fields in Turn 2018-11-06 09:29:50 -08:00
Dustin Carlino
9f0d3b610a introducing TurnType 2018-11-05 18:42:33 -08:00
Dustin Carlino
bd96b4ff5f storing src/dst intersection with Road directly 2018-11-05 17:39:23 -08:00
Dustin Carlino
9cb1337785 starting a rewrite of the code to find turns between sidewalks, based on
road adjacencies. needs a few more intermediate steps.
2018-11-05 17:15:54 -08:00
Dustin Carlino
aa23d76243 simplify API: PathStep is Copy 2018-11-05 14:37:26 -08:00
Dustin Carlino
d69804e485 fixing chokepoints plugin by looking at paths 2018-11-04 15:25:48 -08:00
Dustin Carlino
376f9bd3c5 new, simple implementation of trace_route and lots of deleted old code 2018-11-04 08:27:35 -08:00
Dustin Carlino
df6628e5b5 preps for filling out pathfind impl 2018-11-03 20:57:58 -07:00
Dustin Carlino
d4dc5fc658 percolating changes to sim layer slowly... 2018-11-03 20:46:41 -07:00
Dustin Carlino
58025c027d fixing trace_route with contraflow on last step 2018-11-03 12:29:00 -07:00
Dustin Carlino
6ecfac0bd3 precomputing canonical pt per trip, since so much stuff kinda cares about it 2018-11-01 17:05:15 -07:00
Dustin Carlino
db34ddb2b7 changing the activity plugin to show a heatmap of what's currently in view 2018-11-01 16:07:48 -07:00
Dustin Carlino
b593d3f5cf WIP plugin to highlight lanes with movement 2018-11-01 14:42:43 -07:00
Dustin Carlino
b7e184eeca adjusting scripts to convert OSM polygons 2018-10-29 15:53:04 -07:00
Dustin Carlino
f8f2ea3f95 switching to a simpler GPS<->Pt2D scheme that's bijective 2018-10-29 15:01:15 -07:00
Dustin Carlino
bb9c98b54e splitting into two Bounds types 2018-10-29 14:16:30 -07:00
Dustin Carlino
cc9f0289ab exporting polygons in the osmosis format... wait, may need to change the
coordinate system first. let's first refactor bounds to be more careful
about existing code.
2018-10-29 12:29:11 -07:00
Dustin Carlino
949529b780 adding some initial neighborhood summary for an a/b test 2018-10-29 11:24:01 -07:00
Dustin Carlino
a45521e1a6 using Timer with read_binary 2018-10-28 17:17:35 -07:00
Dustin Carlino
f011f8f56d making hierarchial progress timer to replace flamegraphs. using in many,
but not all, places
2018-10-28 16:40:37 -07:00
Dustin Carlino
15da2fe9cd using quadtrees to MASSIVELY speed up sidewalk matching 2018-10-28 13:59:54 -07:00
Dustin Carlino
45bd7ee128 eliminate bus stops that dont line up with short driving lanes 2018-10-24 14:59:22 -07:00
Dustin Carlino
740597b64f even more convenient debugging, by marking what agent is being processed everywhere 2018-10-24 13:33:07 -07:00
Dustin Carlino
da786f9348 gather initial summary text for neighborhoods 2018-10-23 16:18:33 -07:00
Dustin Carlino
8a474e16b0 how is a car winding up with negative dist_along? argh, another hacky
epsilon fix
2018-10-22 20:03:39 -07:00
Dustin Carlino
9883da6fa8 fix bugs with follow plugin at the end of the trip 2018-10-22 16:32:58 -07:00
Dustin Carlino
ce9b9da5bb bugfix: find driving lane near destination building 2018-10-22 15:40:16 -07:00
Dustin Carlino
bed21cac17 woops, eagerly evaluating tooltip for parked car 2018-10-22 15:09:12 -07:00
Dustin Carlino
9660794467 show route by trip, not agent 2018-10-22 14:39:25 -07:00
Dustin Carlino
b8fa12d0d5 terminating ped trace_route at the right SidewalkSpot 2018-10-22 14:18:25 -07:00
Dustin Carlino
9c1ae28bf8 ped trace_routes were wrong for contraflow steps 2018-10-22 13:16:30 -07:00
Dustin Carlino
a1ac8cf7dd plugin to show diff for all agents 2018-10-22 11:22:16 -07:00
Dustin Carlino
ba3bcb5087 moving precompute binary to its own crate, adding logging 2018-10-21 11:37:30 -07:00
Dustin Carlino
68b0983436 associate the right map+edits with savestates 2018-10-21 11:14:22 -07:00
Dustin Carlino
050a9a1400 load pre-baked maps. now starting an a/b test is very fast! \o/ 2018-10-20 09:18:57 -07:00
Dustin Carlino
66bbdc0362 script to save all the maps with edits. no loading yet 2018-10-20 09:02:44 -07:00
Dustin Carlino
80121df78c rename data/maps to data/raw_maps 2018-10-20 08:25:49 -07:00
Dustin Carlino
5d010d2580 make a/b test work again... neighborhoods can be kind of poorly defined 2018-10-18 15:44:35 -07:00
Dustin Carlino
10a6ee09d1 debugging why we wound up with disconnected roads, breaking parking seeding... ah, there are roads in the neighborhood without any buildings 2018-10-18 13:57:38 -07:00
Dustin Carlino
bb21c45394 weighted choice for how many cars per building 2018-10-17 16:22:33 -07:00
Dustin Carlino
ec49d2dd20 fix problem with trace_route requesting invalid start dist 2018-10-17 15:27:38 -07:00
Dustin Carlino
452677672f savestate at the end of the step 2018-10-17 15:07:26 -07:00
Dustin Carlino
3968a78166 only allow interactive spawning at the beginning 2018-10-17 15:01:36 -07:00
Dustin Carlino
d897ebfd4b fixing up broken tests... at least making them build :\ 2018-10-17 13:42:07 -07:00
Dustin Carlino
d02c5004f9 clean up Pt2D::from_gps API 2018-10-17 13:14:10 -07:00
Dustin Carlino
b25046bd67 removing old, weird controls for interactively spawning stuff in the UI 2018-10-17 13:06:40 -07:00
Dustin Carlino
fade0f8883 UI plugin to show parked car / building associations 2018-10-17 12:29:46 -07:00
Dustin Carlino
24edfcd784 place parked cars close to buildings, in a stable way 2018-10-17 11:49:15 -07:00
Dustin Carlino
98914ce208 peds only use the car associated with their building 2018-10-17 10:34:02 -07:00
Dustin Carlino
0d33a25d44 calm down DiffWorlds, not every agent has a trip -- buses and parked cars, namely 2018-10-17 10:10:22 -07:00
Dustin Carlino
299c7bdb2f seed parked cars per building, not per spot 2018-10-17 10:01:33 -07:00
Dustin Carlino
7919b0bd8d associating cars with an owner 2018-10-16 17:28:03 -07:00
Dustin Carlino
2c110a58f9 starting a very basic plugin to show differences between trips in parallel worlds 2018-10-16 14:48:41 -07:00
Dustin Carlino
41817d3e91 oops, nonsense option to start moving cars 2018-10-16 12:15:02 -07:00
Dustin Carlino
9400e3d010 refactor: hardcode concrete rng type, remove annoying generic 2018-10-16 12:00:20 -07:00
Dustin Carlino
14c341d86a shuffle parked cars to use without offsetting the RNG 2018-10-16 11:50:16 -07:00
Dustin Carlino
77786c9483 forking RNGs to keep SeedParking consistent 2018-10-16 11:39:16 -07:00
Dustin Carlino
bc48b3189f generate trips to spawn before seeding parking spots, to make trip IDs line up better... 2018-10-14 18:53:39 -07:00
Dustin Carlino
022b78ca34 associate trips with peds and cars more easily 2018-10-14 14:10:46 -07:00
Dustin Carlino
80f6eb95b4 brainstorming edit-invariant trips. initial work to reference TripIDs,
which are independent of mode.
2018-10-14 14:01:03 -07:00
Dustin Carlino
19bcf0199e update map paths in tests 2018-10-13 17:43:52 -07:00
Dustin Carlino
90af8a84c6 woops, car pathfinding shouldnt use bike lanes. and A/B test manager
should set json filename
2018-10-13 16:34:02 -07:00
Dustin Carlino
25a1beba4e generalize traces a bit to handle 0-length turns properly 2018-10-13 16:05:52 -07:00
Dustin Carlino
e4dc075871 WIP trying to solve problem of driving traces not matching up sometimes 2018-10-13 15:41:40 -07:00
Dustin Carlino
f7f9b5ab70 plugin to find and show chokepoints 2018-10-13 15:24:14 -07:00
Dustin Carlino
99559fa578 also retain the logical pieces of a Trace, so we can next find chokepoints 2018-10-13 11:27:22 -07:00
Dustin Carlino
37173fc72c dont savestate at 0s 2018-10-10 16:31:16 -07:00
Dustin Carlino
792c25b40b removing failure crate in sim too 2018-10-10 16:29:43 -07:00
Dustin Carlino
843742b708 adding error messages for map model queries that can fail 2018-10-10 15:58:00 -07:00