|
From: <is...@us...> - 2009-07-21 05:02:31
|
Revision: 19286
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19286&view=rev
Author: isucan
Date: 2009-07-21 05:02:24 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
renaming function
Modified Paths:
--------------
pkg/trunk/motion_planning/planning_environment/include/planning_environment/monitors/planning_monitor.h
pkg/trunk/motion_planning/planning_environment/src/monitors/planning_monitor.cpp
pkg/trunk/motion_planning/planning_environment/src/tools/view_state_validity.cpp
Modified: pkg/trunk/motion_planning/planning_environment/include/planning_environment/monitors/planning_monitor.h
===================================================================
--- pkg/trunk/motion_planning/planning_environment/include/planning_environment/monitors/planning_monitor.h 2009-07-21 04:59:45 UTC (rev 19285)
+++ pkg/trunk/motion_planning/planning_environment/include/planning_environment/monitors/planning_monitor.h 2009-07-21 05:02:24 UTC (rev 19286)
@@ -73,7 +73,7 @@
bool isEnvironmentSafe(void) const;
/** \brief Check if the full state of the robot is valid (ignoring constraints) */
- bool isStateValid(const planning_models::StateParams *state) const;
+ bool isStateCollisionFree(const planning_models::StateParams *state) const;
/** \brief Check if the full state of the robot is valid (including path constraints) */
bool isStateValidOnPath(const planning_models::StateParams *state) const;
Modified: pkg/trunk/motion_planning/planning_environment/src/monitors/planning_monitor.cpp
===================================================================
--- pkg/trunk/motion_planning/planning_environment/src/monitors/planning_monitor.cpp 2009-07-21 04:59:45 UTC (rev 19285)
+++ pkg/trunk/motion_planning/planning_environment/src/monitors/planning_monitor.cpp 2009-07-21 05:02:24 UTC (rev 19286)
@@ -267,7 +267,7 @@
return true;
}
-bool planning_environment::PlanningMonitor::isStateValid(const planning_models::StateParams *state) const
+bool planning_environment::PlanningMonitor::isStateCollisionFree(const planning_models::StateParams *state) const
{
getEnvironmentModel()->lock();
getKinematicModel()->lock();
Modified: pkg/trunk/motion_planning/planning_environment/src/tools/view_state_validity.cpp
===================================================================
--- pkg/trunk/motion_planning/planning_environment/src/tools/view_state_validity.cpp 2009-07-21 04:59:45 UTC (rev 19285)
+++ pkg/trunk/motion_planning/planning_environment/src/tools/view_state_validity.cpp 2009-07-21 05:02:24 UTC (rev 19286)
@@ -83,7 +83,7 @@
void stateUpdate(void)
{
- bool valid = planningMonitor_->isStateValid(planningMonitor_->getRobotState());
+ bool valid = planningMonitor_->isStateCollisionFree(planningMonitor_->getRobotState());
std_msgs::Byte msg;
msg.data = valid ? 1 : 0;
if (last_ != msg.data)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|