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

Enable dr #109

Closed
wants to merge 793 commits into from
Closed

Enable dr #109

wants to merge 793 commits into from

Conversation

theocharides
Copy link
Contributor

No description provided.

theocharides and others added 30 commits June 10, 2020 16:19
@theocharides
add DBP Crossing logsums
458468c 
Logsums from:
- 2050_TM152_DBP_PlusCrossing_02
- 2035_TM152_DBP_Plus_02
@theocharides
update config with new logsums
5c9ce82
@theocharides
Merge pull request #161 from BayAreaMetro/add_logsums
aebdfda 
Add s23 logsums
@akselx
add output processing notebook, r script
3287fd8
@theocharides
add new hh reloc fiiles for db
22349a1
@theocharides
update hh reloc file selection
aeb0473
@theocharides
add new hh reloc files to config
e82fe01
@theocharides
Merge branch 'test-run-staging' into hh_reloc_re-branch
2a61b44
@theocharides
Merge pull request #164 from BayAreaMetro/hh_reloc_re-branch
0d86412 
Hh reloc by Bobby re-branched to fix
@theocharides
move reloc files to correct location
14b92f8
@theocharides
remove reloc files from incorrect loc
f86958e
@theocharides
undo accidental config changes
f7c63b0
@theocharides
Merge pull request #165 from BayAreaMetro/hh_reloc_re-branch
e2b13cf 
move hh reloc files to correct location
@theocharides
Revert "Merge pull request #161 from BayAreaMetro/add_logsums"
808d2f9 
This reverts commit aebdfda, reversing
changes made to 2316b58.
@theocharides
uppdate dev proj
6c90338 
from commit https://github.com/BayAreaMetro/urban_data_internal/commit/0f63db5eb38a22882fe1c23a24463e275ad28cde
@theocharides
Merge pull request #166 from BayAreaMetro/update_devproj_list
1086bf2 
uppdate dev proj
@theocharides
add dev proj version to config
a4ac354
@theocharides
Merge pull request #167 from BayAreaMetro/update_devproj_list
e898ef6 
add dev proj version to config
@theocharides
Revert "Revert "Merge pull request #161 from BayAreaMetro/add_logsums""
0e6dfd9 
This reverts commit 808d2f9.
@theocharides
Revert "Merge pull request #165 from BayAreaMetro/hh_reloc_re-branch"
179f417 
This reverts commit e2b13cf, reversing
changes made to 0d86412.
@theocharides
Revert "Merge pull request #164 from BayAreaMetro/hh_reloc_re-branch"
e767443 
This reverts commit 0d86412, reversing
changes made to aebdfda.
@theocharides
Merge branch 'preprocfix' into test-run-staging
54396f8
@theocharides
Merge branch 'preproc' into test-run-staging
fbc6437
@theocharides
Merge pull request #158 from BayAreaMetro/pba50_fund_affordable_housi…
0c3098f 
…ng_db

Pba50 fund affordable housing db - new branch to try to avoid merging errors
@theocharides
Merge branch 'test-run-staging' of https://github.com/BayAreaMetro/ba…
6e8b39b 
…yarea_urbansim into test-run-staging
@theocharides
Merge branch 'test-run-staging' of https://github.com/BayAreaMetro/ba…
c986aaf 
…yarea_urbansim into test-run-staging
@theocharides
Revert "Merge pull request #158 from BayAreaMetro/pba50_fund_affordab…
cfc6d09 
…le_housing_db"

This reverts commit 0c3098f, reversing
changes made to 0e6dfd9.
@theocharides
Merge branch 'test-run-staging' of https://github.com/BayAreaMetro/ba…
c453204 
…yarea_urbansim into test-run-staging
@theocharides
Revert "Revert "Merge pull request #158 from BayAreaMetro/pba50_fund_…
f0db6b9 
…affordable_housing_db""

This reverts commit cfc6d09.
@theocharides
fix indentation
2e15a9d
theocharides and others added 29 commits August 17, 2020 12:53
@theocharides
Merge branch 'develop' into county_numbering_fix
10f6af2
@yuqiww
Merge branch 'develop' into fix_typo
e29b4eb
@yuqiww
fix typo
7062d8a
@yuqiww
fix pep8
d90e668
@yuqiww
fix pep8
6bfb6e6
@theocharides
Merge branch 'develop' into use_full_jurisdiction_name
4c6e737
@theocharides
Merge pull request #203 from BayAreaMetro/use_full_jurisdiction_name
6db1192 
Use full jurisdiction name
@theocharides
Merge pull request #207 from BayAreaMetro/fix_typo
43098dd 
Fix typo
@bobbylu
Merge branch 'add_zoningmod_parcel_output' into develop
1754963
@bobbylu
pep8 fix
67831a4
@bobbylu
pep8 fix more
40a4d6e
@theocharides
Merge pull request #206 from BayAreaMetro/add_zoningmod_parcel_output
f25cd49 
adding zoningmod column to parcel data output
@theocharides
Merge pull request #204 from BayAreaMetro/county_numbering_fix
18b5489 
County numbering fix
@bobbylu
Merge pull request #205 from BayAreaMetro/add_dp_output
2869f58 
add a source column to the buildings table
@theocharides
add overfull to topsheet
6186326
@theocharides
Merge remote-tracking branch 'origin' into develop
5545fda
@theocharides
first approach to adding slack messages
e5eef0c
@theocharides
approach 2: slack updates for mid sim
016fb1b
@theocharides
add slack notifications for dev proj
63b833c
@theocharides
make sure slack and maps only run in simulation
c899265
@theocharides
sim back to 2050
bd33e16
@theocharides
fix warning to use string for host
6ffdc01
@theocharides
correct var name
780f0a9
@bobbylu
Merge pull request #210 from BayAreaMetro/add_to_slack
5efe6e9 
Add to slack
@theocharides
pep8
45929a9
@bobbylu
Merge pull request #209 from BayAreaMetro/add_overfull_info
240a57b 
Reviewed. Makes sense.
@theocharides
add low income models
a7b3364
@theocharides
Merge branch 'develop' into enable_dr
12c52f6
@theocharides
add vacant res to buildings output
69c34e9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@theocharides @bobbylu @mkreilly @yuqiww @akselx @lmz