Skip to content

Commit

Permalink
style(pre-commit): autofix
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Dec 16, 2024
1 parent ea6dc00 commit 7ca347e
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ def process_include_tag(
local_context,
base_namespace,
)
temp_context[
name
] = value # temp_context is used to pass arguments to the included file and updated on the fly for each argument
temp_context[name] = (
value # temp_context is used to pass arguments to the included file and updated on the fly for each argument
)
for key in argument_dict:
temp_context[key] = argument_dict[key]
if included_file:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def find_package(package_name) -> str:

BASE_PROJECT_MAPPING[package_name] = get_package_share_directory(package_name)
else:
BASE_PROJECT_MAPPING[
package_name
] = f"/opt/ros/humble/share/{package_name}" # use this for temporal solution;
BASE_PROJECT_MAPPING[package_name] = (
f"/opt/ros/humble/share/{package_name}" # use this for temporal solution;
)
return BASE_PROJECT_MAPPING[package_name]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ struct LoggerNamespaceInfo
};
class LoggingLevelConfigureRvizPlugin : public rviz_common::Panel
{
Q_OBJECT // This macro is needed for Qt to handle slots and signals
Q_OBJECT // This macro is needed for Qt to handle slots and signals

public : LoggingLevelConfigureRvizPlugin(QWidget * parent = nullptr);
public : LoggingLevelConfigureRvizPlugin(QWidget * parent = nullptr);
void onInitialize() override;
void save(rviz_common::Config config) const override;
void load(const rviz_common::Config & config) override;
Expand Down
31 changes: 16 additions & 15 deletions control_data_collecting_tool/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,21 +234,22 @@ ROS 2 parameters which are common in all trajectories (`/config/common_param.yam
| `steer_rate_lim` | `double` | Steering angle rate limit [rad/s] | 0.6 |
The following parameters are common to all trajectories but can be defined individually for each trajectory. (`/config/course_param/COURSE_NAME_param.yaml`):
| Name | Type | Description | Default value |
| :--------------------------------------- | :------- | :-------------------------------------------------------------------------------------------------- | :------------- |
| `COLLECTING_DATA_V_MIN` | `double` | Minimum velocity for data collection [m/s] | 0.5 |
| `COLLECTING_DATA_V_MAX` | `double` | Maximum velocity for data collection [m/s] | 8.0 |
| `COLLECTING_DATA_A_MIN` | `double` | Minimum velocity for data collection [m/s^2] | 1.0 |
| `COLLECTING_DATA_A_MAX` | `double` | Maximum velocity for data collection [m/s^2] | -1.0 |
| `longitudinal_velocity_noise_amp` | `double` | Target longitudinal velocity additional sine noise amplitude [m/s] | 0.01 |
| `longitudinal_velocity_noise_min_period` | `double` | Target longitudinal velocity additional sine noise minimum period [s] | 5.0 |
| `longitudinal_velocity_noise_max_period` | `double` | Target longitudinal velocity additional sine noise maximum period [s] | 20.0 |
| `acc_noise_amp` | `double` | Accel command additional sine noise amplitude [m/ss] | 0.01 |
| `acc_noise_min_period` | `double` | Accel command additional sine noise minimum period [s] | 5.0 |
| `acc_noise_max_period` | `double` | Accel command additional sine noise maximum period [s] | 20.0 |
| `steer_noise_amp` | `double` | Steer command additional sine noise amplitude [rad] | 0.01 |
| `steer_noise_max_period` | `double` | Steer command additional sine noise maximum period [s] | 5.0 |
| `steer_noise_min_period` | `double` | Steer command additional sine noise minimum period [s] | 20.0 |
| Name | Type | Description | Default value |
| :--------------------------------------- | :------- | :-------------------------------------------------------------------- | :------------ |
| `COLLECTING_DATA_V_MIN` | `double` | Minimum velocity for data collection [m/s] | 0.5 |
| `COLLECTING_DATA_V_MAX` | `double` | Maximum velocity for data collection [m/s] | 8.0 |
| `COLLECTING_DATA_A_MIN` | `double` | Minimum velocity for data collection [m/s^2] | 1.0 |
| `COLLECTING_DATA_A_MAX` | `double` | Maximum velocity for data collection [m/s^2] | -1.0 |
| `longitudinal_velocity_noise_amp` | `double` | Target longitudinal velocity additional sine noise amplitude [m/s] | 0.01 |
| `longitudinal_velocity_noise_min_period` | `double` | Target longitudinal velocity additional sine noise minimum period [s] | 5.0 |
| `longitudinal_velocity_noise_max_period` | `double` | Target longitudinal velocity additional sine noise maximum period [s] | 20.0 |
| `acc_noise_amp` | `double` | Accel command additional sine noise amplitude [m/ss] | 0.01 |
| `acc_noise_min_period` | `double` | Accel command additional sine noise minimum period [s] | 5.0 |
| `acc_noise_max_period` | `double` | Accel command additional sine noise maximum period [s] | 20.0 |
| `steer_noise_amp` | `double` | Steer command additional sine noise amplitude [rad] | 0.01 |
| `steer_noise_max_period` | `double` | Steer command additional sine noise maximum period [s] | 5.0 |
| `steer_noise_min_period` | `double` | Steer command additional sine noise minimum period [s] | 20.0 |
### Course-Specific Parameters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -818,9 +818,9 @@ def __init__(self, step: float, param_dict):
self.trajectory_nearly_straight_clock_wise[self.steer_list[i]] = trajectory

# Generate and store counterclockwise trajectories by reversing the clockwise trajectory.
self.trajectory_nearly_straight_counter_clock_wise[
self.steer_list[i]
] = reverse_trajectory_segment(trajectory)
self.trajectory_nearly_straight_counter_clock_wise[self.steer_list[i]] = (
reverse_trajectory_segment(trajectory)
)

# Generate trajectories for changing directions (turning).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,9 @@ def control(self):

# [2] publish cmd
control_cmd_msg = AckermannControlCommand()
control_cmd_msg.stamp = (
control_cmd_msg.lateral.stamp
) = control_cmd_msg.longitudinal.stamp = (self.get_clock().now().to_msg())
control_cmd_msg.stamp = control_cmd_msg.lateral.stamp = (
control_cmd_msg.longitudinal.stamp
) = (self.get_clock().now().to_msg())
control_cmd_msg.longitudinal.velocity = trajectory_longitudinal_velocity[nearestIndex]
control_cmd_msg.longitudinal.acceleration = cmd[0]
control_cmd_msg.lateral.steering_tire_angle = cmd[1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,11 @@ def load_rosbag(self, rosbag2_path: str):
objects_topic = (
"/perception/object_recognition/detection/objects"
if self.args.detected_object
else "/perception/object_recognition/tracking/objects"
if self.args.tracked_object
else "/perception/object_recognition/objects"
else (
"/perception/object_recognition/tracking/objects"
if self.args.tracked_object
else "/perception/object_recognition/objects"
)
)
ego_odom_topic = "/localization/kinematic_state"
traffic_signals_topic = "/perception/traffic_light_recognition/traffic_signals"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ def __init__(self, args):
self.perv_objects_msg, self.prev_traffic_signals_msg = self.find_topics_by_timestamp(
pose_timestamp
)
self.memorized_original_objects_msg = (
self.memorized_noised_objects_msg
) = self.perv_objects_msg
self.memorized_original_objects_msg = self.memorized_noised_objects_msg = (
self.perv_objects_msg
)

# start main timer callback

Expand Down

0 comments on commit 7ca347e

Please sign in to comment.