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

Merge branch '17-adapt-to-new-generic-factors-api' into 'devel'

Resolve "Adapt to new generic factors API"

Closes #17

See merge request !27
parents d16f7425 e049ce55
No related branches found
No related tags found
3 merge requests!39release after RAL,!38After 2nd RAL submission,!27Resolve "Adapt to new generic factors API"
...@@ -34,3 +34,4 @@ build_release/ ...@@ -34,3 +34,4 @@ build_release/
IMU.found IMU.found
est.csv est.csv
/imu.found
...@@ -21,6 +21,7 @@ class FactorFixBias: public FactorAutodiff<FactorFixBias,6,3,3> ...@@ -21,6 +21,7 @@ class FactorFixBias: public FactorAutodiff<FactorFixBias,6,3,3>
public: public:
FactorFixBias(FeatureBasePtr _ftr_ptr, bool _apply_loss_function, FactorStatus _status = FAC_ACTIVE) : FactorFixBias(FeatureBasePtr _ftr_ptr, bool _apply_loss_function, FactorStatus _status = FAC_ACTIVE) :
FactorAutodiff<FactorFixBias, 6, 3, 3>("FactorFixBias", FactorAutodiff<FactorFixBias, 6, 3, 3>("FactorFixBias",
TOP_ABS,
_ftr_ptr, _ftr_ptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr,
...@@ -34,11 +35,6 @@ class FactorFixBias: public FactorAutodiff<FactorFixBias,6,3,3> ...@@ -34,11 +35,6 @@ class FactorFixBias: public FactorAutodiff<FactorFixBias,6,3,3>
virtual ~FactorFixBias() = default; virtual ~FactorFixBias() = default;
virtual std::string getTopology() const override
{
return std::string("ABS");
}
template<typename T> template<typename T>
bool operator ()(const T* const _ab, const T* const _wb, T* _residuals) const; bool operator ()(const T* const _ab, const T* const _wb, T* _residuals) const;
......
...@@ -25,11 +25,6 @@ class FactorImu : public FactorAutodiff<FactorImu, 15, 3, 4, 3, 6, 3, 4, 3, 6> ...@@ -25,11 +25,6 @@ class FactorImu : public FactorAutodiff<FactorImu, 15, 3, 4, 3, 6, 3, 4, 3, 6>
~FactorImu() override = default; ~FactorImu() override = default;
std::string getTopology() const override
{
return std::string("MOTION");
}
/** \brief : compute the residual from the state blocks being iterated by the solver. /** \brief : compute the residual from the state blocks being iterated by the solver.
-> computes the expected measurement -> computes the expected measurement
-> corrects actual measurement with new bias -> corrects actual measurement with new bias
...@@ -163,6 +158,7 @@ inline FactorImu::FactorImu(const FeatureImuPtr& _ftr_ptr, ...@@ -163,6 +158,7 @@ inline FactorImu::FactorImu(const FeatureImuPtr& _ftr_ptr,
FactorStatus _status) : FactorStatus _status) :
FactorAutodiff<FactorImu, 15, 3, 4, 3, 6, 3, 4, 3, 6>( // ... FactorAutodiff<FactorImu, 15, 3, 4, 3, 6, 3, 4, 3, 6>( // ...
"FactorImu", "FactorImu",
TOP_MOTION,
_ftr_ptr, _ftr_ptr,
_cap_origin_ptr->getFrame(), _cap_origin_ptr->getFrame(),
_cap_origin_ptr, _cap_origin_ptr,
......
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