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.

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

Fix misc. issues. #1834

Merged
merged 1 commit into from
Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ Copy and pasting the git commit messages is __NOT__ enough.
### Changed
### Deprecated
### Fixed
- Clarified the actions for `ActionSpaceType.Continuous` and `ActionSpaceType.ActuatorDynamic` in their respective docstrings.
- Excluded from wheel any scenario build files in pattern `smarts/**/build/**/*.xml`.
### Removed
- Removed duplicated `smarts.env.gymnasium.action_conversion` module.
### Security

## [1.0.3] 2023-02-04
Expand Down
3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ include envision/web/dist/*
recursive-include smarts/benchmark *.yaml *.yml
recursive-include smarts/ros/src *.launch *.msg *.srv package.xml CMakeLists.txt *.py
recursive-include smarts/scenarios *.xml *.py
recursive-include smarts/diagnostic *.xml *.py
recursive-include smarts/diagnostic *.xml *.py
recursive-exclude smarts/scenarios/**/build *.xml
14 changes: 9 additions & 5 deletions smarts/core/controllers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,14 @@ class ActionSpaceType(Enum):

Continuous = 0
"""
Action=(throttle, brake, steering_angle)
Action=(throttle, brake, steering)

+ throttle: Range=[0, 1]. Type=float.
+ brake: Range=[0, 1]. Type=float.
+ steering_angle: Range=[-1, 1]. Type=float.
+ steering: Range=[-1, 1]. Type=float.

Steering maps to full turn in one direction to a full turn in the other.
Direction of turn for the steering depends on the vehicle.
"""
Lane = 1
"""
Expand All @@ -72,10 +75,11 @@ class ActionSpaceType(Enum):

+ throttle: Range=[0, 1]. Type=float.
+ brake: Range=[0, 1]. Type=float.
+ steering_rate: Type=float.
+ steering_rate: Range[-1, 1]. Type=float.

Steering rate means the amount of steering angle change *per second*
(either positive or negative) to be applied to the current steering angle.
Steering rate means the amount of steering change *per second*.
(either positive or negative) to be applied to the current steering.
This gets clipped to the available steering of the vehicle (which may vary.)
"""
LaneWithContinuousSpeed = 3
"""
Expand Down
285 changes: 0 additions & 285 deletions smarts/env/gymnasium/utils/action_conversion.py

This file was deleted.