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

parameter name changed

parent fc7932c7
No related branches found
No related tags found
1 merge request!448Draft: Resolve "Implementation of new nodes creation"
Pipeline #20322 failed
...@@ -150,7 +150,7 @@ int main() ...@@ -150,7 +150,7 @@ int main()
params_prc_odo["keyframe_vote"]["max_time_span"] = 999; params_prc_odo["keyframe_vote"]["max_time_span"] = 999;
params_prc_odo["keyframe_vote"]["max_dist_traveled"] = 0.95; // Will make KFs automatically every 1m displacement params_prc_odo["keyframe_vote"]["max_dist_traveled"] = 0.95; // Will make KFs automatically every 1m displacement
params_prc_odo["keyframe_vote"]["max_angle_turned"] = 999; params_prc_odo["keyframe_vote"]["max_angle_turned"] = 999;
params_prc_odo["keyframe_vote"]["cov_det"] = 999; params_prc_odo["keyframe_vote"]["max_cov_det"] = 999;
params_prc_odo["keyframe_vote"]["max_buff_length"] = 999; params_prc_odo["keyframe_vote"]["max_buff_length"] = 999;
params_prc_odo["state_provider"] = true; params_prc_odo["state_provider"] = true;
params_prc_odo["state_provider_order"] = 1; params_prc_odo["state_provider_order"] = 1;
......
...@@ -8,7 +8,7 @@ keyframe_vote: ...@@ -8,7 +8,7 @@ keyframe_vote:
max_dist_traveled: 0.95 max_dist_traveled: 0.95
max_angle_turned: 999 max_angle_turned: 999
max_buff_length: 999 max_buff_length: 999
cov_det: 999 max_cov_det: 999
apply_loss_function: true apply_loss_function: true
state_provider: true state_provider: true
......
...@@ -34,12 +34,12 @@ class ProcessorOdom2d : public ProcessorMotion ...@@ -34,12 +34,12 @@ class ProcessorOdom2d : public ProcessorMotion
public: public:
ProcessorOdom2d(const YAML::Node& _params); ProcessorOdom2d(const YAML::Node& _params);
~ProcessorOdom2d() override; ~ProcessorOdom2d() override;
void configure(SensorBasePtr _sensor) override{}; void configure(SensorBasePtr _sensor) override {};
// Factory method for high level API // Factory method for high level API
WOLF_PROCESSOR_CREATE(ProcessorOdom2d); WOLF_PROCESSOR_CREATE(ProcessorOdom2d);
double getCovDet() const; double getMaxCovDet() const;
bool voteForKeyFrame() const override; bool voteForKeyFrame() const override;
protected: protected:
...@@ -101,9 +101,9 @@ inline VectorXd ProcessorOdom2d::getCalibration(const CaptureBaseConstPtr _captu ...@@ -101,9 +101,9 @@ inline VectorXd ProcessorOdom2d::getCalibration(const CaptureBaseConstPtr _captu
inline void ProcessorOdom2d::setCalibration(const CaptureBasePtr _capture, const VectorXd& _calibration) {} inline void ProcessorOdom2d::setCalibration(const CaptureBasePtr _capture, const VectorXd& _calibration) {}
inline double ProcessorOdom2d::getCovDet() const inline double ProcessorOdom2d::getMaxCovDet() const
{ {
return params_["keyframe_vote"]["cov_det"].as<double>(); return params_["keyframe_vote"]["max_cov_det"].as<double>();
} }
} // namespace wolf } // namespace wolf
follow: ProcessorMotion.schema follow: ProcessorMotion.schema
keyframe_vote: keyframe_vote:
cov_det: max_cov_det:
_mandatory: $voting_active _mandatory: $voting_active
_type: double _type: double
_doc: The determinant threshold of the covariance matrix of the integrated delta, to vote for a keyframe. _doc: The determinant threshold of the covariance matrix of the integrated delta, to vote for a keyframe.
\ No newline at end of file
...@@ -138,7 +138,7 @@ bool ProcessorOdom2d::voteForKeyFrame() const ...@@ -138,7 +138,7 @@ bool ProcessorOdom2d::voteForKeyFrame() const
return true; return true;
} }
// Uncertainty criterion // Uncertainty criterion
if (getBuffer().back().delta_integr_cov_.determinant() > getCovDet()) if (getBuffer().back().delta_integr_cov_.determinant() > getMaxCovDet())
{ {
WOLF_DEBUG("PM", id(), " ", getType(), " votes per state covariance"); WOLF_DEBUG("PM", id(), " ", getType(), " votes per state covariance");
return true; return true;
......
...@@ -82,7 +82,7 @@ class ProcessorMotion_test : public testing::Test ...@@ -82,7 +82,7 @@ class ProcessorMotion_test : public testing::Test
params["keyframe_vote"]["max_dist_traveled"] = 100; params["keyframe_vote"]["max_dist_traveled"] = 100;
params["keyframe_vote"]["max_angle_turned"] = 6.28; params["keyframe_vote"]["max_angle_turned"] = 6.28;
params["keyframe_vote"]["max_time_span"] = 2.5 * dt; // force KF at every third process() params["keyframe_vote"]["max_time_span"] = 2.5 * dt; // force KF at every third process()
params["keyframe_vote"]["cov_det"] = 100; params["keyframe_vote"]["max_cov_det"] = 100;
params["unmeasured_perturbation_std"] = 0.001; params["unmeasured_perturbation_std"] = 0.001;
// install processor // install processor
......
...@@ -11,7 +11,7 @@ keyframe_vote: ...@@ -11,7 +11,7 @@ keyframe_vote:
max_buff_length: 99 # motion deltas max_buff_length: 99 # motion deltas
max_dist_traveled: 99 # meters max_dist_traveled: 99 # meters
max_angle_turned: 99 # radians (1 rad approx 57 deg, approx 60 deg) max_angle_turned: 99 # radians (1 rad approx 57 deg, approx 60 deg)
cov_det: 99 max_cov_det: 99
unmeasured_perturbation_std: 0.001 unmeasured_perturbation_std: 0.001
......
...@@ -11,7 +11,7 @@ keyframe_vote: ...@@ -11,7 +11,7 @@ keyframe_vote:
max_buff_length: 100 # motion deltas max_buff_length: 100 # motion deltas
max_dist_traveled: 100 # meters max_dist_traveled: 100 # meters
max_angle_turned: 1.963495 # radians (1 rad approx 57 deg, approx 60 deg) max_angle_turned: 1.963495 # radians (1 rad approx 57 deg, approx 60 deg)
cov_det: 100 # determinant of covariance threshold max_cov_det: 100 # determinant of covariance threshold
unmeasured_perturbation_std: 0.001 unmeasured_perturbation_std: 0.001
......
...@@ -11,7 +11,7 @@ keyframe_vote: ...@@ -11,7 +11,7 @@ keyframe_vote:
max_buff_length: 100 #10 # motion deltas max_buff_length: 100 #10 # motion deltas
max_dist_traveled: 100 #0.5 # meters max_dist_traveled: 100 #0.5 # meters
max_angle_turned: 0.1 # radians (1 rad approx 57 deg, approx 60 deg) max_angle_turned: 0.1 # radians (1 rad approx 57 deg, approx 60 deg)
cov_det: 100 #1 # determinant of covariance threshold max_cov_det: 100 #1 # determinant of covariance threshold
unmeasured_perturbation_std: 0.001 unmeasured_perturbation_std: 0.001
......
...@@ -8,7 +8,7 @@ keyframe_vote: ...@@ -8,7 +8,7 @@ keyframe_vote:
max_buff_length: 0 # MANDATORY if $voting_active - DOC Maximum size of the buffer of motions. - TYPE unsigned int max_buff_length: 0 # MANDATORY if $voting_active - DOC Maximum size of the buffer of motions. - TYPE unsigned int
max_dist_traveled: 0.0 # MANDATORY if $voting_active - DOC Distance traveled threshold to create a new frame [m]. - TYPE double max_dist_traveled: 0.0 # MANDATORY if $voting_active - DOC Distance traveled threshold to create a new frame [m]. - TYPE double
max_angle_turned: 0.0 # MANDATORY if $voting_active - DOC Angle turned threshold to create a new frame [rad]. - TYPE double max_angle_turned: 0.0 # MANDATORY if $voting_active - DOC Angle turned threshold to create a new frame [rad]. - TYPE double
cov_det: 0.0 # MANDATORY if $voting_active - DOC The determinant threshold of the covariance matrix of the integrated delta, to vote for a keyframe. - TYPE double max_cov_det: 0.0 # MANDATORY if $voting_active - DOC The determinant threshold of the covariance matrix of the integrated delta, to vote for a keyframe. - TYPE double
apply_loss_function: false # DOC If the factors created by the processor have loss function. - TYPE bool apply_loss_function: false # DOC If the factors created by the processor have loss function. - TYPE bool
state_provider: false # DOC If the processor is used by the problem as provider of state. - TYPE bool state_provider: false # DOC If the processor is used by the problem as provider of state. - TYPE bool
state_provider_order: 0.0 # MANDATORY if $state_provider - DOC The order number of this processor when problem gets the state (only used if state_provider = true). Two processors cannot have the same priority (if so, when installing the second is increased). - TYPE double state_provider_order: 0.0 # MANDATORY if $state_provider - DOC The order number of this processor when problem gets the state (only used if state_provider = true). Two processors cannot have the same priority (if so, when installing the second is increased). - TYPE double
......
...@@ -8,7 +8,7 @@ keyframe_vote: ...@@ -8,7 +8,7 @@ keyframe_vote:
max_buff_length: 0 # MANDATORY if $voting_active - DOC Maximum size of the buffer of motions. - TYPE unsigned int max_buff_length: 0 # MANDATORY if $voting_active - DOC Maximum size of the buffer of motions. - TYPE unsigned int
max_dist_traveled: 0.0 # MANDATORY if $voting_active - DOC Distance traveled threshold to create a new frame [m]. - TYPE double max_dist_traveled: 0.0 # MANDATORY if $voting_active - DOC Distance traveled threshold to create a new frame [m]. - TYPE double
max_angle_turned: 0.0 # MANDATORY if $voting_active - DOC Angle turned threshold to create a new frame [rad]. - TYPE double max_angle_turned: 0.0 # MANDATORY if $voting_active - DOC Angle turned threshold to create a new frame [rad]. - TYPE double
cov_det: 0.0 # MANDATORY if $voting_active - DOC The determinant threshold of the covariance matrix of the integrated delta, to vote for a keyframe. - TYPE double max_cov_det: 0.0 # MANDATORY if $voting_active - DOC The determinant threshold of the covariance matrix of the integrated delta, to vote for a keyframe. - TYPE double
apply_loss_function: false # DOC If the factors created by the processor have loss function. - TYPE bool apply_loss_function: false # DOC If the factors created by the processor have loss function. - TYPE bool
state_provider: false # DOC If the processor is used by the problem as provider of state. - TYPE bool state_provider: false # DOC If the processor is used by the problem as provider of state. - TYPE bool
state_provider_order: 0.0 # MANDATORY if $state_provider - DOC The order number of this processor when problem gets the state (only used if state_provider = true). Two processors cannot have the same priority (if so, when installing the second is increased). - TYPE double state_provider_order: 0.0 # MANDATORY if $state_provider - DOC The order number of this processor when problem gets the state (only used if state_provider = true). Two processors cannot have the same priority (if so, when installing the second is increased). - TYPE double
......
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