mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-05 01:33:03 +00:00
Code Issues Releases Wiki Activity

Add new carrier_smoothing_factor flag

Browse Source 
Fix some public/private dependency issues
Add enable_carrier_smoothing flag to position_test
This commit is contained in:
Carles Fernandez
2020-02-10 19:51:33 +01:00
parent 2dd993bbf2
commit d88cd25f03
12 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/algorithms/observables/adapters/CMakeLists.txt
View File

@@ -28,6 +28,7 @@ target_link_libraries(obs_adapters
obs_gr_blocks
algorithms_libs
PRIVATE
gnss_sdr_flags
observables_libs
Gflags::gflags
Glog::glog

12
src/algorithms/observables/adapters/hybrid_observables.cc
View File

@@ -20,11 +20,13 @@
#include "hybrid_observables.h"
#include "configuration_interface.h"
#include "gnss_sdr_flags.h"
#include "obs_conf.h"
#include <glog/logging.h>
#include <cmath> // for std::fabs
#include <limits> // for epsilon()
#include <ostream> // for operator<<
HybridObservables::HybridObservables(ConfigurationInterface* configuration,
const std::string& role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
{
@@ -41,9 +43,13 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration,
conf.dump_filename = dump_filename_;
conf.nchannels_in = in_streams_;
conf.nchannels_out = out_streams_;
conf.enable_carrier_smoothing = configuration->property(role + ".enable_carrier_smoothing", conf.enable_carrier_smoothing);
if (std::fabs(FLAGS_carrier_smoothing_factor - DEFAULT_CARRIER_SMOOTHING_FACTOR) <= std::numeric_limits<double>::epsilon()) // compare doubles
{
conf.smoothing_factor = configuration->property(role + ".smoothing_factor", conf.smoothing_factor);
}
conf.enable_carrier_smoothing = configuration->property(role + ".enable_carrier_smoothing", false);
conf.smoothing_factor = configuration->property(role + ".smoothing_factor", 200.0);
if (conf.enable_carrier_smoothing == true)
{
LOG(INFO) << "Observables carrier smoothing enabled with smoothing factor " << conf.smoothing_factor;

5
src/algorithms/observables/libs/CMakeLists.txt
View File

@@ -18,6 +18,11 @@ add_library(observables_libs
${OBSERVABLES_LIB_HEADERS}
)
target_link_libraries(observables_libs
PRIVATE
gnss_sdr_flags
)
if(ENABLE_CLANG_TIDY)
if(CLANG_TIDY_EXE)
set_target_properties(observables_libs

3
src/algorithms/observables/libs/obs_conf.cc
View File

@@ -19,11 +19,12 @@
*/
#include "obs_conf.h"
#include "gnss_sdr_flags.h"
Obs_Conf::Obs_Conf()
{
enable_carrier_smoothing = false;
smoothing_factor = 200;
smoothing_factor = FLAGS_carrier_smoothing_factor;
nchannels_in = 0;
nchannels_out = 0;
dump = false;