From d2d93967cede3115f6a2e4a58e87ab1c800c85f5 Mon Sep 17 00:00:00 2001 From: v4hn Date: Tue, 12 Sep 2017 09:21:31 +0200 Subject: [PATCH] consistency: Begin -> Beginning --- include/moveit_task_constructor/subtask.h | 4 ++-- src/subtask.cpp | 6 +++--- src/task.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/moveit_task_constructor/subtask.h b/include/moveit_task_constructor/subtask.h index 23745063..c4fd2ecd 100644 --- a/include/moveit_task_constructor/subtask.h +++ b/include/moveit_task_constructor/subtask.h @@ -32,7 +32,7 @@ public: virtual bool compute() = 0; const std::string& getName(); - const std::list& getBegin(); + const std::list& getBeginning(); const std::list& getEnd(); std::list& getTrajectories(); @@ -57,7 +57,7 @@ protected: void sendBackward(SubTrajectory&, planning_scene::PlanningSceneConstPtr); void sendBothWays(SubTrajectory&, planning_scene::PlanningSceneConstPtr); - InterfaceState* newBegin(planning_scene::PlanningSceneConstPtr, SubTrajectory*); + InterfaceState* newBeginning(planning_scene::PlanningSceneConstPtr, SubTrajectory*); InterfaceState* newEnd(planning_scene::PlanningSceneConstPtr, SubTrajectory*); const std::string name_; diff --git a/src/subtask.cpp b/src/subtask.cpp index 5ced813e..7d1c04ac 100644 --- a/src/subtask.cpp +++ b/src/subtask.cpp @@ -21,7 +21,7 @@ moveit::task_constructor::SubTask::getName(){ } const std::list& -moveit::task_constructor::SubTask::getBegin(){ +moveit::task_constructor::SubTask::getBeginning(){ return beginnings_; } @@ -85,7 +85,7 @@ void moveit::task_constructor::SubTask::sendForward(moveit::task_constructor::SubTrajectory& traj, planning_scene::PlanningSceneConstPtr ps){ if( successor_ ){ std::cout << "sending state forward to successor" << std::endl; - traj.end= successor_->newBegin(ps, &traj); + traj.end= successor_->newBeginning(ps, &traj); } } @@ -107,7 +107,7 @@ moveit::task_constructor::SubTask::sendBothWays(moveit::task_constructor::SubTra } moveit::task_constructor::InterfaceState* -moveit::task_constructor::SubTask::newBegin(planning_scene::PlanningSceneConstPtr ps, SubTrajectory* old_end){ +moveit::task_constructor::SubTask::newBeginning(planning_scene::PlanningSceneConstPtr ps, SubTrajectory* old_end){ assert( bool(ps) ); beginnings_.push_back( InterfaceState(ps, old_end, NULL) ); diff --git a/src/task.cpp b/src/task.cpp index 53ad62dc..4a76847c 100644 --- a/src/task.cpp +++ b/src/task.cpp @@ -93,7 +93,7 @@ void moveit::task_constructor::Task::add( SubTaskPtr subtask ){ void moveit::task_constructor::Task::printState(){ for( auto& st : subtasks_ ){ std::cout - << st->getBegin().size() << " -> " + << st->getBeginning().size() << " -> " << st->getTrajectories().size() << " <- " << st->getEnd().size() << " / " << st->getName()