-
Notifications
You must be signed in to change notification settings - Fork 24
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
Multi mode clean #20
Open
Xuan-1998
wants to merge
44
commits into
communication-edit
Choose a base branch
from
multi-mode-clean
base: communication-edit
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.
Open
Multi mode clean #20
Changes from 38 commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
10e5c4a
change innpt and .ini file
926b41a
simple read of bus file
b8bf97b
add merge path in TrafficSP file (step3)
ea13648
change od_pairs to od_pairs_set
9695014
success in compling
SLZ0106 071a8b7
Merge remote-tracking branch 'origin/communication-edit' into multi-m…
SLZ0106 5f673ab
Add multi-mode transfer logic in kernel_trafficSimulation func, add L…
SLZ0106 682eab0
fix some error
SLZ0106 5b46eea
fix TODO
SLZ0106 fc228d4
complete the multimode logic in transfer people to new auto & update …
SLZ0106 13ef4c5
add bus line and how to read it and bus_sechedule
SLZ0106 f949d7c
add rewrite bus_sechedule
SLZ0106 b94cb23
add rewrite bus_sechedule_2
SLZ0106 5c84e85
Modify person class and related logic
YiboZh 4a966e7
small fix
YiboZh 87e6abf
initial person waiting for bus and transfer points in b18InitCUDA_n
SLZ0106 a4f7e8b
fix input error
SLZ0106 ec8f476
fix logic in adding new vehicle
YiboZh 9cbbbd3
Merge remote-tracking branch 'refs/remotes/origin/multi-mode-clean' i…
YiboZh 12af848
dumb solution for routting wrapper
SLZ0106 bc7bdcb
upload bus_schedule
SLZ0106 8a5b46a
add travel mode from input
SLZ0106 c9a2ba7
input travel_modes&corresponding od_pairs
SLZ0106 cb869d2
initialize trafficPersonVec
SLZ0106 6486cc3
Find possible buslines based on start/end intersection and bus schedule
YiboZh bd49d65
initialization
SLZ0106 ddb10c5
Modify findBuses and pass busRoutes into cuda init
YiboZh 08d7a1c
Small fix of function call
YiboZh e561dd6
Small fix and added some TODOs
YiboZh 66f69c5
add bus departure time
SLZ0106 22c9ecd
fix logic in adding passengers to bus
SLZ0106 aeb56f8
fix logic in adding passengers to bus_2
SLZ0106 cc71e84
add routing inputs
SLZ0106 4bc2106
add output in simulator.cpp
SLZ0106 6b71e7f
fix input bug
SLZ0106 ed4c23c
Move logic of randomVehicle to cu file and apply
YiboZh ed020d9
small fix
YiboZh 88f3f3f
fix input_2
SLZ0106 9b3d76a
Fix intersection to bus logic
YiboZh 7d1eff9
add normal dep_time to init_CUDA and kernel
SLZ0106 20581e3
change init person waiting
SLZ0106 9a5b0ac
add bus route in convertPath
SLZ0106 4e54f60
fix SP covert path
SLZ0106 1b25ab5
Replace LNode* passenger at intersection to DNode*
YiboZh 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 was deleted.
Oops, something went wrong.
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
Oops, something went wrong.
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.
@Luze, what's this for? Did you add this when we need a bike? Should we delete this for now? AFAIK our simulation is not using this cpp file