-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Fixes joint out of position limits terminations #2442
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
Open
GiulioRomualdi
wants to merge
1
commit into
isaac-sim:main
Choose a base branch
from
GiulioRomualdi:patch-1
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.
+24
−13
Open
Changes from all commits
Commits
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 hidden or 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 |
---|---|---|
|
@@ -78,13 +78,23 @@ def root_height_below_minimum( | |
|
||
|
||
def joint_pos_out_of_limit(env: ManagerBasedRLEnv, asset_cfg: SceneEntityCfg = SceneEntityCfg("robot")) -> torch.Tensor: | ||
"""Terminate when the asset's joint positions are outside of the soft joint limits.""" | ||
# extract the used quantities (to enable type-hinting) | ||
""" | ||
Return a boolean tensor of shape `[num_envs]`: | ||
`True` if *any* of the (optionally selected) joints in an env are | ||
outside their soft joint‑position limits. | ||
""" | ||
asset: Articulation = env.scene[asset_cfg.name] | ||
# compute any violations | ||
out_of_upper_limits = torch.any(asset.data.joint_pos > asset.data.soft_joint_pos_limits[..., 1], dim=1) | ||
out_of_lower_limits = torch.any(asset.data.joint_pos < asset.data.soft_joint_pos_limits[..., 0], dim=1) | ||
return torch.logical_or(out_of_upper_limits[:, asset_cfg.joint_ids], out_of_lower_limits[:, asset_cfg.joint_ids]) | ||
|
||
# Per‑env‑per‑joint mask of violations | ||
joint_pos = asset.data.joint_pos # [N_envs, N_joints] | ||
joint_lower = asset.data.soft_joint_pos_limits[..., 0] | ||
joint_upper = asset.data.soft_joint_pos_limits[..., 1] | ||
violations = (joint_pos < joint_lower) | (joint_pos > joint_upper) | ||
|
||
joint_ids = asset_cfg.joint_ids if asset_cfg.joint_ids is not None else slice(None) | ||
|
||
# Reduce over *selected* joints → [N_envs] | ||
return torch.any(violations[:, joint_ids], dim=1) | ||
|
||
|
||
def joint_pos_out_of_manual_limit( | ||
|
@@ -95,14 +105,15 @@ def joint_pos_out_of_manual_limit( | |
Note: | ||
This function is similar to :func:`joint_pos_out_of_limit` but allows the user to specify the bounds manually. | ||
""" | ||
# extract the used quantities (to enable type-hinting) | ||
asset: Articulation = env.scene[asset_cfg.name] | ||
if asset_cfg.joint_ids is None: | ||
asset_cfg.joint_ids = slice(None) | ||
# compute any violations | ||
out_of_upper_limits = torch.any(asset.data.joint_pos[:, asset_cfg.joint_ids] > bounds[1], dim=1) | ||
out_of_lower_limits = torch.any(asset.data.joint_pos[:, asset_cfg.joint_ids] < bounds[0], dim=1) | ||
Comment on lines
-103
to
-104
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. Here the implementation is correct since it is only operating over subset of joints. |
||
return torch.logical_or(out_of_upper_limits, out_of_lower_limits) | ||
|
||
joint_ids = asset_cfg.joint_ids if asset_cfg.joint_ids is not None else slice(None) | ||
joint_pos = asset.data.joint_pos[:, joint_ids] # [N_envs, N_selected] | ||
|
||
violations = (joint_pos < bounds[0]) | (joint_pos > bounds[1]) | ||
|
||
# Reduce over joints → [N_envs] | ||
return torch.any(violations, dim=1) | ||
|
||
|
||
def joint_vel_out_of_limit(env: ManagerBasedRLEnv, asset_cfg: SceneEntityCfg = SceneEntityCfg("robot")) -> torch.Tensor: | ||
|
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.
Isn't it simpler to do it this way?