Skip to content
Snippets Groups Projects
Unverified Commit 275ad907 authored by stonneau's avatar stonneau Committed by GitHub
Browse files

Merge pull request #11 from pFernbach/topic/warnings 

fix compilation warnings
parents 0aed096a 2b406fe6
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
cmake @ 320c6369
Compare 37328d71...320c6369
Subproject commit 37328d715825baa3bdd7860f8561c68a0a3ff76c Subproject commit 320c636960b03b3bad7c7a08bd2e104951f42bc3
idl/hpp/corbaserver/rbprm/rbprmbuilder.idl
+ 15
− 15
View file @ 275ad907
...@@ -431,7 +431,7 @@ module hpp ...@@ -431,7 +431,7 @@ module hpp
/// \param state2 index of second state. /// \param state2 index of second state.
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
short limbRRT(in double state1, in double state2, in unsigned short numOptimizations) raises (Error); short limbRRT(in unsigned short state1, in unsigned short state2, in unsigned short numOptimizations) raises (Error);
/// Provided a path has already been computed and interpolated, generate a continuous path /// Provided a path has already been computed and interpolated, generate a continuous path
/// between two indicated states. The states do not need to be consecutive, but increasing in Id. /// between two indicated states. The states do not need to be consecutive, but increasing in Id.
...@@ -444,7 +444,7 @@ module hpp ...@@ -444,7 +444,7 @@ module hpp
/// \param path index of the path considered for the generation /// \param path index of the path considered for the generation
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
short limbRRTFromRootPath(in double state1, in double state2, in unsigned short path, in unsigned short numOptimizations) raises (Error); short limbRRTFromRootPath(in unsigned short state1, in unsigned short state2, in unsigned short path, in unsigned short numOptimizations) raises (Error);
/// Linear interpolation of many configurations into a path /// Linear interpolation of many configurations into a path
/// \param configs list of configurations /// \param configs list of configurations
...@@ -462,7 +462,7 @@ module hpp ...@@ -462,7 +462,7 @@ module hpp
/// \param comPath index of the path considered of the com path /// \param comPath index of the path considered of the com path
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
short comRRT(in double state1, in double state2, in unsigned short comPath, in unsigned short numOptimizations) raises (Error); short comRRT(in unsigned short state1, in unsigned short state2, in unsigned short comPath, in unsigned short numOptimizations) raises (Error);
/// Provided a path has already been computed and interpolated, generate a continuous path /// Provided a path has already been computed and interpolated, generate a continuous path
/// between two indicated states. The states do need to be consecutive. /// between two indicated states. The states do need to be consecutive.
...@@ -476,7 +476,7 @@ module hpp ...@@ -476,7 +476,7 @@ module hpp
/// \param rootPositions1 com positions to track for 3rd phase /// \param rootPositions1 com positions to track for 3rd phase
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
floatSeq comRRTFromPos(in double state1, floatSeq comRRTFromPos(in unsigned short state1,
in unsigned short comTraj1, in unsigned short comTraj1,
in unsigned short comTraj2, in unsigned short comTraj2,
in unsigned short comTraj3, in unsigned short comTraj3,
...@@ -496,7 +496,7 @@ module hpp ...@@ -496,7 +496,7 @@ module hpp
/// \param rootPositions1 com positions to track for 3rd phase /// \param rootPositions1 com positions to track for 3rd phase
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
floatSeq comRRTFromPosBetweenState(in double state1,in double state2, floatSeq comRRTFromPosBetweenState(in unsigned short state1,in unsigned short state2,
in unsigned short comTraj1, in unsigned short comTraj1,
in unsigned short comTraj2, in unsigned short comTraj2,
in unsigned short comTraj3, in unsigned short comTraj3,
...@@ -516,7 +516,7 @@ module hpp ...@@ -516,7 +516,7 @@ module hpp
/// \param rootPositions1 com positions to track for 3rd phase /// \param rootPositions1 com positions to track for 3rd phase
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
floatSeq effectorRRTFromPosBetweenState(in double state1,in double state2, floatSeq effectorRRTFromPosBetweenState(in unsigned short state1,in unsigned short state2,
in unsigned short comTraj1, in unsigned short comTraj1,
in unsigned short comTraj2, in unsigned short comTraj2,
in unsigned short comTraj3, in unsigned short comTraj3,
...@@ -535,7 +535,7 @@ module hpp ...@@ -535,7 +535,7 @@ module hpp
/// \param rootPositions1 com positions to track for 3rd phase /// \param rootPositions1 com positions to track for 3rd phase
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
floatSeq effectorRRT(in double state1, floatSeq effectorRRT(in unsigned short state1,
in unsigned short comTraj1, in unsigned short comTraj1,
in unsigned short comTraj2, in unsigned short comTraj2,
in unsigned short comTraj3, in unsigned short comTraj3,
...@@ -550,7 +550,7 @@ module hpp ...@@ -550,7 +550,7 @@ module hpp
/// \param rootPositions1 com positions to track /// \param rootPositions1 com positions to track
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
floatSeq effectorRRTOnePhase(in double state1, in double state2, floatSeq effectorRRTOnePhase(in unsigned short state1, in unsigned short state2,
in unsigned short comTraj, in unsigned short comTraj,
in unsigned short numOptimizations) raises (Error); in unsigned short numOptimizations) raises (Error);
...@@ -561,7 +561,7 @@ module hpp ...@@ -561,7 +561,7 @@ module hpp
/// \param rootPositions1 com positions to track /// \param rootPositions1 com positions to track
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
floatSeqSeq generateEffectorBezierArray(in double state1, in double state2, floatSeqSeq generateEffectorBezierArray(in unsigned short state1, in unsigned short state2,
in unsigned short comTraj, in unsigned short comTraj,
in unsigned short numOptimizations) raises (Error); in unsigned short numOptimizations) raises (Error);
...@@ -574,7 +574,7 @@ module hpp ...@@ -574,7 +574,7 @@ module hpp
/// \param rootPositions1 com positions to track /// \param rootPositions1 com positions to track
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
floatSeq comRRTOnePhase(in double state1, in double state2, floatSeq comRRTOnePhase(in unsigned short state1, in unsigned short state2,
in unsigned short comTraj, in unsigned short comTraj,
in unsigned short numOptimizations) raises (Error); in unsigned short numOptimizations) raises (Error);
...@@ -592,7 +592,7 @@ module hpp ...@@ -592,7 +592,7 @@ module hpp
/// \param rootPositions1 com positions to track for 3rd phase /// \param rootPositions1 com positions to track for 3rd phase
/// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states /// \param numOptimizations Number of iterations of the shortcut algorithm to apply between each states
/// \return id of the root path computed /// \return id of the root path computed
floatSeq effectorRRTFromPath(in double state1, in unsigned short refPath, floatSeq effectorRRTFromPath(in unsigned short state1, in unsigned short refPath,
in double path_from, in double path_to, in double path_from, in double path_to,
in unsigned short comTraj1, in unsigned short comTraj1,
in unsigned short comTraj2, in unsigned short comTraj2,
...@@ -608,7 +608,7 @@ module hpp ...@@ -608,7 +608,7 @@ module hpp
/// \param state1 index of first state. /// \param state1 index of first state.
/// \param state2 index of end state. /// \param state2 index of end state.
/// \param rootPositions com positions to track /// \param rootPositions com positions to track
short generateEndEffectorBezier(in double state1,in double state2, short generateEndEffectorBezier(in unsigned short state1,in unsigned short state2,
in unsigned short comTraj) raises (Error); in unsigned short comTraj) raises (Error);
/// Project a given state into a given COM position /// Project a given state into a given COM position
...@@ -618,7 +618,7 @@ module hpp ...@@ -618,7 +618,7 @@ module hpp
/// \param targetCom 3D vector for the com position /// \param targetCom 3D vector for the com position
/// \param max_num_sample number of samples that can be used at worst before failing /// \param max_num_sample number of samples that can be used at worst before failing
/// \return projected configuration /// \return projected configuration
floatSeq projectToCom(in double state, in floatSeq targetCom, in unsigned short max_num_sample) raises (Error); floatSeq projectToCom(in unsigned short state, in floatSeq targetCom, in unsigned short max_num_sample) raises (Error);
/// Retrieve the configuration at a given state /// Retrieve the configuration at a given state
/// between two indicated states. The states do not need to be consecutive, but increasing in Id. /// between two indicated states. The states do not need to be consecutive, but increasing in Id.
...@@ -630,13 +630,13 @@ module hpp ...@@ -630,13 +630,13 @@ module hpp
/// \param limb name of the limb for which the request aplies /// \param limb name of the limb for which the request aplies
/// \param state1 current state considered /// \param state1 current state considered
/// \return whether the limb is in contact at this state /// \return whether the limb is in contact at this state
short isLimbInContact(in string limbname, in double state1) raises (Error); short isLimbInContact(in string limbname, in unsigned short state1) raises (Error);
/// Is limb in contact during the motion from the current state to the next one /// Is limb in contact during the motion from the current state to the next one
/// \param limb name of the limb for which the request aplies /// \param limb name of the limb for which the request aplies
/// \param state1 current state considered /// \param state1 current state considered
/// \return whether the limb is in contact at this state /// \return whether the limb is in contact at this state
short isLimbInContactIntermediary(in string limbname, in double state1) raises (Error); short isLimbInContactIntermediary(in string limbname, in unsigned short state1) raises (Error);
/// Generate intermediary state /// Generate intermediary state
/// \param state1 initial state considered /// \param state1 initial state considered
......
src/rbprmbuilder.impl.cc
+ 71
− 80
View file @ 275ad907
This diff is collapsed.
src/rbprmbuilder.impl.hh
+ 17
− 17
View file @ 275ad907
...@@ -270,40 +270,40 @@ namespace hpp { ...@@ -270,40 +270,40 @@ namespace hpp {
virtual CORBA::Short generateCurveTrajParts(const hpp::floatSeqSeq& positions, const hpp::floatSeq& partitions) throw (hpp::Error); virtual CORBA::Short generateCurveTrajParts(const hpp::floatSeqSeq& positions, const hpp::floatSeq& partitions) throw (hpp::Error);
virtual CORBA::Short generateRootPath(const hpp::floatSeqSeq& rootPositions, virtual CORBA::Short generateRootPath(const hpp::floatSeqSeq& rootPositions,
const hpp::floatSeq& q1, const hpp::floatSeq& q2) throw (hpp::Error); const hpp::floatSeq& q1, const hpp::floatSeq& q2) throw (hpp::Error);
virtual CORBA::Short limbRRT(double state1, double state2, unsigned short numOptimizations) throw (hpp::Error); virtual CORBA::Short limbRRT(unsigned short state1, unsigned short state2, unsigned short numOptimizations) throw (hpp::Error);
virtual CORBA::Short limbRRTFromRootPath(double state1, double state2, unsigned short path, unsigned short numOptimizations) throw (hpp::Error); virtual CORBA::Short limbRRTFromRootPath(unsigned short state1, unsigned short state2, unsigned short path, unsigned short numOptimizations) throw (hpp::Error);
virtual CORBA::Short configToPath(const hpp::floatSeqSeq& configs) throw (hpp::Error); virtual CORBA::Short configToPath(const hpp::floatSeqSeq& configs) throw (hpp::Error);
virtual CORBA::Short comRRT(double state1, double state2, unsigned short path, unsigned short numOptimizations) throw (hpp::Error); virtual CORBA::Short comRRT(unsigned short state1, unsigned short state2, unsigned short path, unsigned short numOptimizations) throw (hpp::Error);
typedef core::PathPtr_t (*t_rrt) typedef core::PathPtr_t (*t_rrt)
(RbPrmFullBodyPtr_t, core::ProblemSolverPtr_t, const core::PathPtr_t, (RbPrmFullBodyPtr_t, core::ProblemSolverPtr_t, const core::PathPtr_t,
const State &, const State &, const std::size_t, const bool); const State &, const State &, const std::size_t, const bool);
hpp::floatSeq* rrt(t_rrt functor ,double state1,double state2, hpp::floatSeq* rrt(t_rrt functor ,unsigned short state1,unsigned short state2,
unsigned short comTraj1, unsigned short comTraj2, unsigned short comTraj3, unsigned short comTraj1, unsigned short comTraj2, unsigned short comTraj3,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual hpp::floatSeq* comRRTFromPos(double state1, virtual hpp::floatSeq* comRRTFromPos(unsigned short state1,
unsigned short comTraj1, unsigned short comTraj1,
unsigned short comTraj2, unsigned short comTraj2,
unsigned short comTraj3, unsigned short comTraj3,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual hpp::floatSeq* comRRTFromPosBetweenState(double state1,double state2, virtual hpp::floatSeq* comRRTFromPosBetweenState(unsigned short state1,unsigned short state2,
unsigned short comTraj1, unsigned short comTraj1,
unsigned short comTraj2, unsigned short comTraj2,
unsigned short comTraj3, unsigned short comTraj3,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual hpp::floatSeq* effectorRRTFromPosBetweenState(double state1,double state2, virtual hpp::floatSeq* effectorRRTFromPosBetweenState(unsigned short state1,unsigned short state2,
unsigned short comTraj1, unsigned short comTraj1,
unsigned short comTraj2, unsigned short comTraj2,
unsigned short comTraj3, unsigned short comTraj3,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual hpp::floatSeq* effectorRRT(double state1, virtual hpp::floatSeq* effectorRRT(unsigned short state1,
unsigned short comTraj1, unsigned short comTraj1,
unsigned short comTraj2, unsigned short comTraj2,
unsigned short comTraj3, unsigned short comTraj3,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual hpp::floatSeq* effectorRRTFromPath(double state1, virtual hpp::floatSeq* effectorRRTFromPath(unsigned short state1,
unsigned short path, unsigned short path,
double path_from, double path_from,
double path_to, double path_to,
...@@ -312,23 +312,23 @@ namespace hpp { ...@@ -312,23 +312,23 @@ namespace hpp {
unsigned short comTraj3, unsigned short comTraj3,
unsigned short numOptimizations, unsigned short numOptimizations,
const hpp::Names_t& trackedEffectors) throw (hpp::Error); const hpp::Names_t& trackedEffectors) throw (hpp::Error);
virtual hpp::floatSeq* rrtOnePhase(t_rrt functor,double state1,double state2, virtual hpp::floatSeq* rrtOnePhase(t_rrt functor,unsigned short state1,unsigned short state2,
unsigned short comTraj, unsigned short comTraj,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual hpp::floatSeq* effectorRRTOnePhase(double state1,double state2, virtual hpp::floatSeq* effectorRRTOnePhase(unsigned short state1,unsigned short state2,
unsigned short comTraj, unsigned short comTraj,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual hpp::floatSeq* comRRTOnePhase(double state1,double state2, virtual hpp::floatSeq* comRRTOnePhase(unsigned short state1, unsigned short state2,
unsigned short comTraj, unsigned short comTraj,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual hpp::floatSeqSeq* generateEffectorBezierArray(double state1,double state2, virtual hpp::floatSeqSeq* generateEffectorBezierArray(unsigned short state1,unsigned short state2,
unsigned short comTraj, unsigned short comTraj,
unsigned short numOptimizations) throw (hpp::Error); unsigned short numOptimizations) throw (hpp::Error);
virtual CORBA::Short generateEndEffectorBezier(double state1, double state2, virtual CORBA::Short generateEndEffectorBezier(unsigned short state1, unsigned short state2,
unsigned short cT) throw (hpp::Error); unsigned short cT) throw (hpp::Error);
virtual hpp::floatSeq* projectToCom(double state, const hpp::floatSeq& targetCom, unsigned short max_num_sample) throw (hpp::Error); virtual hpp::floatSeq* projectToCom(unsigned short state, const hpp::floatSeq& targetCom, unsigned short max_num_sample) throw (hpp::Error);
virtual CORBA::Short createState(const hpp::floatSeq& configuration, const hpp::Names_t& contactLimbs) throw (hpp::Error); virtual CORBA::Short createState(const hpp::floatSeq& configuration, const hpp::Names_t& contactLimbs) throw (hpp::Error);
virtual hpp::floatSeq* getConfigAtState(unsigned short stateId) throw (hpp::Error); virtual hpp::floatSeq* getConfigAtState(unsigned short stateId) throw (hpp::Error);
virtual double setConfigAtState(unsigned short stateId, const hpp::floatSeq& config) throw (hpp::Error); virtual double setConfigAtState(unsigned short stateId, const hpp::floatSeq& config) throw (hpp::Error);
...@@ -339,8 +339,8 @@ namespace hpp { ...@@ -339,8 +339,8 @@ namespace hpp {
virtual void saveComputedStates(const char* filepath) throw (hpp::Error); virtual void saveComputedStates(const char* filepath) throw (hpp::Error);
virtual void saveLimbDatabase(const char* limbname,const char* filepath) throw (hpp::Error); virtual void saveLimbDatabase(const char* limbname,const char* filepath) throw (hpp::Error);
virtual hpp::floatSeq* getOctreeBox(const char* limbName, double sampleId) throw (hpp::Error); virtual hpp::floatSeq* getOctreeBox(const char* limbName, double sampleId) throw (hpp::Error);
virtual CORBA::Short isLimbInContact(const char* limbName, double state) throw (hpp::Error); virtual CORBA::Short isLimbInContact(const char* limbName, unsigned short state) throw (hpp::Error);
virtual CORBA::Short isLimbInContactIntermediary(const char* limbName, double state) throw (hpp::Error); virtual CORBA::Short isLimbInContactIntermediary(const char* limbName, unsigned short state) throw (hpp::Error);
virtual CORBA::Short computeIntermediary(unsigned short state1, unsigned short state2) throw (hpp::Error); virtual CORBA::Short computeIntermediary(unsigned short state1, unsigned short state2) throw (hpp::Error);
virtual hpp::floatSeqSeq* getOctreeBoxes(const char* limbName, const hpp::floatSeq& configuration) throw (hpp::Error); virtual hpp::floatSeqSeq* getOctreeBoxes(const char* limbName, const hpp::floatSeq& configuration) throw (hpp::Error);
virtual hpp::floatSeq* getOctreeTransform(const char* limbName, const hpp::floatSeq& configuration) throw (hpp::Error); virtual hpp::floatSeq* getOctreeTransform(const char* limbName, const hpp::floatSeq& configuration) throw (hpp::Error);
......
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