From e9aa46fc58ff2fd7a3dff0c19b382eebc57411c6 Mon Sep 17 00:00:00 2001 From: "M.A.Gomez" Date: Sun, 9 Oct 2022 22:35:45 +0000 Subject: [PATCH] MOD: add n_sats, type namechange for readability (colvec from vec) --- src/algorithms/PVT/libs/vtl_data.cc | 3 ++- src/algorithms/PVT/libs/vtl_data.h | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/algorithms/PVT/libs/vtl_data.cc b/src/algorithms/PVT/libs/vtl_data.cc index 58b5ebcfe..9cd1fef4d 100755 --- a/src/algorithms/PVT/libs/vtl_data.cc +++ b/src/algorithms/PVT/libs/vtl_data.cc @@ -30,7 +30,8 @@ void Vtl_Data::init_storage(int n_sats) sat_dts = arma::mat(n_sats, 2); sat_var = arma::vec(n_sats); sat_health_flag = arma::vec(n_sats); - + int sat_number = n_sats; + pr_m = arma::vec(n_sats); doppler_hz = arma::vec(n_sats); carrier_phase_rads = arma::vec(n_sats); diff --git a/src/algorithms/PVT/libs/vtl_data.h b/src/algorithms/PVT/libs/vtl_data.h index a35dd7502..d63dc865b 100755 --- a/src/algorithms/PVT/libs/vtl_data.h +++ b/src/algorithms/PVT/libs/vtl_data.h @@ -36,17 +36,18 @@ public: arma::mat sat_p; // Satellite ECEF Position [m] arma::mat sat_v; // Satellite Velocity [m/s] arma::mat sat_dts; // Satellite clock bias and drift [s,s/s] - arma::vec sat_var; // sat position and clock error variance [m^2] - arma::vec sat_health_flag; // sat health flag (0 is ok) - - arma::vec pr_m; // Satellite Code pseudoranges [m] - arma::vec doppler_hz; // satellite Carrier Dopplers [Hz] - arma::vec carrier_phase_rads; // satellite accumulated carrier phases [rads] + arma::colvec sat_var; // sat position and clock error variance [m^2] + arma::colvec sat_health_flag; // sat health flag (0 is ok) + int sat_number; // on-view sat number + + arma::colvec pr_m; // Satellite Code pseudoranges [m] + arma::colvec doppler_hz; // satellite Carrier Dopplers [Hz] + arma::colvec carrier_phase_rads; // satellite accumulated carrier phases [rads] arma::mat rx_p; // Receiver ENU Position [m] arma::mat rx_v; // Receiver Velocity [m/s] arma::mat rx_dts; // Receiver clock bias and drift [s,s/s] - arma::vec rx_var; // Receiver position and clock error variance [m^2] + arma::colvec rx_var; // Receiver position and clock error variance [m^2] // time handling double epoch_tow_s; // current observation RX time [s] uint64_t sample_counter; // current sample counter associated with RX time [samples from start]