Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BayDAG All Contributions #834

Merged
merged 33 commits into from
Apr 19, 2024
Merged

BayDAG All Contributions #834

merged 33 commits into from
Apr 19, 2024

Conversation

dhensle
Copy link
Contributor

@dhensle dhensle commented Mar 19, 2024

One master PR that merges in the other BayDAG pull requests. Used to test the SANDAG ABM3 example.

dhensle and others added 29 commits March 6, 2024 14:53
@dhensle
get all disaggregate accessibility values
ea25a66
@dhensle
updated settings to work with Pydantic
1670dc9
@dhensle
Squashed commit of the following:
20ced19 
commit 1670dc9
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 15:53:37 2024 -0800

    updated settings to work with Pydantic

commit ea25a66
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 16:30:41 2023 -0800

    get all disaggregate accessibility values
@dhensle
Squashed commit of the following:
b8d3a95 
commit d05f77c
Author: David Hensle <hensle93@gmail.com>
Date:   Mon Mar 11 15:00:28 2024 -0700

    fixing person_rank call

commit f252006
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 16:35:37 2023 -0800

    CDAP estimation with joint component
@dhensle
Squashed commit of the following:
0a91e3a 
commit 90b0b8c
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 14:05:43 2024 -0800

    Only want joint tours for joint tour dest model -- got dropped in rebase
@dhensle
Squashed commit of the following:
1537b50 
commit 807b0af
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 16:40:26 2023 -0800

    Alt name for jtfc estimation mode
@dhensle
Squashed commit of the following:
065307a 
commit 5518ca4
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 16:41:59 2023 -0800

    error out of infinite loop
@dhensle
Squashed commit of the following:
fdf8c86 
commit 0e6919b
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 13:23:13 2024 -0800

    blacken

commit 8071068
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 16:59:32 2023 -0800

    sampling in EDB for location choice

commit 150d593
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 16:59:32 2023 -0800

    sampling in EDB for location choice
@dhensle
Squashed commit of the following:
2fd3233 
commit 48be6f4
Author: David Hensle <hensle93@gmail.com>
Date:   Thu Mar 7 13:56:38 2024 -0800

    replace orca inject with state object

commit 4201d36
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:44:06 2023 -0800

    landuse available in trip destination

commit 0630659
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:02:59 2023 -0800

    landuse and reindex in loc choice
@dhensle
Squashed commit of the following:
fa9d400 
commit d1f4db8
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 15:09:38 2024 -0800

    call ALT_DEST_COL_NAME as attribute

commit fe0c284
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 14:11:35 2024 -0800

    fix Nones to None typo

commit b955295
Author: David Hensle <hensle93@gmail.com>
Date:   Mon Dec 18 11:56:54 2023 -0800

    blacken

commit cdcca91
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:12:02 2023 -0800

    mode choice logsum extraction
@dhensle
Squashed commit of the following:
f869669 
commit 504b974
Merge: ac69af8 a40fa16
Author: David Hensle <hensle93@gmail.com>
Date:   Mon Mar 18 09:21:05 2024 -0700

    Merge branch 'BayDAG_cont10_nmtf_avail_time_windows' of https://github.com/SANDAG/activitysim into BayDAG_cont10_nmtf_avail_time_windows

commit ac69af8
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 14:15:31 2024 -0800

    remove bad path to annotate.py

commit a40fa16
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 14:15:31 2024 -0800

    remove bad path to annotate.py

commit 5a54dc5
Merge: 481238b 79980b8
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 13:38:45 2024 -0800

    Merge branch 'BayDAG_cont10_nmtf_avail_time_windows' of https://github.com/SANDAG/activitysim into BayDAG_cont10_nmtf_avail_time_windows

commit 481238b
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 13:37:37 2024 -0800

    blacken

commit 3aa3f46
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:16:51 2023 -0800

    NMTF person available periods

commit 79980b8
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:16:51 2023 -0800

    NMTF person available periods
@dhensle
Squashed commit of the following:
aa1f94a 
commit c439405
Author: David Hensle <hensle93@gmail.com>
Date:   Mon Mar 18 10:05:23 2024 -0700

    blacken

commit d9392f3
Author: David Hensle <hensle93@gmail.com>
Date:   Mon Mar 18 09:33:09 2024 -0700

    adding missed columns necessary for no school escorting

