diff --git a/include/sot/core/feature-point6d.hh b/include/sot/core/feature-point6d.hh index 5df8c4efa148f005a1ff86bc17706ba88d56cb11..22d8d346239d0d4088a1158cda376d622365302a 100644 --- a/include/sot/core/feature-point6d.hh +++ b/include/sot/core/feature-point6d.hh @@ -97,15 +97,15 @@ public: int time); /** Static Feature selection. */ - inline static Flags selectX(void) { return FLAG_LINE_1; } - inline static Flags selectY(void) { return FLAG_LINE_2; } - inline static Flags selectZ(void) { return FLAG_LINE_3; } - inline static Flags selectRX(void) { return FLAG_LINE_4; } - inline static Flags selectRY(void) { return FLAG_LINE_5; } - inline static Flags selectRZ(void) { return FLAG_LINE_6; } - - inline static Flags selectTranslation(void) { return Flags(7); } - inline static Flags selectRotation(void) { return Flags(56); } + inline static Flags selectX(void) { return Flags("100000"); } + inline static Flags selectY(void) { return Flags("010000"); } + inline static Flags selectZ(void) { return Flags("001000"); } + inline static Flags selectRX(void) { return Flags("000100"); } + inline static Flags selectRY(void) { return Flags("000010"); } + inline static Flags selectRZ(void) { return Flags("000001"); } + + inline static Flags selectTranslation(void) { return Flags("111000"); } + inline static Flags selectRotation(void) { return Flags("000111"); } virtual void display(std::ostream &os) const; diff --git a/include/sot/core/feature-pose.hh b/include/sot/core/feature-pose.hh index 1cbad24ad1033783731f0914e1c6e1f928eb6780..88917aa44c656b7695cab5d3dfc6947abb21dccd 100644 --- a/include/sot/core/feature-pose.hh +++ b/include/sot/core/feature-pose.hh @@ -139,17 +139,6 @@ public: virtual dynamicgraph::Matrix &computeJacobian(dynamicgraph::Matrix &res, int time); - /** Static Feature selection. */ - inline static Flags selectX(void) { return FLAG_LINE_1; } - inline static Flags selectY(void) { return FLAG_LINE_2; } - inline static Flags selectZ(void) { return FLAG_LINE_3; } - inline static Flags selectRX(void) { return FLAG_LINE_4; } - inline static Flags selectRY(void) { return FLAG_LINE_5; } - inline static Flags selectRZ(void) { return FLAG_LINE_6; } - - inline static Flags selectTranslation(void) { return Flags(7); } - inline static Flags selectRotation(void) { return Flags(56); } - virtual void display(std::ostream &os) const; public: diff --git a/include/sot/core/feature-visual-point.hh b/include/sot/core/feature-visual-point.hh index 9212bf149f44cb0717bf815366bcc5885b16e4cb..aaff6c8ec211741bfb37ae0ed7c2edd4653bf1cf 100644 --- a/include/sot/core/feature-visual-point.hh +++ b/include/sot/core/feature-visual-point.hh @@ -80,8 +80,8 @@ public: int time); /** Static Feature selection. */ - inline static Flags selectX(void) { return FLAG_LINE_1; } - inline static Flags selectY(void) { return FLAG_LINE_2; } + inline static Flags selectX(void) { return Flags("10"); } + inline static Flags selectY(void) { return Flags("01"); } virtual void display(std::ostream &os) const; };