a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-28 08:53:26 +03:00
Code Issues Projects Releases Wiki Activity
4,191 Commits 85 Branches 166 Tags 395 MiB
be3b93625d
Commit Graph

1049 Commits

Author SHA1 Message Date
Dustin Carlino
e2cbb7a3e4 enable the new gridlock cycle breaker by default; it's helping immensely and doesnt seem to have problems 2020-04-27 11:18:36 -07:00
Dustin Carlino
77918358f1 restore the commute challenges [rebuild] 2020-04-26 14:05:00 -07:00
Dustin Carlino
193ff2344a require a particular directed road for spawning from borders 2020-04-26 12:35:07 -07:00
Dustin Carlino
0eaf33ff46 stop generating RNGs from entropy. use the prebaked seed by default. allow explicitly changing the rng, but no use for that yet 2020-04-26 11:38:32 -07:00
Dustin Carlino
3f48b4bf22 simplify stuff in analytics, removing a major bottleneck in the everyone_weekday scenario 2020-04-25 21:42:29 -07:00
Dustin Carlino
1ecea0a88f delete old code for scoring things in currently inactive challenge 
modes. counting ongoing trips is complicated from a player perspective
and also expensive in analytics. has the nice side-effect of forcing me
to make one of the tutorial levels more robust
 2020-04-25 21:29:48 -07:00
Dustin Carlino
275d1f846b make remote trips work properly. plumb through events for them. 2020-04-25 16:47:32 -07:00
Dustin Carlino
725e9e4532 generate a scenario purely with off-map trips. problems running it, but 
good start.
 2020-04-25 15:18:27 -07:00
Dustin Carlino
2c774224ce ahhh the free offstreet spots were not being generated at ALL correctly 2020-04-25 12:54:51 -07:00
Dustin Carlino
2b0a1c2447 parked cars and info panels: center on them, be explicit about being 
parked inside, list owned vehicles better, say how many spots are free
 2020-04-25 12:15:49 -07:00
Dustin Carlino
3ee2c91a10 plumb OffMapLocation through events 2020-04-24 23:07:13 -07:00
Dustin Carlino
34c61ce007 plumb OffMapLocation a little further into the sim. give the player a 
little info about off-map locations.
 2020-04-24 22:41:51 -07:00
Dustin Carlino
dd1c9f936d plumb through exact off-map locations from popdat->scenario 2020-04-24 22:05:33 -07:00
Dustin Carlino
55e0d2a364 overhauling offstreet parking model: 
- almost all buildings can have a few spots
- render things a little differently
- increase paranoia of buildings that can have driveways, to avoid many
complicated simulation issues
 2020-04-24 12:50:22 -07:00
Dustin Carlino
855bba7cc8 more alert locations. use to easily jump to cars entering/exiting 
parking inside buildings.
 2020-04-23 20:23:39 -07:00
Dustin Carlino
597ee6c47e use Event::Alert instead of random println's, and make better controls for handling these 2020-04-23 16:09:32 -07:00
Dustin Carlino
cce4fbe80d do a little more cleanup when trips are aborted 2020-04-23 14:27:25 -07:00
Dustin Carlino
a25751ea43 add more sanity checks for schedules, because every other map is 
crashing

and fix the problem -- SpawnTrip -> TripSpec MUST succeed. auto-abort
some trips, to still warp the person to the right spot.
 2020-04-23 13:20:25 -07:00
Dustin Carlino
6594de3000 remove a hack from multi-day trips and stumble upon the people needing 
10 cars

also prebake data again
 2020-04-23 12:37:21 -07:00
Dustin Carlino
6e31eb76e4 one person might need multiple cars. urgh. 
marathon of a change. it... seems correct.
 2020-04-23 11:50:06 -07:00
Dustin Carlino
51dbc90ae7 prevent a race with two trips starting. temporarily patch around the 
doppel-car problem in a consistent way
 2020-04-22 21:50:08 -07:00
Dustin Carlino
11d106e26a associate vehicles with people, not trips 2020-04-22 19:57:25 -07:00
Dustin Carlino
e1d34558b7 associate ped speed with people, not trips. remove redundant gunk from 
some of the triplegs and specs and such
 2020-04-22 18:53:13 -07:00
