Skip to content

Commit 463dcce

Browse files
Fix Code Style On intermediate-pathgen (#2269)
automated style fixes Co-authored-by: sid-parikh <[email protected]>
1 parent e4fd024 commit 463dcce

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

soccer/src/soccer/planning/planning_params.cpp

+12-8
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,18 @@ DEFINE_NS_INT64(kPlanningParamModule, rrt, min_iterations, 50,
4141
DEFINE_NS_INT64(kPlanningParamModule, rrt, max_iterations, 500,
4242
"Maximum number of RRT iterations to run before giving up");
4343

44-
45-
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, min_scale, 0.5, "Minimum length for intermediate point (m)");
46-
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, max_scale, 1.5, "Maximum length for intermediate point (m)");
47-
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, min_angle, 20, "Minimum angle for intermediate point (deg)");
48-
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, max_angle, 140, "Maximum angle for intermediate point (deg)");
49-
DEFINE_NS_INT64(kPlanningParamModule, intermediate, num_intermediates, 5, "Number of intermediate points used (unitless)");
50-
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, step_size, 0.1, "Step size for testing intermediates (m)");
51-
44+
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, min_scale, 0.5,
45+
"Minimum length for intermediate point (m)");
46+
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, max_scale, 1.5,
47+
"Maximum length for intermediate point (m)");
48+
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, min_angle, 20,
49+
"Minimum angle for intermediate point (deg)");
50+
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, max_angle, 140,
51+
"Maximum angle for intermediate point (deg)");
52+
DEFINE_NS_INT64(kPlanningParamModule, intermediate, num_intermediates, 5,
53+
"Number of intermediate points used (unitless)");
54+
DEFINE_NS_FLOAT64(kPlanningParamModule, intermediate, step_size, 0.1,
55+
"Step size for testing intermediates (m)");
5256

5357
DEFINE_NS_FLOAT64(
5458
kPlanningParamModule, escape, step_size, 0.1,

soccer/src/soccer/planning/primitives/create_path.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ Trajectory rrt(const LinearMotionInstant& start, const LinearMotionInstant& goal
7777

7878
static std::optional<std::tuple<double, double, double>> cached_intermediate_tuple_{};
7979

80-
8180
Trajectory intermediate(const LinearMotionInstant& start, const LinearMotionInstant& goal,
8281
const MotionConstraints& motion_constraints, RJ::Time start_time,
8382
const rj_geometry::ShapeSet& static_obstacles) {
@@ -105,7 +104,8 @@ Trajectory intermediate(const LinearMotionInstant& start, const LinearMotionInst
105104

106105
// Step through the path from the robot to the final intermediate point
107106
// and test each point on that path as an intermediate point
108-
for (double t = intermediate::PARAM_step_size; t < final_inter.dist_to(start.position); t += intermediate::PARAM_step_size) {
107+
for (double t = intermediate::PARAM_step_size; t < final_inter.dist_to(start.position);
108+
t += intermediate::PARAM_step_size) {
109109
rj_geometry::Point intermediate =
110110
(final_inter - start.position).normalized(t) + start.position;
111111
Trajectory trajectory =
@@ -114,7 +114,8 @@ Trajectory intermediate(const LinearMotionInstant& start, const LinearMotionInst
114114
// If the trajectory does not hit an obstacle, it is valid
115115
if ((!trajectory_hits_static(trajectory, static_obstacles, start_time, nullptr))) {
116116
auto angle = (final_inter - start.position).angle();
117-
cached_intermediate_tuple_ = {abs(angle), signbit(angle) ? -1 : 1, (final_inter - start.position).mag()};
117+
cached_intermediate_tuple_ = {abs(angle), signbit(angle) ? -1 : 1,
118+
(final_inter - start.position).mag()};
118119
return trajectory;
119120
}
120121
}
@@ -130,7 +131,8 @@ std::vector<rj_geometry::Point> get_intermediates(const LinearMotionInstant& sta
130131
std::mt19937 gen(rd());
131132
// Create a random distribution for the distance between the start
132133
// and the intermediate points
133-
std::uniform_real_distribution<> scale_dist(intermediate::PARAM_min_scale, intermediate::PARAM_max_scale);
134+
std::uniform_real_distribution<> scale_dist(intermediate::PARAM_min_scale,
135+
intermediate::PARAM_max_scale);
134136

135137
double angle_range = intermediate::PARAM_max_angle - intermediate::PARAM_min_angle;
136138
// Create a random distribution for the angle between the start

soccer/src/soccer/planning/primitives/create_path.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#pragma once
22

3-
#include <random>
43
#include <optional>
4+
#include <random>
5+
56
#include "planning/motion_constraints.hpp"
67
#include "planning/primitives/path_smoothing.hpp"
78
#include "planning/trajectory.hpp"

0 commit comments

Comments
 (0)