Cleaning includes

plus some code cleaning

src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc

@@ -30,8 +30,6 @@
  */
 
 #include "galileo_e1_pcps_8ms_ambiguous_acquisition.h"
-#include <iostream>
-#include <string>
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
@@ -68,7 +66,6 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
             LOG(WARNING) << "coherent_integration_time should be multiple of "
                                      << "Galileo code length (4 ms). coherent_integration_time = "
                                      << sampled_ms_ << " ms will be used.";
-
         }
 
     max_dwells_ = configuration_->property(role + ".max_dwells", 1);

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc

@@ -30,7 +30,6 @@
  */
 
 #include "galileo_e1_pcps_ambiguous_acquisition.h"
-#include <iostream>
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc

@@ -30,11 +30,9 @@
  */
 
 #include "galileo_e1_pcps_cccwsr_ambiguous_acquisition.h"
-#include <iostream>
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <volk/volk.h>
 #include "galileo_e1_signal_processing.h"
 #include "Galileo_E1.h"
 #include "configuration_interface.h"

src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc

@@ -30,11 +30,9 @@
  */
 
 #include "galileo_e1_pcps_quicksync_ambiguous_acquisition.h"
-#include <iostream>
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <cmath>
 #include "galileo_e1_signal_processing.h"
 #include "Galileo_E1.h"
 #include "configuration_interface.h"

src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc

@@ -30,7 +30,6 @@
  */
 
 #include "galileo_e1_pcps_tong_ambiguous_acquisition.h"
-#include <iostream>
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc

@@ -36,12 +36,9 @@
  */
 
 #include "galileo_e5a_noncoherent_iq_acquisition_caf.h"
-#include <iostream>
 #include <boost/lexical_cast.hpp>
-#include <stdexcept>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include "galileo_e5_signal_processing.h"
 #include "Galileo_E5a.h"
 #include "configuration_interface.h"

src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h

@@ -60,6 +60,7 @@ public:
     {
         return role_;
     }
+
     /*!
      * \brief Returns "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF"
      */
@@ -67,6 +68,7 @@ public:
     {
         return "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF";
     }
+
     size_t item_size()
     {
         return item_size_;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc

@@ -34,11 +34,8 @@
  */
 
 #include "gps_l1_ca_pcps_acquisition.h"
-#include <iostream>
-#include <stdexcept>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
@@ -310,7 +307,6 @@ void GpsL1CaPcpsAcquisition::connect(gr::top_block_sptr top_block)
         {
             LOG(WARNING) << item_type_ << " unknown acquisition item type";
         }
-
 }
 
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc

@@ -34,7 +34,6 @@
 
 #include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
@@ -53,7 +52,6 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
     DLOG(INFO) << "role " << role;
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
-
     fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
     if_ = configuration->property(role + ".ifreq", 0);
     dump_ = configuration->property(role + ".dump", false);
@@ -75,7 +73,6 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
             acquisition_cc_ = pcps_make_acquisition_fine_doppler_cc(max_dwells_,sampled_ms_,
                     doppler_max_, doppler_min_, if_, fs_in_, vector_length_, queue_,
                     dump_, dump_filename_);
-
         }
     else
         {
@@ -169,7 +166,6 @@ void GpsL1CaPcpsAcquisitionFineDoppler::connect(boost::shared_ptr<gr::top_block>
 {
     if(top_block) { /* top_block is not null */};
     //nothing to disconnect, now the tracking uses gr_sync_decimator
-
 }
 
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc

@@ -33,7 +33,6 @@
  */
 
 #include "gps_l1_ca_pcps_assisted_acquisition.h"
-#include <iostream>
 #include <glog/logging.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
@@ -54,9 +53,7 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
 
     DLOG(INFO) << "role " << role;
 
-    item_type_ = configuration->property(role + ".item_type",
+    item_type_ = configuration->property(role + ".item_type", default_item_type);
-                                         default_item_type);
-
     fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
     if_ = configuration->property(role + ".ifreq", 0);
     dump_ = configuration->property(role + ".dump", false);
@@ -64,8 +61,7 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
     doppler_min_ = configuration->property(role + ".doppler_min", -5000);
     sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1);
     max_dwells_= configuration->property(role + ".max_dwells", 1);
-    dump_filename_ = configuration->property(role + ".dump_filename",
+    dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
-                                             default_dump_filename);
 
     //--- Find number of samples per spreading code -------------------------
     vector_length_ = round(fs_in_

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc

@@ -30,11 +30,8 @@
  */
 
 #include "gps_l1_ca_pcps_multithread_acquisition.h"
-#include <iostream>
-#include <stdexcept>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc

@@ -30,11 +30,8 @@
  */
 
 #include "gps_l1_ca_pcps_opencl_acquisition.h"
-#include <iostream>
-#include <stdexcept>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc

@@ -31,12 +31,8 @@
  */
 
 #include "gps_l1_ca_pcps_quicksync_acquisition.h"
-#include <iostream>
-#include <cmath>
-#include <stdexcept>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
@@ -205,7 +201,6 @@ void GpsL1CaPcpsQuickSyncAcquisition::set_doppler_step(unsigned int doppler_step
         {
             acquisition_cc_->set_doppler_step(doppler_step_);
         }
-
 }
 
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc

@@ -30,11 +30,8 @@
  */
 
 #include "gps_l1_ca_pcps_tong_acquisition.h"
-#include <iostream>
-#include <stdexcept>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
@@ -54,8 +51,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
 
     DLOG(INFO) << "role " << role;
 
-    item_type_ = configuration_->property(role + ".item_type",
+    item_type_ = configuration_->property(role + ".item_type", default_item_type);
-            default_item_type);
 
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
     if_ = configuration_->property(role + ".ifreq", 0);
@@ -66,8 +62,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
     tong_init_val_ = configuration->property(role + ".tong_init_val", 1);
     tong_max_val_ = configuration->property(role + ".tong_max_val", 2);
 
-    dump_filename_ = configuration_->property(role + ".dump_filename",
+    dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
-            default_dump_filename);
 
     //--- Find number of samples per spreading code -------------------------
     code_length_ = round(fs_in_
@@ -86,10 +81,8 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
 
             stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_);
 
-            DLOG(INFO) << "stream_to_vector(" << stream_to_vector_->unique_id()
+            DLOG(INFO) << "stream_to_vector(" << stream_to_vector_->unique_id() << ")";
-                    << ")";
+            DLOG(INFO) << "acquisition(" << acquisition_cc_->unique_id() << ")";
-            DLOG(INFO) << "acquisition(" << acquisition_cc_->unique_id()
-                    << ")";
         }
     else
         {
@@ -230,6 +223,7 @@ void GpsL1CaPcpsTongAcquisition::set_local_code()
     }
 }
 
+
 void GpsL1CaPcpsTongAcquisition::reset()
 {
     if (item_type_.compare("gr_complex") == 0)
@@ -238,6 +232,7 @@ void GpsL1CaPcpsTongAcquisition::reset()
         }
 }
 
+
 void GpsL1CaPcpsTongAcquisition::set_state(int state)
 {
     if (item_type_.compare("gr_complex") == 0)
@@ -246,10 +241,10 @@ void GpsL1CaPcpsTongAcquisition::set_state(int state)
     }
 }
 
