Apply clang-format-10 (moveit#199)

v4hn · web-flow · commit ee6c50ad3140 · 2020-08-20T11:56:53.000+02:00
diff --git a/.clang-format b/.clang-format
@@ -24,6 +24,7 @@ BraceWrapping:
   BeforeCatch: false
   BeforeElse: false
   IndentBraces: false
+  SplitEmptyRecord: false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: false
diff --git a/core/include/moveit/task_constructor/container.h b/core/include/moveit/task_constructor/container.h
@@ -120,7 +120,7 @@ class ParallelContainerBase;
  *  - Fallbacks: the children are considered in series
  *  - Merger: solutions of all children (actuating disjoint groups)
  *            are merged into a single solution for parallel execution
-*/
+ */
 class ParallelContainerBase : public ContainerBase
 {
 public:
diff --git a/core/include/moveit/task_constructor/container_p.h b/core/include/moveit/task_constructor/container_p.h
@@ -49,8 +49,8 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(JointModelGroup)
 MOVEIT_CLASS_FORWARD(RobotState)
-}
-}
+}  // namespace core
+}  // namespace moveit
 
 namespace moveit {
 namespace task_constructor {
diff --git a/core/include/moveit/task_constructor/marker_tools.h b/core/include/moveit/task_constructor/marker_tools.h
@@ -12,8 +12,8 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotState)
 MOVEIT_CLASS_FORWARD(LinkModel)
-}
-}
+}  // namespace core
+}  // namespace moveit
 
 namespace moveit {
 namespace task_constructor {
diff --git a/core/include/moveit/task_constructor/solvers/planner_interface.h b/core/include/moveit/task_constructor/solvers/planner_interface.h
@@ -54,8 +54,8 @@ namespace core {
 MOVEIT_CLASS_FORWARD(LinkModel)
 MOVEIT_CLASS_FORWARD(RobotModel)
 MOVEIT_CLASS_FORWARD(JointModelGroup)
-}
-}
+}  // namespace core
+}  // namespace moveit
 
 namespace moveit {
 namespace task_constructor {
diff --git a/core/include/moveit/task_constructor/stage.h b/core/include/moveit/task_constructor/stage.h
@@ -54,7 +54,7 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotModel)
 }
-}
+}  // namespace moveit
 
 namespace planning_scene {
 MOVEIT_CLASS_FORWARD(PlanningScene)
diff --git a/core/include/moveit/task_constructor/stages/compute_ik.h b/core/include/moveit/task_constructor/stages/compute_ik.h
@@ -45,8 +45,8 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotState)
 MOVEIT_CLASS_FORWARD(JointModelGroup)
-}
-}
+}  // namespace core
+}  // namespace moveit
 
 namespace moveit {
 namespace task_constructor {
diff --git a/core/include/moveit/task_constructor/stages/connect.h b/core/include/moveit/task_constructor/stages/connect.h
@@ -47,7 +47,7 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotState)
 }
