Skip to content
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,4 @@ cython_debug/

# Pycharm
.idea/*
*.urdf
1 change: 0 additions & 1 deletion examples/neural_ik.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
import adam
from adam.pytorch import KinDynComputations


DEFAULT_DESCRIPTION = "g1_mj_description"
DEFAULT_DEVICE = torch.device("cuda" if torch.cuda.is_available() else "cpu")

Expand Down
6 changes: 2 additions & 4 deletions src/adam/model/std_factories/std_joint.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,5 @@ def motion_subspace(self) -> npt.ArrayLike:
return self.math.vertcat(z, z, z, axis[0], axis[1], axis[2])
elif self.type in ["prismatic"]:
axis = self.axis
zero = self.math.zeros(
3,
)
return self.math.vertcat(axis[0], axis[1], axis[2], zero, zero, zero)
z = self.math.zeros(1)
return self.math.vertcat(axis[0], axis[1], axis[2], z, z, z)
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,5 @@ def motion_subspace(self) -> npt.ArrayLike:
return self.math.vertcat(z, z, z, axis[0], axis[1], axis[2])
elif self.type in ["prismatic"]:
axis = self.axis
zero = self.math.zeros(3)
return self.math.vertcat(axis[0], axis[1], axis[2], zero, zero, zero)
z = self.math.zeros(1)
return self.math.vertcat(axis[0], axis[1], axis[2], z, z, z)
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(
original_volume, _ = self.compute_volume(length_multiplier=1.0)
self.original_density = link.inertial.mass / original_volume
self.link_offset = self.compute_offset()
(self.volume, self.visual_data_new) = self.compute_volume(
self.volume, self.visual_data_new = self.compute_volume(
length_multiplier=self.length_multiplier
)
self.mass = self.compute_mass()
Expand Down
1 change: 0 additions & 1 deletion tests/test_mujoco.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from adam import Representations
from adam.numpy.computations import KinDynComputations


DESCRIPTION_NAMES = ["g1_mj_description", "aliengo_mj_description"]


Expand Down
Loading