Dustin Carlino
9c4798a694 enforce person-continuity in pandemic sim 2020-04-22 16:52:23 -07:00
Dustin Carlino
36ed6395e6 some fixes for interactively spawned agents. merge back into master!!! 2020-04-22 16:34:26 -07:00
Dustin Carlino
c4c61cf7d9 recording and communicating delayed starts 2020-04-22 16:16:17 -07:00
Dustin Carlino
cb053baf49 remove the unused code to cancel future trips. need to think through exactly how this should work. 2020-04-22 15:32:16 -07:00
Dustin Carlino
0657469b4a warp the car to the destination for aborted trips 2020-04-22 15:25:38 -07:00
Dustin Carlino
6ef3a180a3 start to simplify the dynamic nabbing of parked cars 2020-04-22 14:39:02 -07:00
Dustin Carlino
1dcdec0a43 when a trip is aborted, warp the person to their destination. get rid of the concept of Limbo. 
except for aborted trips (which warp the person to their destination),
people now have continuity! </end breakage>
 2020-04-22 13:27:33 -07:00
Dustin Carlino
00c8d65b60 dont start trips if the person isnt finished with the last trip. start 
the delayed trip as soon as the person is freed up.
 2020-04-22 12:13:10 -07:00
Dustin Carlino
ede4c682f4 adding a new layer of indirection to defer spawning peds/cars, and 
instead just start trips
 2020-04-22 11:34:32 -07:00
Dustin Carlino
2a98f4ea27 Person now has a fixed pedestrian, car, and bike ID. <start massive breakage> 2020-04-22 09:43:03 -07:00
Dustin Carlino
22a83184fb spawner asks for agent IDs from trips, instead of computing itself 2020-04-22 08:47:59 -07:00
Dustin Carlino
7ac8c00c5d trivial cleanup: UsingParkedCar is unused 2020-04-22 08:23:43 -07:00
Dustin Carlino
1d8ee5f2a5 slightly improve the blocked_by internals 2020-04-21 16:15:08 -07:00
Dustin Carlino
90b2ce9b1f trim last steps of a laggy head. don't insist on all-or-nothing. makes 
progress towards eliminating bad gridlock
 2020-04-21 15:06:38 -07:00
Dustin Carlino
c7e14a78fc delete the clear_laggy_head_early experiment. i think i understand the real problem, and this makes the next change harder. 2020-04-21 13:42:09 -07:00
Dustin Carlino
ca03d92a01 improve the gridlock buster. get rid of false positives from failing to 
dedupe requests, and only trigger for cycles involving the original
agent
 2020-04-21 13:29:39 -07:00
Dustin Carlino
067cc5b307 plumb through alerts from the sim that pause the UI, use for gridlock 2020-04-21 12:17:01 -07:00
Dustin Carlino
09e9e52042 starting an idea to allow conflicting turns when there's a cycle. bad 
implementation and not working yet, but flagged off
 2020-04-21 11:32:22 -07:00
Dustin Carlino
a39d19f36a remove the tiny fraction of people with non-continuous schedules from 
the PSRC scenarios
 2020-04-20 17:55:26 -07:00
Dustin Carlino
0574d4316c add some stuff to match people in scenarios with the raw input 2020-04-20 16:52:54 -07:00
Dustin Carlino
8b975f5083 validation was wrong, and also panicking is bad right now 2020-04-20 16:12:09 -07:00
Dustin Carlino
c89a4c6bb9 validate scenarios are continuous. they... aren't, so disable the 
validation. :P
 2020-04-20 15:32:31 -07:00
Dustin Carlino
40eed3f116 show parking utilization of a single lane over time 2020-04-20 11:30:19 -07:00
Dustin Carlino
50cca5ce5e when clicking on a building, show the "closest" parking spot 2020-04-20 10:51:18 -07:00
Dustin Carlino
5cf0b72bac avoid a few crashes, mostly involving trips that were aborted in the 
baseline
 2020-04-19 12:40:21 -07:00
Dustin Carlino
d80513235d defer choosing a starting lane for borders in scenarios, to respond to lane edits 2020-04-19 10:51:23 -07:00
Dustin Carlino
6c75a67050 draw some arrows [rebuild] 2020-04-16 19:31:50 -07:00
Dustin Carlino
14b38f917e add a link from person->their parked car, and show the percentage of 
population with a car
 2020-04-16 13:19:17 -07:00
