Skip to content
Snippets Groups Projects
Commit 47c13471 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 !21
parents cf98cc9d 8010f42c
No related branches found
No related tags found
2 merge requests!24After 2nd RAL submission,!21Resolve "Adapt to new generic factors API"
...@@ -33,11 +33,6 @@ class FactorAhp : public FactorAutodiff<FactorAhp, 2, 3, 4, 3, 4, 4> ...@@ -33,11 +33,6 @@ class FactorAhp : public FactorAutodiff<FactorAhp, 2, 3, 4, 3, 4, 4>
~FactorAhp() override = default; ~FactorAhp() override = default;
std::string getTopology() const override
{
return std::string("LMK");
}
template<typename T> template<typename T>
void expectation(const T* const _current_frame_p, void expectation(const T* const _current_frame_p,
const T* const _current_frame_o, const T* const _current_frame_o,
...@@ -63,6 +58,7 @@ inline FactorAhp::FactorAhp(const FeatureBasePtr& _ftr_ptr, ...@@ -63,6 +58,7 @@ inline FactorAhp::FactorAhp(const FeatureBasePtr& _ftr_ptr,
bool _apply_loss_function, bool _apply_loss_function,
FactorStatus _status) : FactorStatus _status) :
FactorAutodiff<FactorAhp, 2, 3, 4, 3, 4, 4>("AHP", FactorAutodiff<FactorAhp, 2, 3, 4, 3, 4, 4>("AHP",
TOP_LMK,
_ftr_ptr, _ftr_ptr,
_landmark_ptr->getAnchorFrame(), _landmark_ptr->getAnchorFrame(),
nullptr, nullptr,
......
...@@ -21,11 +21,6 @@ class FactorEpipolar : public FactorAutodiff<FactorEpipolar, 1, 3, 4, 3, 4, 3, 4 ...@@ -21,11 +21,6 @@ class FactorEpipolar : public FactorAutodiff<FactorEpipolar, 1, 3, 4, 3, 4, 3, 4
~FactorEpipolar() override = default; ~FactorEpipolar() override = default;
std::string getTopology() const override
{
return std::string("GEOM");
}
template<typename T> template<typename T>
bool operator ()(const T* const _frame_own_p, bool operator ()(const T* const _frame_own_p,
const T* const _frame_own_o, const T* const _frame_own_o,
...@@ -47,6 +42,7 @@ inline FactorEpipolar::FactorEpipolar(const FeatureBasePtr& _feature_ptr, ...@@ -47,6 +42,7 @@ inline FactorEpipolar::FactorEpipolar(const FeatureBasePtr& _feature_ptr,
bool _apply_loss_function, bool _apply_loss_function,
FactorStatus _status) : FactorStatus _status) :
FactorAutodiff<FactorEpipolar, 1, 3, 4, 3, 4, 3, 4>("FEATURE EPIPOLAR", FactorAutodiff<FactorEpipolar, 1, 3, 4, 3, 4, 3, 4>("FEATURE EPIPOLAR",
TOP_GEOM,
_feature_ptr, _feature_ptr,
nullptr, nullptr,
nullptr, nullptr,
......
...@@ -32,11 +32,6 @@ class FactorPixelHp : public FactorAutodiff<FactorPixelHp, 2, 3, 4, 3, 4, 4> ...@@ -32,11 +32,6 @@ class FactorPixelHp : public FactorAutodiff<FactorPixelHp, 2, 3, 4, 3, 4, 4>
~FactorPixelHp() override = default; ~FactorPixelHp() override = default;
std::string getTopology() const override
{
return std::string("LMK");
}
template<typename T> template<typename T>
void expectation(const T* const _frame_p, void expectation(const T* const _frame_p,
const T* const _frame_o, const T* const _frame_o,
...@@ -62,6 +57,7 @@ inline FactorPixelHp::FactorPixelHp(const FeatureBasePtr& _ftr_ptr, ...@@ -62,6 +57,7 @@ inline FactorPixelHp::FactorPixelHp(const FeatureBasePtr& _ftr_ptr,
bool _apply_loss_function, bool _apply_loss_function,
FactorStatus _status) : FactorStatus _status) :
FactorAutodiff<FactorPixelHp, 2, 3, 4, 3, 4, 4>("PIXELHP", FactorAutodiff<FactorPixelHp, 2, 3, 4, 3, 4, 4>("PIXELHP",
TOP_LMK,
_ftr_ptr, _ftr_ptr,
nullptr, nullptr,
nullptr, nullptr,
......
...@@ -33,11 +33,6 @@ class FactorTrifocal : public FactorAutodiff<FactorTrifocal, 3, 3, 4, 3, 4, 3, 4 ...@@ -33,11 +33,6 @@ class FactorTrifocal : public FactorAutodiff<FactorTrifocal, 3, 3, 4, 3, 4, 3, 4
*/ */
~FactorTrifocal() override; ~FactorTrifocal() override;
std::string getTopology() const override
{
return std::string("GEOM");
}
FeatureBasePtr getFeaturePrev(); FeatureBasePtr getFeaturePrev();
const Vector3d& getPixelCanonical3() const const Vector3d& getPixelCanonical3() const
...@@ -151,6 +146,7 @@ FactorTrifocal::FactorTrifocal(const FeatureBasePtr& _feature_1_ptr, ...@@ -151,6 +146,7 @@ FactorTrifocal::FactorTrifocal(const FeatureBasePtr& _feature_1_ptr,
bool _apply_loss_function, bool _apply_loss_function,
FactorStatus _status) : FactorStatus _status) :
FactorAutodiff( "TRIFOCAL PLP", FactorAutodiff( "TRIFOCAL PLP",
TOP_GEOM,
_feature_own_ptr, _feature_own_ptr,
nullptr, nullptr,
nullptr, nullptr,
......
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