Applied clang-format

src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc

@@ -31,9 +31,9 @@
  * -------------------------------------------------------------------------
  */
 
+#include "beidou_b1i_pcps_acquisition.h"
 #include "Beidou_B1I.h"
 #include "acq_conf.h"
-#include "beidou_b1i_pcps_acquisition.h"
 #include "beidou_b1i_signal_processing.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"

src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc

@@ -29,9 +29,9 @@
  * -------------------------------------------------------------------------
  */
 
+#include "beidou_b3i_pcps_acquisition.h"
 #include "Beidou_B3I.h"
 #include "acq_conf.h"
-#include "beidou_b3i_pcps_acquisition.h"
 #include "beidou_b3i_signal_processing.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc

@@ -29,10 +29,10 @@
  * -------------------------------------------------------------------------
  */
 
+#include "galileo_e1_pcps_ambiguous_acquisition.h"
 #include "Galileo_E1.h"
 #include "acq_conf.h"
 #include "configuration_interface.h"
-#include "galileo_e1_pcps_ambiguous_acquisition.h"
 #include "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc

@@ -28,11 +28,11 @@
  * -------------------------------------------------------------------------
  */
 
+#include "galileo_e5a_pcps_acquisition.h"
 #include "Galileo_E5a.h"
 #include "acq_conf.h"
 #include "configuration_interface.h"
 #include "galileo_e5_signal_processing.h"
-#include "galileo_e5a_pcps_acquisition.h"
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc

@@ -31,10 +31,10 @@
  * -------------------------------------------------------------------------
  */
 
+#include "glonass_l1_ca_pcps_acquisition.h"
 #include "GLONASS_L1_L2_CA.h"
 #include "acq_conf.h"
 #include "configuration_interface.h"
-#include "glonass_l1_ca_pcps_acquisition.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc

@@ -33,11 +33,11 @@
  * -------------------------------------------------------------------------
  */
 
+#include "gps_l1_ca_pcps_acquisition.h"
 #include "GPS_L1_CA.h"
 #include "acq_conf.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
-#include "gps_l1_ca_pcps_acquisition.h"
 #include "gps_sdr_signal_processing.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc

@@ -33,12 +33,12 @@
  * -------------------------------------------------------------------------
  */
 
+#include "pcps_acquisition.h"
 #include "GLONASS_L1_L2_CA.h"  // for GLONASS_TWO_PI
 #include "GPS_L1_CA.h"         // for GPS_TWO_PI
 #include "gnss_frequencies.h"
 #include "gnss_sdr_create_directory.h"
 #include "gnss_synchro.h"
-#include "pcps_acquisition.h"
 #if HAS_STD_FILESYSTEM
 #if HAS_STD_FILESYSTEM_EXPERIMENTAL
 #include <experimental/filesystem>

src/algorithms/acquisition/libs/acq_conf.cc

@@ -120,7 +120,6 @@ void Acq_Conf::SetFromConfiguration( ConfigurationInterface *configuration,
     blocking_on_standby = configuration->property(role + ".blocking_on_standby", blocking_on_standby);
 
     SetDerivedParams();
-
 }
 
 void Acq_Conf::ConfigureAutomaticResampler(double opt_freq)
@@ -149,4 +148,3 @@ void Acq_Conf::SetDerivedParams()
     samples_per_chip = static_cast<unsigned int>(ceil(static_cast<float>(resampled_fs) / chips_per_second));
     samples_per_code = samples_per_ms * ms_per_code;
 }
-

src/algorithms/libs/item_type_helpers.cc

@@ -31,10 +31,9 @@
  */
 
 #include "item_type_helpers.h"
-
-#include <cstring> // memcpy
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cstring>  // memcpy
 
 std::string external_item_type_to_internal(const std::string &external_item_type)
 {
@@ -67,7 +66,6 @@ std::string external_item_type_to_internal( const std::string &external_item_typ
 
 
     return internal_item_type;
-
 }
 
 bool item_type_valid(const std::string &item_type)
@@ -274,8 +272,7 @@ item_type_converter_t make_vector_converter( std::string input_type,
 {
     if (not item_type_valid(input_type) or not item_type_valid(output_type))
         {
-        throw std::runtime_error( "make_vector_converter: invalid item types : " 
+            throw std::runtime_error("make_vector_converter: invalid item types : " + input_type + " " + output_type);
-                + input_type + " " + output_type );
         }
 
     if (input_type == output_type)
@@ -297,7 +294,6 @@ item_type_converter_t make_vector_converter( std::string input_type,
                     return std::bind(convert_8i_32f, std::placeholders::_1,
                         std::placeholders::_2, std::placeholders::_3);
                 }
-
         }
     else if (input_type == "ic8")
         {
@@ -332,8 +328,7 @@ item_type_converter_t make_vector_converter( std::string input_type,
                     return std::bind(convert_16ic_8ic, std::placeholders::_1,
                         std::placeholders::_2, std::placeholders::_3);
                 }
-        else 
+            else if (output_type == "fc32")
-        if( output_type == "fc32" )
                 {
                     return std::bind(convert_16ic_32fc, std::placeholders::_1,
                         std::placeholders::_2, std::placeholders::_3);
@@ -364,14 +359,12 @@ item_type_converter_t make_vector_converter( std::string input_type,
                     return std::bind(convert_32ic_8ic, std::placeholders::_1,
                         std::placeholders::_2, std::placeholders::_3);
                 }
-        else 
+            else if (output_type == "ic16")
-        if( output_type == "ic16" )
                 {
                     return std::bind(convert_32ic_16ic, std::placeholders::_1,
                         std::placeholders::_2, std::placeholders::_3);
                 }
-        else 
+            else if (output_type == "fc32")
-        if( output_type == "fc32" )
                 {
                     return std::bind(convert_32ic_32fc, std::placeholders::_1,
                         std::placeholders::_2, std::placeholders::_3);
@@ -404,9 +397,5 @@ item_type_converter_t make_vector_converter( std::string input_type,
                 }
         }
 
-    throw std::runtime_error( "make_vector_converter: invalid conversion : "
+    throw std::runtime_error("make_vector_converter: invalid conversion : " + input_type + " to " + output_type);
-            + input_type + " to " + output_type );
-
 }
-
-