Skip to content

Commit a9c423d

Browse files
committed
Apply uncrustify and cpplint proposals.
1 parent 6a6cf15 commit a9c423d

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ inline bool check_state_tolerance_per_joint(
153153
using std::abs;
154154
const double error_position = state_error.positions[joint_idx];
155155
const double error_velocity = state_error.velocities.empty() ?
156-
0.0 : state_error.velocities[joint_idx];
156+
0.0 : state_error.velocities[joint_idx];
157157
const double error_acceleration = state_error.accelerations.empty() ?
158-
0.0 : state_error.accelerations[joint_idx];
158+
0.0 : state_error.accelerations[joint_idx];
159159

160160
const bool is_valid =
161161
!(state_tolerance.position > 0.0 && abs(error_position) > state_tolerance.position) &&

joint_trajectory_controller/test/test_trajectory_controller.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ TEST_P(TrajectoryControllerTestParameterized, test_ignore_old_trajectory) {
727727
SetUpAndActivateTrajectoryController(true, {}, &executor);
728728
subscribeToState();
729729

730-
// TODO: add expectations for velocties and accelerations
730+
// TODO(anyone): add expectations for velocities and accelerations
731731
std::vector<std::vector<double>> points_old {{{2., 3., 4.}, {4., 5., 6.}}};
732732
std::vector<std::vector<double>> points_new {{{-1., -2., -3.}}};
733733

@@ -868,13 +868,14 @@ INSTANTIATE_TEST_CASE_P(
868868
std::vector<std::string>({"position"})),
869869
std::make_tuple(
870870
std::vector<std::string>({"position", "velocity", "acceleration"}),
871-
std::vector<std::string>({"position", "velocity"})) // ,
872-
// std::make_tuple(std::vector<std::string>({"position", "velocity", "acceleration"}),
873-
// std::vector<std::string>({"position", "velocity", "acceleration"}))
871+
std::vector<std::string>({"position", "velocity"})) // ,
872+
// std::make_tuple(
873+
// std::vector<std::string>({"position", "velocity", "acceleration"}),
874+
// std::vector<std::string>({"position", "velocity", "acceleration"}))
874875
)
875876
);
876877

877-
// TODO: Add incorrect interface parameters
878+
// TODO(denis): Add incorrect interface parameters
878879
TEST_F(TrajectoryControllerTest, incorrect_initialization_using_wrong_parameters) {
879880
SetUpTrajectoryController(false);
880881

joint_trajectory_controller/test/test_trajectory_controller_utils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const std::vector<double> INITIAL_POS_JOINTS = {
3636
INITIAL_POS_JOINT1, INITIAL_POS_JOINT2, INITIAL_POS_JOINT3};
3737
const std::vector<double> INITIAL_VEL_JOINTS = {0.0, 0.0, 0.0};
3838
const std::vector<double> INITIAL_ACC_JOINTS = {0.0, 0.0, 0.0};
39-
}
39+
} // namespace
4040

4141
namespace test_trajectory_controllers
4242
{

0 commit comments

Comments
 (0)