commit 4470dd4
Author: David Hensle <hensle93@gmail.com>
Date:   Mon Mar 11 14:10:42 2024 -0700

    updating to work with Pydantic and State object

commit cf0a663
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Mar 8 13:48:42 2024 -0800

    blacken

commit 5c1524f
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:42:15 2023 -0800

    School escorting estimation updates

    Most changes are needed to avoid crash if estimation run actually had no school escorting in the input data
@dhensle
Squashed commit of the following:
6161fa9 
commit f30a9ea
Author: David Hensle <hensle93@gmail.com>
Date:   Tue Mar 12 10:28:11 2024 -0700

    settings in write_omnibus_table

commit e8144af
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:59:19 2023 -0800

    comments allowed in stop freq spec

commit ece02a8
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:53:12 2023 -0800

    estimation mode usability
@dhensle
Squashed commit of the following:
287add0 
commit 74212e4
Author: David Hensle <hensle93@gmail.com>
Date:   Tue Mar 12 14:56:17 2024 -0700

    nmtf larch av arg

commit 6a3a332
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:54:47 2023 -0800

    decrease larch load time for nmtf
@dhensle
Squashed commit of the following:
a580d00 
commit 2b248ce
Author: David Hensle <hensle93@gmail.com>
Date:   Mon Dec 18 13:13:23 2023 -0800

    blacken

commit d8af5b8
Author: David Hensle <hensle93@gmail.com>
Date:   Fri Dec 15 17:58:28 2023 -0800

    adding calls to larch for new simple simulate models
@dhensle
KEEP_COLS setting
c6803bf
@dhensle
Merge branch 'BayDAG_cont2_disaggregate_accessibility' into BayDAG_al…
67f2756 
…l_contributions
@dhensle
working with sandag abm3 example
cbdd1ef
@dhensle
adding required settings in cdap test
9c550e4
@dhensle
Default value for KEEP_COLS
f7859b6
@dhensle
Merge branch 'main' into BayDAG_all_contributions
867914b
@dhensle
parking locations in write trip matrices
f728984
@dhensle
Merge branch 'BayDAG_cont16_parking_locations' into BayDAG_all_contri…
e43d8c4 
…butions
@dhensle
avoiding NaN in transit_pass_subsidy result
37ccd45
@dhensle
fix bug in which joint utilities not in probabilities cdap
a7cd427
@dhensle
putting origin and destination rewrite in correct location
249a11a
@dhensle
Merge branch 'BayDAG_cont16_parking_locations' into BayDAG_all_contri…
be5f0ee 
…butions
@dhensle
blacken
d32324a
@dhensle
Merge branch 'main' into BayDAG_all_contributions
0859893
@dhensle dhensle marked this pull request as ready for review April 4, 2024 04:51
jpn--
jpn-- reviewed Apr 18, 2024
View reviewed changes
Copy link
Member

@jpn-- jpn-- left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one minor change (and updating to clear the very simple conflicts against now-current main), then this looks clear to merge.

activitysim/abm/models/auto_ownership.py
@@ -36,6 +36,7 @@ def auto_ownership_simulate(
state: workflow.State,
households: pd.DataFrame,
households_merged: pd.DataFrame,
persons_merged: pd.DataFrame,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like persons_merged isn't used in auto ownership, why are we adding it here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is actually used in the preprocessor settings in SANDAG's ABM3 here. The issue is that the persons_merged table needs to include the disaggregate accessibility outputs. Including the persons_merged table here in the call forces the person_merged table to be re-merged to include the disaggregate accessibility columns. This wouldn't ordinarily be needed, but for ABM3 the auto_ownership model is the first model in the list so the persons_merged table wasn't yet updated.

I am open to a different solution here if you have a better way to handle this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just add a comment in the code next to it that it's needed in the args list for the side effects?

I'm not a fan of the whole side effects system, but I don't have a better solution here that's easy.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made issue #853 and referenced it in the code comment.

@dhensle dhensle mentioned this pull request Apr 18, 2024
Open
@jpn-- jpn-- merged commit 8e1fbcd into ActivitySim:main Apr 19, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpn-- jpn-- jpn-- left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dhensle @jpn--