Skip to content

Commit c9ae446

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 8f84f0f + e14134d commit c9ae446

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

ArmNavigation/n_joint_arm_3d/NLinkArm3d.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ def inverse_kinematics(self, ref_ee_pose, plot=False):
127127

128128
if plot:
129129
self.fig = plt.figure()
130-
self.ax = Axes3D(self.fig)
130+
self.ax = Axes3D(self.fig, auto_add_to_figure=False)
131+
self.fig.add_axes(self.ax)
131132

132133
x_list = []
133134
y_list = []

Localization/particle_filter/particle_filter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ def calc_covariance(x_est, px, pw):
9696
calculate covariance matrix
9797
see ipynb doc
9898
"""
99-
cov = np.zeros((3, 3))
99+
cov = np.zeros((4, 4))
100100
n_particle = px.shape[1]
101101
for i in range(n_particle):
102-
dx = (px[:, i:i + 1] - x_est)[0:3]
102+
dx = (px[:, i:i + 1] - x_est)
103103
cov += pw[0, i] * dx @ dx.T
104104
cov *= 1.0 / (1.0 - pw @ pw.T)
105105

requirements/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ numpy == 1.26.4
22
scipy == 1.13.0
33
matplotlib == 3.8.4
44
cvxpy == 1.4.3
5-
pytest == 8.1.1 # For unit test
6-
pytest-xdist == 3.5.0 # For unit test
7-
mypy == 1.9.0 # For unit test
8-
ruff == 0.4.1 # For unit test
5+
pytest == 8.2.0 # For unit test
6+
pytest-xdist == 3.6.1 # For unit test
7+
mypy == 1.10.0 # For unit test
8+
ruff == 0.4.2 # For unit test

0 commit comments

Comments
 (0)