Skip to content
Snippets Groups Projects
Commit 7179acd8 authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge branch '9-adapt-to-state-block-map' into 'devel'

Resolve "Adapt to  state block map"

Closes #9

See merge request !15
parents 77be90ad 4d3504fb
No related branches found
No related tags found
3 merge requests!30Release after RAL,!29After 2nd RAL submission,!15Resolve "Adapt to state block map"
...@@ -207,7 +207,7 @@ std::map<Scalar, CapturesAligned> ProcessorCloseLoopICP::evaluateCandidates(Fram ...@@ -207,7 +207,7 @@ std::map<Scalar, CapturesAligned> ProcessorCloseLoopICP::evaluateCandidates(Fram
icp_tools_ptr_->align(capture_laser_own->getScan(), capture_laser_other->getScan(), sensor_own->getScanParams(), icp_tools_ptr_->align(capture_laser_own->getScan(), capture_laser_other->getScan(), sensor_own->getScanParams(),
sensor_other->getScanParams(), this->icp_params_, transform_guess); sensor_other->getScanParams(), this->icp_params_, transform_guess);
Scalar points_coeff_used = Scalar points_coeff_used =
((Scalar)trf.nvalid / (Scalar)min(capture_laser_own->getScan().ranges_raw_.size(), capture_laser_other->getScan().ranges_raw_.size())); ((Scalar)trf.nvalid / (Scalar)fmin(capture_laser_own->getScan().ranges_raw_.size(), capture_laser_other->getScan().ranges_raw_.size()));
Scalar mean_error = trf.error / trf.nvalid; Scalar mean_error = trf.error / trf.nvalid;
WOLF_INFO("DBG ------------------------------"); WOLF_INFO("DBG ------------------------------");
WOLF_INFO("DBG valid? ", trf.valid, " m_er ", mean_error, " ", points_coeff_used*100, "% own_id: ", _keyframe_own->id(), " other_id: ", _keyframe_other->id()); WOLF_INFO("DBG valid? ", trf.valid, " m_er ", mean_error, " ", points_coeff_used*100, "% own_id: ", _keyframe_own->id(), " other_id: ", _keyframe_other->id());
......
...@@ -1311,7 +1311,8 @@ void ProcessorTrackerFeaturePolyline2D::computeTransformations() ...@@ -1311,7 +1311,8 @@ void ProcessorTrackerFeaturePolyline2D::computeTransformations()
Eigen::Matrix2s R_world_robot_last = Eigen::Rotation2Ds(vehicle_pose_last(2)).matrix(); Eigen::Matrix2s R_world_robot_last = Eigen::Rotation2Ds(vehicle_pose_last(2)).matrix();
// robot_sensor (to be computed once if extrinsics are fixed and not dynamic) // robot_sensor (to be computed once if extrinsics are fixed and not dynamic)
if (getSensor()->isExtrinsicDynamic() || if (getSensor()->isStateBlockDynamic("P") ||
getSensor()->isStateBlockDynamic("O") ||
!getSensor()->getP()->isFixed() || !getSensor()->getP()->isFixed() ||
!getSensor()->getO()->isFixed() || !getSensor()->getO()->isFixed() ||
!extrinsics_transformation_computed_) !extrinsics_transformation_computed_)
......
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