+
 float GpsL1CaPcpsTongAcquisition::calculate_threshold(float pfa)
 {
     //Calculate the threshold
-
     unsigned int frequency_bins = 0;
     for (int doppler = (int)(-doppler_max_); doppler <= (int)doppler_max_; doppler += doppler_step_)
         {
@@ -268,6 +263,7 @@ float GpsL1CaPcpsTongAcquisition::calculate_threshold(float pfa)
     return threshold;
 }
 
+
 void GpsL1CaPcpsTongAcquisition::connect(gr::top_block_sptr top_block)
 {
     if (item_type_.compare("gr_complex") == 0)

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc

@@ -32,12 +32,8 @@
  */
 
 #include "gps_l2_m_pcps_acquisition.h"
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include "gps_l2c_signal.h"
 #include "GPS_L2C.h"
 #include "configuration_interface.h"
@@ -57,8 +53,7 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
 
     LOG(INFO) << "role " << role;
 
-    item_type_ = configuration_->property(role + ".item_type",
+    item_type_ = configuration_->property(role + ".item_type", default_item_type);
-            default_item_type);
     //float pfa =  configuration_->property(role + ".pfa", 0.0);
 
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
@@ -77,12 +72,11 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
             max_dwells_ = 2;
         }
 
-    dump_filename_ = configuration_->property(role + ".dump_filename",
+    dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
-            default_dump_filename);
 
     //--- Find number of samples per spreading code -------------------------
-    code_length_ = round((double)fs_in_
+    code_length_ = round(static_cast<double>(fs_in_)
-            / (GPS_L2_M_CODE_RATE_HZ / (double)GPS_L2_M_CODE_LENGTH_CHIPS));
+            / (GPS_L2_M_CODE_RATE_HZ / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS)));
 
     vector_length_ = code_length_;
 
@@ -277,13 +271,13 @@ float GpsL2MPcpsAcquisition::calculate_threshold(float pfa)
 {
     //Calculate the threshold
     unsigned int frequency_bins = 0;
-    for (int doppler = (int)(-doppler_max_); doppler <= (int)doppler_max_; doppler += doppler_step_)
+    for (int doppler = static_cast<int>(-doppler_max_); doppler <= static_cast<int>(doppler_max_); doppler += doppler_step_)
         {
             frequency_bins++;
         }
     DLOG(INFO) << "Channel " << channel_<< "  Pfa = " << pfa;
     unsigned int ncells = vector_length_ * frequency_bins;
-    double exponent = 1 / static_cast<double>(ncells);
+    double exponent = 1.0 / static_cast<double>(ncells);
     double val = pow(1.0 - pfa, exponent);
     double lambda = double(vector_length_);
     boost::math::exponential_distribution<double> mydist (lambda);

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h

@@ -52,8 +52,6 @@
 
 #include <fstream>
 #include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/gr_complex.h>
@@ -225,7 +223,6 @@ public:
          d_doppler_step = doppler_step;
      }
 
