Skip to content
Snippets Groups Projects
Commit 8d8cc537 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

hotfix

parent c72ef7f2
No related branches found
No related tags found
3 merge requests!476spdlog version upgrade,!473Rerefactor,!472Merge ProcessorLandmarkExternal
Pipeline #17502 failed
...@@ -188,8 +188,6 @@ inline void LandmarkBase::setTrackId(unsigned int _track_id) ...@@ -188,8 +188,6 @@ inline void LandmarkBase::setTrackId(unsigned int _track_id)
track_id_ = _track_id; track_id_ = _track_id;
} }
inline unsigned int LandmarkBase::getHits() const inline unsigned int LandmarkBase::getHits() const
{ {
return constrained_by_list_.size(); return constrained_by_list_.size();
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
// //
//--------LICENSE_END-------- //--------LICENSE_END--------
#pragma once #ifndef LANDMARK_EXTERNAL_H_
#define LANDMARK_EXTERNAL_H_
// Wolf includes // Wolf includes
#include "core/landmark/landmark_base.h" #include "core/landmark/landmark_base.h"
...@@ -64,24 +65,25 @@ class LandmarkExternal : public LandmarkBase ...@@ -64,24 +65,25 @@ class LandmarkExternal : public LandmarkBase
int getExternalType() const; int getExternalType() const;
}; };
void LandmarkExternal::setExternalId(const int& _external_id) inline void LandmarkExternal::setExternalId(const int& _external_id)
{ {
external_id_ = _external_id; external_id_ = _external_id;
} }
int LandmarkExternal::getExternalId() const inline int LandmarkExternal::getExternalId() const
{ {
return external_id_; return external_id_;
} }
void LandmarkExternal::setExternalType(const int& _external_type) inline void LandmarkExternal::setExternalType(const int& _external_type)
{ {
external_type_ = _external_type; external_type_ = _external_type;
} }
int LandmarkExternal::getExternalType() const inline int LandmarkExternal::getExternalType() const
{ {
return external_type_; return external_type_;
} }
} // namespace wolf } // namespace wolf
#endif
\ No newline at end of file
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
// //
//--------LICENSE_END-------- //--------LICENSE_END--------
#pragma once #ifndef PROCESSOR_LANDMARK_EXTERNAL_H_
#define PROCESSOR_LANDMARK_EXTERNAL_H_
#include "core/common/wolf.h" #include "core/common/wolf.h"
#include "core/processor/processor_tracker.h" #include "core/processor/processor_tracker.h"
...@@ -71,7 +72,7 @@ class ProcessorLandmarkExternal : public ProcessorTracker ...@@ -71,7 +72,7 @@ class ProcessorLandmarkExternal : public ProcessorTracker
{ {
public: public:
ProcessorLandmarkExternal(ParamsProcessorLandmarkExternalPtr _params_tracker_feature); ProcessorLandmarkExternal(ParamsProcessorLandmarkExternalPtr _params_tracker_feature);
~ProcessorLandmarkExternal() override; ~ProcessorLandmarkExternal() override{};
// Factory method for high level API // Factory method for high level API
WOLF_PROCESSOR_CREATE(ProcessorLandmarkExternal, ParamsProcessorLandmarkExternal); WOLF_PROCESSOR_CREATE(ProcessorLandmarkExternal, ParamsProcessorLandmarkExternal);
...@@ -163,9 +164,6 @@ inline ProcessorLandmarkExternal::ProcessorLandmarkExternal(ParamsProcessorLandm ...@@ -163,9 +164,6 @@ inline ProcessorLandmarkExternal::ProcessorLandmarkExternal(ParamsProcessorLandm
// //
} }
inline ProcessorLandmarkExternal::~ProcessorLandmarkExternal()
{
//
}
} // namespace wolf } // namespace wolf
#endif
\ No newline at end of file
...@@ -487,17 +487,17 @@ TEST_F(ProcessorLandmarkExternalTest, P_2d_existing_lmks_id) ...@@ -487,17 +487,17 @@ TEST_F(ProcessorLandmarkExternalTest, P_2d_existing_lmks_id)
// true); // bool init_landmarks // true); // bool init_landmarks
// } // }
TEST_F(ProcessorLandmarkExternalTest, P_2d_no_lmks_id) // TEST_F(ProcessorLandmarkExternalTest, P_2d_no_lmks_id)
{ // {
testConfiguration(2, // int dim // testConfiguration(2, // int dim
false, // bool orientation // false, // bool orientation
0, // int mode // 0, // int mode
0, // double quality_th // 0, // double quality_th
1e6, // double dist_th // 1e6, // double dist_th
2, // int track_length // 2, // int track_length
4.5 * dt, // double time_span // 4.5 * dt, // double time_span
false); // bool init_landmarks // false); // bool init_landmarks
} // }
// TEST_F(ProcessorLandmarkExternalTest, P_2d_no_lmks_type) // TEST_F(ProcessorLandmarkExternalTest, P_2d_no_lmks_type)
// { // {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment