From 75e549868e2720de741b25caa94dfcf4e24add06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Mon, 8 Aug 2022 15:33:40 +0200
Subject: [PATCH] remove refs to "preint" in doc and some var names
---
demos/solo_real_povcdl_estimation.cpp | 4 +--
.../feature/feature_force_torque.h | 2 +-
.../processor_force_torque_inertial.h | 2 +-
src/processor/processor_force_torque.cpp | 30 +++++++++----------
.../processor_force_torque_inertial.cpp | 2 +-
...ocessor_force_torque_inertial_dynamics.cpp | 2 +-
test/gtest_processor_force_torque.cpp | 6 ++--
.../gtest_processor_force_torque_inertial.cpp | 2 +-
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/demos/solo_real_povcdl_estimation.cpp b/demos/solo_real_povcdl_estimation.cpp
index 4c5d6f0..181fc3d 100644
--- a/demos/solo_real_povcdl_estimation.cpp
+++ b/demos/solo_real_povcdl_estimation.cpp
@@ -298,7 +298,7 @@ int main (int argc, char **argv) {
params_sen_ft->voting_active = false;
ProcessorBasePtr proc_ft_base = problem->installProcessor("ProcessorForceTorque", "PFT", sen_ft, params_sen_ft);
// ProcessorBasePtr proc_ft_base = problem->installProcessor("ProcessorForceTorque", "PFT", "SenFT", bodydynamics_root_dir + "/demos/processor_ft_preint.yaml");
- ProcessorForceTorquePtr proc_ftpreint = std::static_pointer_cast<ProcessorForceTorque>(proc_ft_base);
+ ProcessorForceTorquePtr proc_ft = std::static_pointer_cast<ProcessorForceTorque>(proc_ft_base);
// SENSOR + PROCESSOR POINT FEET NOMOVE
ParamsSensorPointFeetNomovePtr intr_pfn = std::make_shared<ParamsSensorPointFeetNomove>();
@@ -355,7 +355,7 @@ int main (int argc, char **argv) {
VectorXd meas_ikin(9); meas_ikin << i_p_ic, i_v_ic, i_omg_oi;
auto CIKin0 = std::make_shared<CaptureInertialKinematics>(t0, sen_ikin, meas_ikin, i_Iw, i_Lc_gesti);
CIKin0->process();
- proc_ftpreint->setOrigin(KF1);
+ proc_ft->setOrigin(KF1);
////////////////////////////////////////////
// INITIAL BIAS FACTORS
diff --git a/include/bodydynamics/feature/feature_force_torque.h b/include/bodydynamics/feature/feature_force_torque.h
index cf2018c..c9fdd98 100644
--- a/include/bodydynamics/feature/feature_force_torque.h
+++ b/include/bodydynamics/feature/feature_force_torque.h
@@ -44,7 +44,7 @@ class FeatureForceTorque : public FeatureBase
* \param _J_delta_bias Jacobians of preintegrated delta wrt [pbc,gyro] biases
* \param _pbc_bias COM position relative to bias bias of origin frame time
* \param _gyro_bias gyroscope bias of origin frame time
- * \param _cap_ftpreint_ptr pointer to parent CaptureMotion (CaptureForceTorque)
+ * \param _cap_ft_ptr pointer to parent CaptureMotion (CaptureForceTorque)
*/
FeatureForceTorque(const Eigen::VectorXd& _delta_preintegrated,
const Eigen::MatrixXd& _delta_preintegrated_covariance,
diff --git a/include/bodydynamics/processor/processor_force_torque_inertial.h b/include/bodydynamics/processor/processor_force_torque_inertial.h
index d95dd4e..616411f 100644
--- a/include/bodydynamics/processor/processor_force_torque_inertial.h
+++ b/include/bodydynamics/processor/processor_force_torque_inertial.h
@@ -20,7 +20,7 @@
//
//--------LICENSE_END--------
/*
- * processor_preintegrator_force_torque_inertial.h
+ * processor_force_torque_inertial.h
*
* Created on: Aug 19, 2021
* Author: jsola
diff --git a/src/processor/processor_force_torque.cpp b/src/processor/processor_force_torque.cpp
index 4f7b6a0..8afdfe3 100644
--- a/src/processor/processor_force_torque.cpp
+++ b/src/processor/processor_force_torque.cpp
@@ -111,10 +111,10 @@ CaptureMotionPtr ProcessorForceTorque::emplaceCapture(const FrameBasePtr& _frame
// Cannot be recovered from the _calib and _calib_preint which are initialized using calib_size_
// which is zero in our case since the calibration stateblocks are not actually in the FTPreint sensor/captures
- auto cap_ftpreint = std::static_pointer_cast<CaptureForceTorque>(cap);
- Vector6d calib = getCalibration(cap_ftpreint);
- setCalibration(cap_ftpreint, calib);
- cap_ftpreint->setCalibrationPreint(calib);
+ auto cap_ft = std::static_pointer_cast<CaptureForceTorque>(cap);
+ Vector6d calib = getCalibration(cap_ft);
+ setCalibration(cap_ft, calib);
+ cap_ft->setCalibrationPreint(calib);
return cap;
}
@@ -178,20 +178,20 @@ void ProcessorForceTorque::setCalibration (const CaptureBasePtr _capture, const
FactorBasePtr ProcessorForceTorque::emplaceFactor(FeatureBasePtr _feature_motion, CaptureBasePtr _capture_origin)
{
- CaptureForceTorquePtr cap_ftpreint_origin = std::static_pointer_cast<CaptureForceTorque>(_capture_origin);
- FeatureForceTorquePtr ftr_ftpreint = std::static_pointer_cast<FeatureForceTorque>(_feature_motion);
- CaptureForceTorquePtr cap_ftpreint_new = std::static_pointer_cast<CaptureForceTorque>(ftr_ftpreint->getCapture());
-
- auto fac_ftpreint = FactorBase::emplace<FactorForceTorque>(
- ftr_ftpreint,
- ftr_ftpreint,
- cap_ftpreint_origin,
+ CaptureForceTorquePtr cap_ft_origin = std::static_pointer_cast<CaptureForceTorque>(_capture_origin);
+ FeatureForceTorquePtr ftr_ft = std::static_pointer_cast<FeatureForceTorque>(_feature_motion);
+ CaptureForceTorquePtr cap_ft_new = std::static_pointer_cast<CaptureForceTorque>(ftr_ft->getCapture());
+
+ auto fac_ft = FactorBase::emplace<FactorForceTorque>(
+ ftr_ft,
+ ftr_ft,
+ cap_ft_origin,
shared_from_this(),
- cap_ftpreint_origin->getIkinCaptureOther(), // to retrieve sb_bp1
- cap_ftpreint_origin->getGyroCaptureOther(), // to retrieve sb_w1
+ cap_ft_origin->getIkinCaptureOther(), // to retrieve sb_bp1
+ cap_ft_origin->getGyroCaptureOther(), // to retrieve sb_w1
false);
- return fac_ftpreint;
+ return fac_ft;
}
void ProcessorForceTorque::computeCurrentDelta(
diff --git a/src/processor/processor_force_torque_inertial.cpp b/src/processor/processor_force_torque_inertial.cpp
index 715b3a1..0e2720f 100644
--- a/src/processor/processor_force_torque_inertial.cpp
+++ b/src/processor/processor_force_torque_inertial.cpp
@@ -20,7 +20,7 @@
//
//--------LICENSE_END--------
/*
- * processor_preintegrator_force_torque_inertial.cpp
+ * processor_force_torque_inertial.cpp
*
* Created on: Aug 19, 2021
* Author: jsola
diff --git a/src/processor/processor_force_torque_inertial_dynamics.cpp b/src/processor/processor_force_torque_inertial_dynamics.cpp
index d057966..31380dc 100644
--- a/src/processor/processor_force_torque_inertial_dynamics.cpp
+++ b/src/processor/processor_force_torque_inertial_dynamics.cpp
@@ -20,7 +20,7 @@
//
//--------LICENSE_END--------
/*
- * processor_preintegrator_force_torque_inertial_dynamics.cpp
+ * processor_force_torque_inertial_dynamics.cpp
*
* Created on: Aug 1, 2022
* Author: asanjuan
diff --git a/test/gtest_processor_force_torque.cpp b/test/gtest_processor_force_torque.cpp
index 6747c4a..b00181b 100644
--- a/test/gtest_processor_force_torque.cpp
+++ b/test/gtest_processor_force_torque.cpp
@@ -92,7 +92,7 @@ public:
SensorForceTorquePtr sen_ft_;
ProcessorImuPtr proc_imu_;
ProcessorInertialKinematicsPtr proc_inkin_;
- ProcessorForceTorquePtr proc_ftpreint_;
+ ProcessorForceTorquePtr proc_ft_;
FrameBasePtr KF1_;
void SetUp() override
@@ -152,7 +152,7 @@ public:
params_sen_ft->voting_active = true;
ProcessorBasePtr proc_ft_base = problem_->installProcessor("ProcessorForceTorque", "PFT", sen_ft_, params_sen_ft);
// ProcessorBasePtr proc_ft_base = problem_->installProcessor("ProcessorForceTorque", "PFT", "SenFT", bodydynamics_root_dir + "/demos/processor_ft_preint");
- proc_ftpreint_ = std::static_pointer_cast<ProcessorForceTorque>(proc_ft_base);
+ proc_ft_ = std::static_pointer_cast<ProcessorForceTorque>(proc_ft_base);
}
void TearDown() override {}
@@ -246,7 +246,7 @@ public:
proc_imu_->setOrigin(KF1_);
auto CIKin0 = std::make_shared<CaptureInertialKinematics>(t0_, sen_ikin_, meas_ikin_, Iq_, Lq_);
CIKin0->process();
- proc_ftpreint_->setOrigin(KF1_);
+ proc_ft_->setOrigin(KF1_);
// T1
CaptureImuPtr CImu1 = std::make_shared<CaptureImu>(t1, sen_imu_, acc_gyr_meas_, acc_gyr_cov_);
diff --git a/test/gtest_processor_force_torque_inertial.cpp b/test/gtest_processor_force_torque_inertial.cpp
index bc17e37..b8be3e2 100644
--- a/test/gtest_processor_force_torque_inertial.cpp
+++ b/test/gtest_processor_force_torque_inertial.cpp
@@ -20,7 +20,7 @@
//
//--------LICENSE_END--------
/*
- * gtest_processor_preintegrator_force_torque_inertial.cpp
+ * gtest_processor_force_torque_inertial.cpp
*
* Created on: Aug 19, 2021
* Author: jsola
--
GitLab