Add several accelerations to custom output #939
Merged
Conversation
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
…) to custom output
liljonnystyle
requested review from
AboudyKreidieh,
cathywu,
eugenevinitsky and
kanaadp
as code owners
…) to custom output
…ct/flow into jl-more-accel-outputs
* added function to kernel/vehicle to get number of not departed vehiles * fixed over indentation of the docstring * indentation edit * pep8 Co-authored-by: AboudyKreidieh <[email protected]>
* added function to kernel/vehicle to get number of not departed vehiles * fixed over indentation of the docstring * indentation edit * pep8 Co-authored-by: AboudyKreidieh <[email protected]>
…) to custom output
…) to custom output
brentgryffindor
approved these changes
May 27, 2020
flow/core/kernel/vehicle/traci.py
Outdated
Comment on lines
116
to
119
| self.__vehicles[veh_id]["accel_no_noise_no_failsafe"] = None | ||
| self.__vehicles[veh_id]["accel_no_noise_with_failsafe"] = None | ||
| self.__vehicles[veh_id]["accel_with_noise_no_failsafe"] = None | ||
| self.__vehicles[veh_id]["accel_with_noise_with_failsafe"] = None |
There was a problem hiding this comment.
Since there is a key existence check in all the get methods below. There is no need to initialize them here.
flow/core/kernel/vehicle/traci.py
Outdated
| @@ -964,6 +967,20 @@ def apply_acceleration(self, veh_ids, acc): | |||
| next_vel = max([this_vel + acc[i] * self.sim_step, 0]) | |||
| self.kernel_api.vehicle.slowDown(vid, next_vel, 1e-3) | |||
|
|
|||
| def apply_acceleration_not_smooth(self, veh_ids, acc): | |||
| """See parent class.""" | |||
| # to hand the case of a single vehicle | |||
Comment on lines
+977
to
+982
| for i, vid in enumerate(veh_ids): | ||
| if acc[i] is not None and vid in self.get_ids(): | ||
| self.__vehicles[vid]["accel"] = acc[i] | ||
| this_vel = self.get_speed(vid) | ||
| next_vel = max([this_vel + acc[i] * self.sim_step, 0]) | ||
| self.kernel_api.vehicle.setSpeed(vid, next_vel) |
There was a problem hiding this comment.
how is this different than the normal method?
There was a problem hiding this comment.
the normal method uses slowDown() method which applies some sort of smoothing. here setSpeed() method is used which doesn't apply smoothing.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull request information
Description
Adding more accelerations to the custom data pipeline output.
target_accel_no_noise_no_failsafe, new)target_accel_no_noise_with_failsafe, formerlyaccel_without_noise)target_accel_with_noise_no_failsafe, new)target_accel_with_noise_with_failsafe, formerlyacceleration)