-}
+}  // namespace moveit
 
 namespace moveit {
 namespace task_constructor {
diff --git a/core/include/moveit/task_constructor/stages/modify_planning_scene.h b/core/include/moveit/task_constructor/stages/modify_planning_scene.h
@@ -48,7 +48,7 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(JointModelGroup)
 }
-}
+}  // namespace moveit
 
 namespace moveit {
 namespace task_constructor {
diff --git a/core/include/moveit/task_constructor/stages/move_relative.h b/core/include/moveit/task_constructor/stages/move_relative.h
@@ -48,7 +48,7 @@ namespace moveit {
 namespace core {
 class RobotState;
 }
-}
+}  // namespace moveit
 namespace moveit {
 namespace task_constructor {
 namespace stages {
diff --git a/core/include/moveit/task_constructor/stages/move_to.h b/core/include/moveit/task_constructor/stages/move_to.h
@@ -48,7 +48,7 @@ namespace moveit {
 namespace core {
 class RobotState;
 }
-}
+}  // namespace moveit
 namespace moveit {
 namespace task_constructor {
 namespace stages {
@@ -101,10 +101,10 @@ class MoveTo : public PropagatingEitherWay
 	bool getJointStateGoal(const boost::any& goal, const core::JointModelGroup* jmg, moveit::core::RobotState& state);
 	bool getPoseGoal(const boost::any& goal, const geometry_msgs::PoseStamped& ik_pose_msg,
 	                 const planning_scene::PlanningScenePtr& scene, Eigen::Isometry3d& target_eigen,
-	                 decltype(std::declval<SolutionBase>().markers()) & markers);
+	                 decltype(std::declval<SolutionBase>().markers())& markers);
 	bool getPointGoal(const boost::any& goal, const moveit::core::LinkModel* link,
 	                  const planning_scene::PlanningScenePtr& scene, Eigen::Isometry3d& target_eigen,
-	                  decltype(std::declval<SolutionBase>().markers()) & /*unused*/);
+	                  decltype(std::declval<SolutionBase>().markers())& /*unused*/);
 
 protected:
 	solvers::PlannerInterfacePtr planner_;
diff --git a/core/include/moveit/task_constructor/stages/predicate_filter.h b/core/include/moveit/task_constructor/stages/predicate_filter.h
@@ -41,7 +41,7 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotState)
 }
-}
+}  // namespace moveit
 
 namespace moveit {
 namespace task_constructor {
diff --git a/core/include/moveit/task_constructor/stages/simple_grasp.h b/core/include/moveit/task_constructor/stages/simple_grasp.h
@@ -45,7 +45,7 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotModel)
 }
-}
+}  // namespace moveit
 namespace moveit {
 namespace task_constructor {
 namespace stages {
diff --git a/core/include/moveit/task_constructor/storage.h b/core/include/moveit/task_constructor/storage.h
@@ -182,10 +182,10 @@ class Interface : public ordered<InterfaceState*>
 
 	// restrict access to some functions to ensure consistency
 	// (we need to set/unset InterfaceState::owner_)
-	using base_type::moveTo;
-	using base_type::moveFrom;
-	using base_type::insert;
 	using base_type::erase;
+	using base_type::insert;
+	using base_type::moveFrom;
+	using base_type::moveTo;
 	using base_type::remove_if;
 };
 
@@ -329,4 +329,4 @@ struct less<moveit::task_constructor::SolutionBase*>
 		return *x < *y;
 	}
 };
-}
+}  // namespace std
diff --git a/core/include/moveit/task_constructor/task.h b/core/include/moveit/task_constructor/task.h
@@ -52,8 +52,8 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotModel)
 MOVEIT_CLASS_FORWARD(RobotState)
-}
-}
+}  // namespace core
+}  // namespace moveit
 
 namespace moveit {
 namespace task_constructor {
@@ -108,9 +108,9 @@ class Task : protected WrapperBase
 	void eraseTaskCallback(TaskCallbackList::const_iterator which);
 
 	/// expose SolutionCallback API
-	using WrapperBase::SolutionCallback;
 	using WrapperBase::addSolutionCallback;
 	using WrapperBase::removeSolutionCallback;
+	using WrapperBase::SolutionCallback;
 
 	/// reset all stages
 	void reset() final;
diff --git a/core/include/moveit/task_constructor/type_traits.h b/core/include/moveit/task_constructor/type_traits.h
@@ -54,8 +54,9 @@ struct is_container_helper
 
 template <typename T>
 struct is_container<
-    T, std::conditional_t<false, is_container_helper<typename T::const_iterator, decltype(std::declval<T>().cbegin()),
-                                                     decltype(std::declval<T>().cend())>,
+    T, std::conditional_t<false,
+                          is_container_helper<typename T::const_iterator, decltype(std::declval<T>().cbegin()),
+                                              decltype(std::declval<T>().cend())>,
                           void> > : public std::true_type
 {};
 }  // namespace task_constructor
diff --git a/core/src/introspection.cpp b/core/src/introspection.cpp
@@ -57,7 +57,7 @@ std::string getProcessId() {
 	gethostname(our_hostname, sizeof(our_hostname) - 1);
 	return std::to_string(getpid()) + "@" + our_hostname;
 }
-}
+}  // namespace
 
 class IntrospectionPrivate
 {
diff --git a/core/src/solvers/planner_interface.cpp b/core/src/solvers/planner_interface.cpp
@@ -47,6 +47,6 @@ PlannerInterface::PlannerInterface() {
 	p.declare<double>("max_velocity_scaling_factor", 1.0, "scale down max velocity by this factor");
 	p.declare<double>("max_acceleration_scaling_factor", 1.0, "scale down max acceleration by this factor");
 }
-}
-}
+}  // namespace solvers
+}  // namespace task_constructor
 }  // namespace moveit
