Skip to content

Commit 574f51e

Browse files
committed
Clean up code
1 parent 97b54b2 commit 574f51e

File tree

3 files changed

+7
-23
lines changed

3 files changed

+7
-23
lines changed

models/iiwa7_with_ft_sensor.sdf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,12 +434,12 @@
434434
<pose>0 0 0 0 0 0</pose>
435435
<mass>0.44</mass>
436436
<inertia>
437-
<ixx>1e-7</ixx>
437+
<ixx>1e-2</ixx>
438438
<ixy>0.0</ixy>
439439
<ixz>0.0</ixz>
440-
<iyy>1e-7</iyy>
440+
<iyy>1e-2</iyy>
441441
<iyz>0.0</iyz>
442-
<izz>1e-7</izz>
442+
<izz>1e-2</izz>
443443
</inertia>
444444
</inertial>
445445
<visual name="ft_sensor_visual">

robot_payload_id/optimization/inertial_param_sdp.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ def solve_ft_payload_sdp(
357357
variable_names = np.array([var.get_name() for var in variable_vec])
358358

359359
# Normalize cost
360+
# 3 forces and 3 torques per data point
360361
num_datapoints = len(ft_data_matrix) // 6
361362
prog.AddQuadraticCost(
362363
2 * ft_data_matrix.T @ ft_data_matrix / num_datapoints,

scripts/solve_ft_sensor_payload_param_sdp.py

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,26 @@
55

66
from datetime import datetime
77
from pathlib import Path
8-
from typing import Dict
98

109
import numpy as np
11-
import sympy
1210

13-
from pydrake.all import (
14-
DecomposeAffineExpressions,
15-
MathematicalProgramResult,
16-
SpatialInertia,
17-
UnitInertia,
18-
from_sympy,
19-
to_sympy,
20-
)
21-
from scipy.linalg import lu
11+
from pydrake.all import SpatialInertia, UnitInertia
2212

2313
import wandb
2414

2515
from robot_payload_id.data import (
2616
compute_autodiff_joint_data_from_fourier_series_traj_params1,
27-
compute_base_param_mapping,
2817
compute_ft_sensor_measurements,
2918
construct_ft_data_matrix,
30-
extract_numeric_data_matrix_autodiff,
3119
)
3220
from robot_payload_id.environment import create_arm
33-
from robot_payload_id.eric_id.drake_torch_dynamics import (
34-
calc_inertia_entropic_divergence,
35-
)
36-
from robot_payload_id.optimization import solve_ft_payload_sdp, solve_inertial_param_sdp
21+
from robot_payload_id.optimization import solve_ft_payload_sdp
3722
from robot_payload_id.utils import (
38-
ArmComponents,
3923
ArmPlantComponents,
4024
BsplineTrajectoryAttributes,
4125
FourierSeriesTrajectoryAttributes,
4226
JointData,
43-
get_plant_joint_params,
4427
process_joint_data,
45-
write_parameters_to_plant,
4628
)
4729

4830

@@ -249,6 +231,7 @@ def main():
249231
)
250232

251233
# Create arm
234+
# 7 joints + 1 F/T sensor weldjoint
252235
num_joints = 8
253236
arm_components = create_arm(
254237
arm_file_path=model_path.as_posix(), num_joints=num_joints, time_step=0.0

0 commit comments

Comments
 (0)