-
      /*!
       * \brief Set tracking channel internal queue.
       * \param channel_internal_queue - Channel's internal blocks information queue.

src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h

@@ -51,9 +51,7 @@ class ConfigurationInterface;
  */
 class GalileoE1DllPllVemlTracking : public TrackingInterface
 {
-
 public:
-
     GalileoE1DllPllVemlTracking(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
@@ -103,12 +101,9 @@ public:
     void start_tracking();
 
 private:
-
     galileo_e1_dll_pll_veml_tracking_cc_sptr tracking_;
     size_t item_size_;
-
     unsigned int channel_;
-
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;

src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h

@@ -52,9 +52,7 @@ class ConfigurationInterface;
  */
 class GalileoE1TcpConnectorTracking : public TrackingInterface
 {
-
 public:
-
     GalileoE1TcpConnectorTracking(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
@@ -67,6 +65,7 @@ public:
     {
         return role_;
     }
+
     //! Returns "Galileo_E1_TCP_CONNECTOR_Tracking"
     std::string implementation()
     {
@@ -103,12 +102,9 @@ public:
     void start_tracking();
 
 private:
-
     galileo_e1_tcp_connector_tracking_cc_sptr tracking_;
     size_t item_size_;
-
     unsigned int channel_;
-
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;

src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h

@@ -53,7 +53,6 @@ class ConfigurationInterface;
 class GalileoE5aDllPllTracking : public TrackingInterface
 {
 public:
-
     GalileoE5aDllPllTracking(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
@@ -82,7 +81,6 @@ public:
     gr::basic_block_sptr get_left_block();
     gr::basic_block_sptr get_right_block();
 
-
     /*!
      * \brief Set tracking channel unique ID
      */

src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.h

@@ -51,9 +51,7 @@ class ConfigurationInterface;
  */
 class GalileoVolkE1DllPllVemlTracking : public TrackingInterface
 {
-
 public:
-
     GalileoVolkE1DllPllVemlTracking(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
@@ -103,12 +101,9 @@ public:
     void start_tracking();
 
 private:
-
     galileo_volk_e1_dll_pll_veml_tracking_cc_sptr tracking_;
     size_t item_size_;
-
     unsigned int channel_;
-
     std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc

@@ -37,8 +37,7 @@
  */
 
 #include "gps_l1_ca_dll_pll_optim_tracking.h"
-#include <boost/math/special_functions/round.hpp>
+#include <cmath>
-#include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc

@@ -64,7 +64,6 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
     float dll_bw_hz;
     float early_late_space_chips;
     item_type = configuration->property(role + ".item_type", default_item_type);
-    //vector_length = configuration->property(role + ".vector_length", 2048);
     fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
     f_if = configuration->property(role + ".if", 0);
     dump = configuration->property(role + ".dump", false);
@@ -72,8 +71,7 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
     dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
     early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     std::string default_dump_filename = "./track_ch";
-    dump_filename = configuration->property(role + ".dump_filename",
+    dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused!
-            default_dump_filename); //unused!
     vector_length = std::round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
@@ -111,6 +109,7 @@ void GpsL1CaDllPllTracking::start_tracking()
     tracking_->start_tracking();
 }
 
+
 /*
  * Set tracking channel unique ID
  */
@@ -120,6 +119,7 @@ void GpsL1CaDllPllTracking::set_channel(unsigned int channel)
     tracking_->set_channel(channel);
 }
 
+
 /*
  * Set tracking channel internal queue
  */
@@ -130,28 +130,33 @@ void GpsL1CaDllPllTracking::set_channel_queue(
     tracking_->set_channel_queue(channel_internal_queue_);
 }
 
+
 void GpsL1CaDllPllTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
 {
     tracking_->set_gnss_synchro(p_gnss_synchro);
 }
 
+
 void GpsL1CaDllPllTracking::connect(gr::top_block_sptr top_block)
 {
     if(top_block) { /* top_block is not null */};
     //nothing to connect, now the tracking uses gr_sync_decimator
 }
 
+
 void GpsL1CaDllPllTracking::disconnect(gr::top_block_sptr top_block)
 {
     if(top_block) { /* top_block is not null */};
     //nothing to disconnect, now the tracking uses gr_sync_decimator
 }
 
+
 gr::basic_block_sptr GpsL1CaDllPllTracking::get_left_block()
 {
     return tracking_;
 }
 
+
 gr::basic_block_sptr GpsL1CaDllPllTracking::get_right_block()
 {
     return tracking_;

src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h

@@ -52,7 +52,6 @@ class ConfigurationInterface;
 class GpsL1CaDllPllTracking : public TrackingInterface
 {
 public:
-
     GpsL1CaDllPllTracking(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
@@ -71,6 +70,7 @@ public:
     {
         return "GPS_L1_CA_DLL_PLL_Tracking";
     }
+
     size_t item_size()
     {
         return item_size_;

src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h

@@ -52,7 +52,6 @@ class ConfigurationInterface;
 class GpsL2MDllPllTracking : public TrackingInterface
 {
 public:
-
     GpsL2MDllPllTracking(ConfigurationInterface* configuration,
             std::string role,
             unsigned int in_streams,
@@ -71,6 +70,7 @@ public:
     {
         return "gps_l2_m_dll_pll_tracking";
     }
+
     size_t item_size()
     {
         return item_size_;