Dustin Carlino
ec409742e7 work around parking leak for multi-day scenarios 2020-04-15 16:36:56 -07:00
Dustin Carlino
97d31fe682 remove the fixed end-of-day; make it easier to jump to times in multi-day scenarios 2020-04-15 16:26:01 -07:00
Dustin Carlino
a104088ccd pt2: rest of sim layer, which forces the UI changes too 2020-04-15 15:48:16 -07:00
Dustin Carlino
35c193eebc associated parked cars with people, not buildings 
pt1: scenario layer
 2020-04-15 15:01:49 -07:00
Dustin Carlino
b7be5aa804 filter trip summaries by modes, better scatter plot tooltip 2020-04-15 13:41:16 -07:00
Dustin Carlino
bde09a08e4 scatter plot: move to ezgui, add a grid, interactive cursor 2020-04-14 12:50:16 -07:00
Dustin Carlino
bf2f2eccfd monochrome scale for delay, and more info on the bike lane layer 2020-04-13 15:30:56 -07:00
Dustin Carlino
97a2434e1b work around infinite cycle of laggy heads. #30 2020-04-12 15:54:46 -07:00
Dustin Carlino
aa765f70ed cargo +nightly fmt 2020-04-11 19:07:48 -07:00
Orestis
c811c7e044
New state-machine-like pandemicmodel (#47) 
* started porting to new algo. init done

* continuing adaptation

* conitnuing the work

* added state machine model. needs testing now

* updated pèandemic model with state machine

* removed mod

* removed warnings

* added dead

* removed useless stuff

* adapted game too
 2020-04-11 19:06:29 -07:00
Dustin Carlino
b7eda16443 move experimental stuff off the trip results page. start deleting old 
dashboard stuff.
 2020-04-11 14:58:40 -07:00
Dustin Carlino
ddd98d315e remove the old trip histogram, make room for cleaning it up 2020-04-10 12:15:24 -07:00
Dustin Carlino
69a8b88583 experimenting with new summaries of trip diffs 2020-04-10 11:44:47 -07:00
Dustin Carlino
bced89ce85 less dumb choices for nearest parking spot, ordering by distance and not number of lanes 2020-04-09 14:20:12 -07:00
Dustin Carlino
ff093e79f4 pick the closest parked car when dynamically reserving 2020-04-09 14:02:56 -07:00
Dustin Carlino
ff68a77979 have to fork rng again to prevent ped speeds from changing. wow. 2020-04-09 13:02:10 -07:00
Dustin Carlino
a1b24b1a29 wire in info on commuter's trips 2020-04-08 18:26:59 -07:00
Dustin Carlino
3e49134088 track blocked time for finished trips, make a way to find people with 
high blocked times
 2020-04-08 15:50:25 -07:00
Dustin Carlino
7e07448098 in trip panels, show comparison to trip time in baseline 2020-04-08 12:33:15 -07:00
Dustin Carlino
9591699463 start working on cancelling future trips. uncovered a few bugs, but this 
is a step forwards
 2020-04-08 10:38:26 -07:00
Dustin Carlino
22ea48a355 repeat a weekday scenario many times to experiment with longer-term pandemic modelling 2020-04-06 15:20:29 -07:00
Dustin Carlino
3e462cda90 cargo fmt, mostly just to trigger [rebuild] 2020-04-05 18:20:19 -07:00
Orestis
ec29ade70e
Pandemic modeling (#46) 
* i think I managed to add a field that analyses who stands at a bus stop

* draining the people at waiting a bus stop in analytics and resturning the stopid, pedestrianid and times of arrival and leave

* trying to add sccache to see if it speeds up the compil

* small update

* need libm to have the erf function

* added pandemic stuff

* must check probabilities bug with them

* removed explicit sane state and refactored probas to correct bug. looks to be working. added info about pandemic situation

* moved the code of transition E/I/R

* i think its working now. every time we check for a dt around t0 + tinf

* updated value

* removed warning from mutable_borrow_reservation_conflict

* updated comments

* started adpting code

* refactoring models

* game compiles. must still adapt overla

* corrected bug

* added count of different catergories of people

* added quarantined state to see how it work but nothing implemented yet. trying to generalize a bit parameters

* made the model a bit more generic. not there yet though

* corrected bug

* rustfmt

* Update game/src/common/overlays.rs

Co-Authored-By: Dustin Carlino <dabreegster@gmail.com>

* Update sim/src/pmodel/mod.rs

Co-Authored-By: Dustin Carlino <dabreegster@gmail.com>

* Update sim/src/pandemic.rs

Co-Authored-By: Dustin Carlino <dabreegster@gmail.com>

* corrected compilation error. and bug

* modified the dir structure

Co-authored-by: Dustin Carlino <dabreegster@gmail.com>
 2020-04-05 13:41:37 -07:00
Dustin Carlino
2ef76b5e7c generate nicer active agent area diagram, use in jump-to-time 2020-04-05 13:10:31 -07:00
Dustin Carlino
2d4095fd8d except for layout/style, I think the trip/agent panels now have the 
right information
 2020-04-03 13:02:23 -07:00
Dustin Carlino
88bad05d39 clean up agent properties. lots of tweaks needed, but i'm exhausted 2020-04-02 21:36:19 -07:00
Dustin Carlino
51a81fc74d handle people being in the same building, bus stop, and bus in one 
uniform way. also the first unit tests in an amusingly long time
 2020-04-02 16:08:20 -07:00
Dustin Carlino
29c86d656d plumb more info in sim events. this will allow for some consolidated pandemic modeling 2020-04-02 15:12:46 -07:00
Dustin Carlino
c12775e5ea change the pandemic model to be a first-class, optional part of Sim 2020-04-02 14:30:18 -07:00
Dustin Carlino
1e63078096 pandemic model ideas: 
- use a priority queue to handle events more sanely
- seed with all people
 2020-04-02 13:38:14 -07:00
Dustin Carlino
ef90c6935c use the locate header button to follow/unfollow people 2020-04-01 15:50:11 -07:00
Dustin Carlino
70875d104d Scenario should just have specific trips. split a different structure for generating Scenarios. has the happy side effect of removing lots of weird old spawning code, duplicated checks 2020-04-01 13:50:36 -07:00
Dustin Carlino
62b49ad884 refactor: properly generic histogram, and remove unnecessary boilerplate 
from Plot. Rust generics are so awesome.
 2020-03-31 20:57:50 -07:00
Dustin Carlino
2181d8a56d two sanity refactors 
- btreeset macro
- switch to "ID #123" by default
 2020-03-31 16:40:07 -07:00
Dustin Carlino
f733763f73 get trip panel closer to the new design. start trying to use fixed size 
panels [rebuild]
 2020-03-31 15:46:46 -07:00
Dustin Carlino
c49fc20a88 checkbox to toggle running the pandemic model in the population map 2020-03-31 10:33:59 -07:00
Dustin Carlino
b16aceaa9a be more precise with building entry/exit events. they can also happen when a car parks inside a building's garage. also emit events at the start of day to get rid of the weird initial case. 2020-03-30 22:31:36 -07:00
Dustin Carlino
7f35d06c96 prototyping an example of finding overlapping time indoors by "infected" 
agents
 2020-03-30 22:12:48 -07:00
Dustin Carlino
5bb5e70000 plumb PersonID in some events, to make it easier to do analysis about people spending time indoors 2020-03-30 09:36:02 -07:00
Dustin Carlino
fff8c8ae9d try a huge cutover to the new info panel organization. few implemented, 
going to do this in another branch
 2020-03-27 10:37:26 -07:00
Dustin Carlino
ce180f7228 merge TripStart and TripEnd 2020-03-25 13:42:33 -07:00
Dustin Carlino
f89fcb9b93 stop associating trips with buses. it makes no sense. 2020-03-25 13:18:16 -07:00
Dustin Carlino
0bed515bc6 more info about inactive trips 2020-03-25 12:22:19 -07:00
Dustin Carlino
dad4c9bef2 more fluidly glue together agents, trips, people 2020-03-24 22:47:06 -07:00
Dustin Carlino
e22727ee98 reorganizing info panel code, splitting into modules 2020-03-23 14:25:16 -07:00
Dustin Carlino
4df64b4c83 remove last users of ModalMenu. so long, (some variant of) the original widget. 2020-03-22 20:59:44 -07:00
Dustin Carlino
d7886fa85b move person counters to population panel 2020-03-22 10:34:32 -07:00
Dustin Carlino
3045f99266 stop plumbing back unused agent metadata from sim, now that ACS is gone 2020-03-21 13:13:46 -07:00
Dustin Carlino
760ee795e7 scrap intersection delay, make a new road-or-intersection delay, based just on waiting turns 2020-03-19 08:34:02 -07:00