Commit a43c85de authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Fix doxygen links between types and shared pointers to types.

parent cbddb5af
......@@ -65,58 +65,62 @@ namespace hpp {
// roboptim
typedef roboptim::GenericFunctionTraits
<roboptim::EigenMatrixDense>::value_type value_type;
typedef BasicConfigurationShooterShPtr BasicConfigurationShooterPtr_t;
typedef model::CollisionObjectShPtr CollisionObjectShPtr_t;
typedef boost::shared_ptr < BasicConfigurationShooter >
BasicConfigurationShooterPtr_t;
typedef model::CollisionObjectPtr_t CollisionObjectPtr_t;
typedef model::Configuration_t Configuration_t;
typedef boost::shared_ptr<model::Configuration_t> ConfigurationPtr_t;
typedef std::vector <ConfigurationPtr_t> Configurations_t;
typedef Configurations_t::iterator ConfigIterator_t;
typedef Configurations_t::const_iterator ConfigConstIterator_t;
typedef ConfigurationShooterShPtr ConfigurationShooterPtr_t;
typedef ConfigProjectorShPtr ConfigProjectorPtr_t;
typedef ConnectedComponentShPtr ConnectedComponentPtr_t;
typedef std::list < ConnectedComponentPtr_t > ConnectedComponents_t;
typedef ConstraintShPtr ConstraintPtr_t;
typedef ConstraintSetShPtr ConstraintSetPtr_t;
typedef boost::shared_ptr <ConfigurationShooter> ConfigurationShooterPtr_t;
typedef boost::shared_ptr <ConfigProjector> ConfigProjectorPtr_t;
typedef boost::shared_ptr <ConnectedComponent> ConnectedComponentPtr_t;
typedef std::list <ConnectedComponentPtr_t> ConnectedComponents_t;
typedef boost::shared_ptr <Constraint> ConstraintPtr_t;
typedef boost::shared_ptr <ConstraintSet> ConstraintSetPtr_t;
typedef model::Device Device_t;
typedef model::DeviceShPtr DevicePtr_t;
typedef model::DevicePtr_t DevicePtr_t;
typedef model::DeviceWkPtr DeviceWkPtr_t;
typedef std::deque < DevicePtr_t > Devices_t;
typedef DifferentiableFunctionShPtr DifferentiableFunctionPtr_t;
typedef DiffusingPlannerShPtr DiffusingPlannerPtr_t;
typedef DiscretizedCollisionCheckingShPtr DiscretizedCollisionCheckingPtr_t;
typedef DistanceShPtr DistancePtr_t;
typedef std::deque <DevicePtr_t> Devices_t;
typedef boost::shared_ptr <DifferentiableFunction>
DifferentiableFunctionPtr_t;
typedef boost::shared_ptr <DiffusingPlanner> DiffusingPlannerPtr_t;
typedef boost::shared_ptr <DiscretizedCollisionChecking>
DiscretizedCollisionCheckingPtr_t;
typedef boost::shared_ptr <Distance> DistancePtr_t;
typedef Edge* EdgePtr_t;
typedef std::list < Edge* > Edges_t;
typedef ExtractedPathShPtr ExtractedPathPtr_t;
typedef std::list <Edge*> Edges_t;
typedef boost::shared_ptr <ExtractedPath> ExtractedPathPtr_t;
typedef model::JointJacobian_t JointJacobian_t;
typedef model::HalfJointJacobian_t HalfJointJacobian_t;
typedef model::JointVector_t JointVector_t;
typedef LockedDofShPtr LockedDofPtr_t;
typedef boost::shared_ptr <LockedDof> LockedDofPtr_t;
typedef model::matrix_t matrix_t;
typedef std::list < Node* > Nodes_t;
typedef std::list < Node* > Nodes_t;
typedef std::list <Node*> Nodes_t;
typedef std::list <Node*> Nodes_t;
typedef Node* NodePtr_t;
typedef model::ObjectVector_t ObjectVector_t;
typedef PathShPtr PathPtr_t;
typedef PathOptimizerShPtr PathOptimizerPtr_t;
typedef PathPlannerShPtr PathPlannerPtr_t;
typedef PathValidationShPtr PathValidationPtr_t;
typedef PathVectorShPtr PathVectorPtr_t;
typedef PlanAndOptimizeShPtr PlanAndOptimizePtr_t;
typedef boost::shared_ptr <Path> PathPtr_t;
typedef boost::shared_ptr <PathOptimizer> PathOptimizerPtr_t;
typedef boost::shared_ptr <PathPlanner> PathPlannerPtr_t;
typedef boost::shared_ptr <PathValidation> PathValidationPtr_t;
typedef boost::shared_ptr <PathVector> PathVectorPtr_t;
typedef boost::shared_ptr <PlanAndOptimize> PlanAndOptimizePtr_t;
typedef Problem* ProblemPtr_t;
typedef ProblemSolver* ProblemSolverPtr_t;
typedef RandomShortcutShPtr RandomShortcutPtr_t;
typedef RoadmapShPtr RoadmapPtr_t;
typedef boost::shared_ptr <RandomShortcut> RandomShortcutPtr_t;
typedef boost::shared_ptr <Roadmap> RoadmapPtr_t;
typedef roboptim::Function::size_type size_type;
typedef StraightPathShPtr StraightPathPtr_t;
typedef SteeringMethodShPtr SteeringMethodPtr_t;
typedef SteeringMethodStraightShPtr SteeringMethodStraightPtr_t;
typedef boost::shared_ptr <StraightPath> StraightPathPtr_t;
typedef boost::shared_ptr <SteeringMethod> SteeringMethodPtr_t;
typedef boost::shared_ptr <SteeringMethodStraight>
SteeringMethodStraightPtr_t;
typedef roboptim::StableTimePoint StableTimePoint_t;
typedef std::vector <PathPtr_t> Paths_t;
typedef std::vector <PathVectorPtr_t> PathVectors_t;
typedef model::vector_t vector_t;
typedef WeighedDistanceShPtr WeighedDistancePtr_t;
typedef boost::shared_ptr <WeighedDistance> WeighedDistancePtr_t;
} // namespace core
} // namespace hpp
......
......@@ -121,7 +121,7 @@ namespace hpp {
/// for this object.
/// \param distance whether distance computation should be performed
/// for this object.
void addObstacle (const CollisionObjectShPtr_t& inObject, bool collision,
void addObstacle (const CollisionObjectPtr_t& inObject, bool collision,
bool distance);
private:
typedef boost::function < PathPlannerPtr_t (const Problem&,
......
......@@ -147,7 +147,7 @@ namespace hpp {
/// for this object.
/// \param distance whether distance computation should be performed
/// for this object.
void addObstacle (const CollisionObjectShPtr_t& object, bool collision,
void addObstacle (const CollisionObjectPtr_t& object, bool collision,
bool distance);
/// List of objects considered for collision detection
const ObjectVector_t& collisionObstacles () const;
......
......@@ -25,7 +25,7 @@
namespace hpp {
namespace core {
HPP_PREDEF_CLASS (NearestNeighbor);
typedef NearestNeighborShPtr NearestNeighborPtr_t;
typedef boost::shared_ptr <NearestNeighbor> NearestNeighborPtr_t;
/// Roadmap built by random path planning methods
/// Nodes are configurations, paths are collision-free paths.
......
......@@ -42,7 +42,7 @@ namespace hpp {
WeighedDistance (const DevicePtr_t& robot,
const std::vector <value_type>& weights);
WeighedDistance (const WeighedDistance& distance);
void init (WeighedDistanceShPtr self);
void init (WeighedDistanceWkPtr self);
/// Derived class should implement this function
virtual value_type impl_distance (const Configuration_t& q1,
const Configuration_t& q2);
......
......@@ -22,7 +22,8 @@
namespace hpp {
namespace core {
HPP_PREDEF_CLASS (ConfigProjectorTrivial);
typedef ConfigProjectorTrivialShPtr ConfigProjectorTrivialPtr_t;
typedef boost::shared_ptr <ConfigProjectorTrivial>
ConfigProjectorTrivialPtr_t;
class ConfigProjectorTrivial : public ConfigProjector
{
public:
......
......@@ -139,7 +139,7 @@ namespace hpp {
paths_.push_back (path);
}
void ProblemSolver::addObstacle (const CollisionObjectShPtr_t& object,
void ProblemSolver::addObstacle (const CollisionObjectPtr_t& object,
bool collision, bool distance)
{
problem ()->addObstacle (object, collision, distance);
......
......@@ -92,7 +92,7 @@ namespace hpp {
// ======================================================================
void Problem::addObstacle (const CollisionObjectShPtr_t& object,
void Problem::addObstacle (const CollisionObjectPtr_t& object,
bool collision, bool distance)
{
// Add object in local list
......
......@@ -36,7 +36,7 @@ namespace hpp {
WeighedDistancePtr_t WeighedDistance::create (const DevicePtr_t& robot)
{
WeighedDistance* ptr = new WeighedDistance (robot);
WeighedDistanceShPtr shPtr (ptr);
WeighedDistancePtr_t shPtr (ptr);
ptr->init (shPtr);
return shPtr;
}
......@@ -46,7 +46,7 @@ namespace hpp {
const std::vector <value_type>& weights)
{
WeighedDistance* ptr = new WeighedDistance (robot, weights);
WeighedDistanceShPtr shPtr (ptr);
WeighedDistancePtr_t shPtr (ptr);
ptr->init (shPtr);
return shPtr;
}
......@@ -55,7 +55,7 @@ namespace hpp {
(const WeighedDistancePtr_t& distance)
{
WeighedDistance* ptr = new WeighedDistance (*distance);
WeighedDistanceShPtr shPtr (ptr);
WeighedDistancePtr_t shPtr (ptr);
ptr->init (shPtr);
return shPtr;
}
......@@ -118,7 +118,7 @@ namespace hpp {
{
}
void WeighedDistance::init (WeighedDistanceShPtr self)
void WeighedDistance::init (WeighedDistanceWkPtr self)
{
weak_ = self;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment