-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
lad regions #548
Draft
Robinlovelace
wants to merge
48
commits into
main
Choose a base branch
from
lad-regions
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
lad regions #548
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
c19bb40
Update gitignore
Robinlovelace 84396cc
comment-out everything after school routing, for tests
Robinlovelace a4f69ad
Testing pattern in targets
Robinlovelace 087f067
Working dynamic branching (it seems)!
Robinlovelace 0c48176
Dynamic branching for commuting too
Robinlovelace 9759cdf
Add garbage_collection
Robinlovelace cdd03f1
Try lads as regions
Robinlovelace 170b00a
Use point_on_surface to avoid edge case errors with zone selection
Robinlovelace b1bedac
point_on_surface II
Robinlovelace b7f4640
Fixes for LAD builds
Robinlovelace 35b8db4
Use dynamic branching for utility trips
Robinlovelace 3d4bd8b
Demonstrate dynamic branching on list input
Robinlovelace 42126bb
Use local_authority not region in parameters
Robinlovelace bfd33f5
Test tar_make() in for loop
Robinlovelace 985441e
Debug error message related to region type
Robinlovelace 4e43819
Finish debugging, tidy-up in next commit
Robinlovelace 7c95f86
Tidy-up, re-run
Robinlovelace b88f9c3
Update cbd layer for LAD level buid
Robinlovelace cb41b5c
Merge branch 'main' into lad-regions
Robinlovelace 749f3f0
use la_name replace region
wangzhao0217 4af8275
update CN using LA - in halfway
wangzhao0217 3c4c327
update CN
wangzhao0217 33cbdd1
Update route_ids
Robinlovelace 929a223
Minor change to cn code, around line 260 in build.R
Robinlovelace babf03f
Add random wait time
Robinlovelace 24a530e
Merge pull request #552 from nptscot/random-wait-time
wangzhao0217 f17b8de
stop la name change
wangzhao0217 04f3325
La based CN works
wangzhao0217 4d4a360
Test on 2 regions
Robinlovelace b86abdb
Add tests for Edinburgh and Lothians regions
Robinlovelace 564956f
Test for clackmannashire
Robinlovelace 113f0ba
Merge branch 'lad-regions' into la-approach2
Robinlovelace 4bc4efd
Merge pull request #553 from nptscot/la-approach2
Robinlovelace b00c6e6
fix all conflicts
wangzhao0217 a11d050
update route id
wangzhao0217 ee48bd2
fix conflict
wangzhao0217 bae4ce2
update for corenet
wangzhao0217 f127ad8
update R/core_network_link.R
wangzhao0217 71c211e
refine corenet in Build.R
wangzhao0217 4660aff
update cn build for la
wangzhao0217 7eb46f5
get commit from main
wangzhao0217 d77a872
refine targets::tar_make(names = corenetwork)
wangzhao0217 e208886
test for full CN build
wangzhao0217 23a2c2b
fix the bugs in la core network
wangzhao0217 82e7bee
add remove disconnected routes
wangzhao0217 cc2d34a
test on CN combined
wangzhao0217 9753238
remove unused files
wangzhao0217 5acfb96
refine build.R for CN combine
wangzhao0217 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,10 @@ | ||
nrow,plan,purpose,region,date,id | ||
4140,ebike,commute,dumfries_and_galloway,2024-11-31,11332 | ||
987,ebike,school,dumfries_and_galloway,NA,11328 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why the NAs? |
||
987,fastest,school,dumfries_and_galloway,NA,11325 | ||
1789,fastest,utility,clackmannanshire,NA,11324 | ||
1657,balanced,commute,clackmannanshire,NA,11318 | ||
991,quietest,school,clackmannanshire,NA,11316 | ||
100,balanced,utility,city_of_edinburgh,2024-11-30,11014 | ||
100,balanced,commute,city_of_edinburgh,2024-11-30,11011 | ||
100,quietest,school,city_of_edinburgh,2024-11-30,11009 | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