diff --git a/core/src/stage.cpp b/core/src/stage.cpp
@@ -720,7 +720,7 @@ bool Connecting::compatible(const InterfaceState& from_state, const InterfaceSta
 		auto it = std::find_if(to_attached.cbegin(), to_attached.cend(),
 		                       [from_object](const moveit::core::AttachedBody* object) {
 			                       return object->getName() == from_object->getName();
-			                    });
+		                       });
 		if (it == to_attached.cend()) {
 			ROS_DEBUG_STREAM_NAMED("Connecting", name() << ": object missing: " << from_object->getName());
 			return false;
diff --git a/core/src/stages/compute_ik.cpp b/core/src/stages/compute_ik.cpp
@@ -354,8 +354,9 @@ void ComputeIK::compute() {
 	double min_solution_distance = props.get<double>("min_solution_distance");
 
 	IKSolutions ik_solutions;
-	auto is_valid = [sandbox_scene, ignore_collisions, min_solution_distance, &ik_solutions](
-	    robot_state::RobotState* state, const robot_model::JointModelGroup* jmg, const double* joint_positions) {
+	auto is_valid = [sandbox_scene, ignore_collisions, min_solution_distance,
+	                 &ik_solutions](robot_state::RobotState* state, const robot_model::JointModelGroup* jmg,
+	                                const double* joint_positions) {
 		for (const auto& sol : ik_solutions) {
 			if (jmg->distance(joint_positions, sol.data()) < min_solution_distance)
 				return false;  // too close to already found solution
diff --git a/core/src/stages/fix_collision_objects.cpp b/core/src/stages/fix_collision_objects.cpp
@@ -72,8 +72,8 @@ bool computeCorrection(const std::vector<cd::Contact>& contacts, Eigen::Vector3d
 	correction.setZero();
 	for (const cd::Contact& c : contacts) {
 		if ((c.body_type_1 != cd::BodyTypes::WORLD_OBJECT && c.body_type_2 != cd::BodyTypes::WORLD_OBJECT)) {
-			ROS_WARN_STREAM_NAMED("FixCollisionObjects", "Cannot fix collision between " << c.body_name_1 << " and "
-			                                                                             << c.body_name_2);
+			ROS_WARN_STREAM_NAMED("FixCollisionObjects",
+			                      "Cannot fix collision between " << c.body_name_1 << " and " << c.body_name_2);
 			return false;
 		}
 		if (c.body_type_1 == cd::BodyTypes::WORLD_OBJECT)
diff --git a/core/src/stages/move_to.cpp b/core/src/stages/move_to.cpp
@@ -125,7 +125,7 @@ bool MoveTo::getJointStateGoal(const boost::any& goal, const moveit::core::Joint
 
 bool MoveTo::getPoseGoal(const boost::any& goal, const geometry_msgs::PoseStamped& ik_pose_msg,
                          const planning_scene::PlanningScenePtr& scene, Eigen::Isometry3d& target_eigen,
-                         decltype(std::declval<SolutionBase>().markers()) & markers) {
+                         decltype(std::declval<SolutionBase>().markers())& markers) {
 	try {
 		const geometry_msgs::PoseStamped& target = boost::any_cast<geometry_msgs::PoseStamped>(goal);
 		tf::poseMsgToEigen(target.pose, target_eigen);
@@ -147,7 +147,7 @@ bool MoveTo::getPoseGoal(const boost::any& goal, const geometry_msgs::PoseStampe
 
 bool MoveTo::getPointGoal(const boost::any& goal, const moveit::core::LinkModel* link,
                           const planning_scene::PlanningScenePtr& scene, Eigen::Isometry3d& target_eigen,
-                          decltype(std::declval<SolutionBase>().markers()) & /*unused*/) {
+                          decltype(std::declval<SolutionBase>().markers())& /*unused*/) {
 	try {
 		const geometry_msgs::PointStamped& target = boost::any_cast<geometry_msgs::PointStamped>(goal);
 		Eigen::Vector3d target_point;
diff --git a/core/src/task.cpp b/core/src/task.cpp
@@ -117,7 +117,7 @@ Task::Task(const std::string& id, bool introspection, ContainerBase::pointer&& c
 }
 
 Task::Task(Task&& other)  // NOLINT(performance-noexcept-move-constructor)
-    : WrapperBase(new TaskPrivate(this, std::string()), std::make_unique<SerialContainer>()) {
+  : WrapperBase(new TaskPrivate(this, std::string()), std::make_unique<SerialContainer>()) {
 	*this = std::move(other);
 }
 
@@ -223,7 +223,7 @@ void Task::enableIntrospection(bool enable) {
 		    [](Stage& stage, int /*depth*/) {
 			    stage.pimpl()->setIntrospection(nullptr);
 			    return true;
-			 },
+		    },
 		    1, UINT_MAX);
 		impl->introspection_.reset();
 	}
@@ -275,7 +275,7 @@ void Task::init() {
 	    [impl](Stage& stage, int /*depth*/) {
 		    stage.pimpl()->setIntrospection(impl->introspection_.get());
 		    return true;
-		 },
+	    },
 	    1, UINT_MAX);
 
 	// first time publish task
diff --git a/core/test/models.h b/core/test/models.h
@@ -6,7 +6,7 @@ namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotModel)
 }
-}
+}  // namespace moveit
 
 // get a hard-coded model
 moveit::core::RobotModelPtr getModel();
diff --git a/visualization/motion_planning_tasks/properties/property_factory.h b/visualization/motion_planning_tasks/properties/property_factory.h
@@ -48,15 +48,15 @@ namespace rviz {
 class Property;
 class PropertyTreeModel;
 class DisplayContext;
-}
+}  // namespace rviz
 namespace planning_scene {
 class PlanningScene;
 }
 namespace moveit {
 namespace task_constructor {
 class Stage;
 }
-}
+}  // namespace moveit
 
 namespace moveit_rviz_plugin {
 
diff --git a/visualization/motion_planning_tasks/src/icons.cpp b/visualization/motion_planning_tasks/src/icons.cpp
@@ -11,5 +11,5 @@ const Icon FORWARD({ { QLatin1String(":icons/downarrow.png"), QColor::fromRgba(0
 const Icon BACKWARD({ { QLatin1String(":icons/uparrow.png"), QColor::fromRgba(0xff000000) } }, Icon::TINT);
 const Icon BOTHWAY({ { QLatin1String(":icons/updownarrow.png"), QColor::fromRgba(0xff000000) } }, Icon::TINT);
 const Icon GENERATE({ { QLatin1String(":icons/generatearrow.png"), QColor::fromRgba(0xff000000) } }, Icon::TINT);
-}
-}
+}  // namespace icons
+}  // namespace moveit_rviz_plugin
diff --git a/visualization/motion_planning_tasks/src/icons.h b/visualization/motion_planning_tasks/src/icons.h
@@ -10,5 +10,5 @@ extern const moveit_rviz_plugin::utils::Icon FORWARD;
 extern const moveit_rviz_plugin::utils::Icon BACKWARD;
 extern const moveit_rviz_plugin::utils::Icon BOTHWAY;
 extern const moveit_rviz_plugin::utils::Icon GENERATE;
-}
-}
+}  // namespace icons
+}  // namespace moveit_rviz_plugin
diff --git a/visualization/motion_planning_tasks/src/remote_task_model.cpp b/visualization/motion_planning_tasks/src/remote_task_model.cpp
@@ -596,7 +596,7 @@ void RemoteSolutionModel::sortInternal() {
 			          if (comp == 0)  // if still undecided, id decides
 				          comp = (left->id < right->id ? -1 : 1);
 			          return (sort_order_ == Qt::AscendingOrder) ? (comp < 0) : (comp >= 0);
-			       });
+		          });
 	}
 
 	// map old indexes to new ones
