Skip to content

Commit

Permalink
Fix include order for cpplint (#28)
Browse files Browse the repository at this point in the history
Relates to upstream changes in ament_lint.
ament/ament_lint#324

Signed-off-by: Abrar Rahman Protyasha <aprotyas@u.rochester.edu>
  • Loading branch information
aprotyas authored Jan 23, 2022
1 parent 896a870 commit 917b63e
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 27 deletions.
8 changes: 4 additions & 4 deletions trac_ik_examples/src/ik_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
// POSSIBILITY OF SUCH DAMAGE.


#include <kdl/chainiksolverpos_nr_jl.hpp>
#include <rclcpp/rclcpp.hpp>
#include <trac_ik/trac_ik.hpp>

#include <chrono>
#include <map>
#include <random>
#include <string>
#include <vector>

#include "kdl/chainiksolverpos_nr_jl.hpp"
#include "rclcpp/rclcpp.hpp"
#include "trac_ik/trac_ik.hpp"

void test(
const rclcpp::Node::SharedPtr node, double num_samples, std::string chain_start,
std::string chain_end, double timeout, std::string urdf_xml)
Expand Down
6 changes: 3 additions & 3 deletions trac_ik_lib/include/trac_ik/kdl_tl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
#ifndef TRAC_IK__KDL_TL_HPP_
#define TRAC_IK__KDL_TL_HPP_

#include <kdl/chainfksolverpos_recursive.hpp>
#include <kdl/chainiksolvervel_pinv.hpp>

#include <chrono>
#include <vector>

#include "kdl/chainfksolverpos_recursive.hpp"
#include "kdl/chainiksolvervel_pinv.hpp"

namespace TRAC_IK
{
class TRAC_IK;
Expand Down
7 changes: 3 additions & 4 deletions trac_ik_lib/include/trac_ik/nlopt_ik.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@
#ifndef TRAC_IK__NLOPT_IK_HPP_
#define TRAC_IK__NLOPT_IK_HPP_

#include <trac_ik/kdl_tl.hpp>

#include <nlopt.hpp>

#include <chrono>
#include <vector>

#include "nlopt.hpp"
#include "trac_ik/kdl_tl.hpp"


namespace NLOPT_IK
{
Expand Down
9 changes: 4 additions & 5 deletions trac_ik_lib/include/trac_ik/trac_ik.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
#ifndef TRAC_IK__TRAC_IK_HPP_
#define TRAC_IK__TRAC_IK_HPP_

#include <trac_ik/nlopt_ik.hpp>
#include <trac_ik/visibility_control.hpp>

#include <kdl/chainjnttojacsolver.hpp>

#include <chrono>
#include <memory>
#include <mutex>
Expand All @@ -43,6 +38,10 @@
#include <vector>
#include <utility>

#include "kdl/chainjnttojacsolver.hpp"
#include "trac_ik/nlopt_ik.hpp"
#include "trac_ik/visibility_control.hpp"

namespace TRAC_IK
{

Expand Down
2 changes: 1 addition & 1 deletion trac_ik_lib/src/kdl_tl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// POSSIBILITY OF SUCH DAMAGE.


#include <trac_ik/kdl_tl.hpp>
#include "trac_ik/kdl_tl.hpp"

#include <chrono>
#include <limits>
Expand Down
8 changes: 4 additions & 4 deletions trac_ik_lib/src/nlopt_ik.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@
// POSSIBILITY OF SUCH DAMAGE.


#include <trac_ik/dual_quaternion.h>
#include <trac_ik/nlopt_ik.hpp>

#include <rclcpp/rclcpp.hpp>
#include "trac_ik/nlopt_ik.hpp"

#include <algorithm>
#include <chrono>
Expand All @@ -39,6 +36,9 @@
#include <string>
#include <vector>

#include "rclcpp/rclcpp.hpp"
#include "trac_ik/dual_quaternion.h"


namespace NLOPT_IK
{
Expand Down
12 changes: 6 additions & 6 deletions trac_ik_lib/src/trac_ik.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@
// POSSIBILITY OF SUCH DAMAGE.


#include <trac_ik/trac_ik.hpp>

#include <Eigen/Geometry>
#include <kdl_parser/kdl_parser.hpp>
#include <rclcpp/rclcpp.hpp>
#include <urdf/model.h>
#include "trac_ik/trac_ik.hpp"

#include <algorithm>
#include <limits>
Expand All @@ -41,6 +36,11 @@
#include <utility>
#include <vector>

#include "Eigen/Geometry"
#include "kdl_parser/kdl_parser.hpp"
#include "rclcpp/rclcpp.hpp"
#include "urdf/model.h"

namespace TRAC_IK
{
static const rclcpp::Logger LOGGER = rclcpp::get_logger("trac_ik.ros.trac_ik");
Expand Down

0 comments on commit 917b63e

Please sign in to comment.