diff --git a/visualization/motion_planning_tasks/src/task_display.h b/visualization/motion_planning_tasks/src/task_display.h
@@ -54,13 +54,13 @@
 namespace rviz {
 class StringProperty;
 class RosTopicProperty;
-}
+}  // namespace rviz
 
 namespace moveit {
 namespace core {
 MOVEIT_CLASS_FORWARD(RobotModel)
 }
-}
+}  // namespace moveit
 namespace rdf_loader {
 MOVEIT_CLASS_FORWARD(RDFLoader)
 }
diff --git a/visualization/motion_planning_tasks/src/task_list_model.h b/visualization/motion_planning_tasks/src/task_list_model.h
@@ -58,7 +58,7 @@ class ServiceClient;
 namespace rviz {
 class PropertyTreeModel;
 class DisplayContext;
-}
+}  // namespace rviz
 
 namespace moveit_rviz_plugin {
 
diff --git a/visualization/motion_planning_tasks/src/task_panel.cpp b/visualization/motion_planning_tasks/src/task_panel.cpp
@@ -226,7 +226,7 @@ TaskViewPrivate::TaskViewPrivate(TaskView* q_ptr) : q_ptr(q_ptr), exec_action_cl
 			                 }
 			                 tasks_view->setExpanded(parent, true);  // expand parent group item
 		                 }
-		              });
+	                 });
 
 	tasks_view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	tasks_view->setAcceptDrops(true);
diff --git a/visualization/motion_planning_tasks/src/task_panel.h b/visualization/motion_planning_tasks/src/task_panel.h
@@ -49,7 +49,7 @@ class WindowManagerInterface;
 class Property;
 class BoolProperty;
 class EnumProperty;
-}
+}  // namespace rviz
 
 namespace moveit_rviz_plugin {
 
@@ -108,7 +108,7 @@ class MetaTaskListModel;
  *  Subscribing to task_monitoring and task_solution topics, it collects information
  *  about running tasks and their solutions and allows to inspect both,
  *  successful solutions and failed solution attempts.
-*/
+ */
 class TaskViewPrivate;
 class TaskView : public SubPanel
 {
diff --git a/visualization/motion_planning_tasks/test/test_merge_models.cpp b/visualization/motion_planning_tasks/test/test_merge_models.cpp
diff --git a/visualization/visualization_tools/include/moveit/visualization_tools/display_solution.h b/visualization/visualization_tools/include/moveit/visualization_tools/display_solution.h
diff --git a/visualization/visualization_tools/include/moveit/visualization_tools/marker_visualization.h b/visualization/visualization_tools/include/moveit/visualization_tools/marker_visualization.h
diff --git a/visualization/visualization_tools/include/moveit/visualization_tools/task_solution_visualization.h b/visualization/visualization_tools/include/moveit/visualization_tools/task_solution_visualization.h
diff --git a/visualization/visualization_tools/src/task_solution_visualization.cpp b/visualization/visualization_tools/src/task_solution_visualization.cpp

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ class ParallelContainerBase;`
`120`	`120`	`* - Fallbacks: the children are considered in series`
`121`	`121`	`* - Merger: solutions of all children (actuating disjoint groups)`
`122`	`122`	`* are merged into a single solution for parallel execution`
`123`		`-*/`
	`123`	`+ */`
`124`	`124`	`class ParallelContainerBase : public ContainerBase`
`125`	`125`	`{`
`126`	`126`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ namespace moveit {`
`54`	`54`	`namespace core {`
`55`	`55`	`MOVEIT_CLASS_FORWARD(RobotModel)`
`56`	`56`	`}`
`57`		`-}`
	`57`	`+} // namespace moveit`
`58`	`58`
`59`	`59`	`namespace planning_scene {`
`60`	`60`	`MOVEIT_CLASS_FORWARD(PlanningScene)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ namespace moveit {`
`47`	`47`	`namespace core {`
`48`	`48`	`MOVEIT_CLASS_FORWARD(RobotState)`
`49`	`49`	`}`
`50`		`-}`
	`50`	`+} // namespace moveit`
`51`	`51`
`52`	`52`	`namespace moveit {`
`53`	`53`	`namespace task_constructor {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ namespace moveit {`
`48`	`48`	`namespace core {`
`49`	`49`	`MOVEIT_CLASS_FORWARD(JointModelGroup)`
`50`	`50`	`}`
`51`		`-}`
	`51`	`+} // namespace moveit`
`52`	`52`
`53`	`53`	`namespace moveit {`
`54`	`54`	`namespace task_constructor {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ namespace moveit {`
`41`	`41`	`namespace core {`
`42`	`42`	`MOVEIT_CLASS_FORWARD(RobotState)`
`43`	`43`	`}`
`44`		`-}`
	`44`	`+} // namespace moveit`
`45`	`45`
`46`	`46`	`namespace moveit {`
`47`	`47`	`namespace task_constructor {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ namespace moveit {`
`45`	`45`	`namespace core {`
`46`	`46`	`MOVEIT_CLASS_FORWARD(RobotModel)`
`47`	`47`	`}`
`48`		`-}`
	`48`	`+} // namespace moveit`
`49`	`49`	`namespace moveit {`
`50`	`50`	`namespace task_constructor {`
`51`	`51`	`namespace stages {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ std::string getProcessId() {`
`57`	`57`	`gethostname(our_hostname, sizeof(our_hostname) - 1);`
`58`	`58`	`return std::to_string(getpid()) + "@" + our_hostname;`
`59`	`59`	`}`
`60`		`-}`
	`60`	`+} // namespace`
`61`	`61`
`62`	`62`	`class IntrospectionPrivate`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ PlannerInterface::PlannerInterface() {`
`47`	`47`	`p.declare<double>("max_velocity_scaling_factor", 1.0, "scale down max velocity by this factor");`
`48`	`48`	`p.declare<double>("max_acceleration_scaling_factor", 1.0, "scale down max acceleration by this factor");`
`49`	`49`	`}`
`50`		`-}`
`51`		`-}`
	`50`	`+} // namespace solvers`
	`51`	`+} // namespace task_constructor`
`52`	`52`	`} // namespace moveit`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace moveit {`
`6`	`6`	`namespace core {`
`7`	`7`	`MOVEIT_CLASS_FORWARD(RobotModel)`
`8`	`8`	`}`
`9`		`-}`
	`9`	`+} // namespace moveit`
`10`	`10`
`11`	`11`	`// get a hard-coded model`
`12`	`12`	`moveit::core::RobotModelPtr getModel();`
Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ void RemoteSolutionModel::sortInternal() {`
`596`	`596`	`if (comp == 0) // if still undecided, id decides`
`597`	`597`	`comp = (left->id < right->id ? -1 : 1);`
`598`	`598`	`return (sort_order_ == Qt::AscendingOrder) ? (comp < 0) : (comp >= 0);`
`599`		`- });`
	`599`	`+ });`
`600`	`600`	`}`
`601`	`601`
`602`	`602`	`// map old indexes to new ones`