Clean usage of Guidelines Support Library

2019-07-29 21:47:46 +02:00 · 2019-07-29 21:47:46 +02:00 · 2ec6ed6ec6
parent 4933ae3e0d
commit 2ec6ed6ec6
19 changed files with 28 additions and 117 deletions
--- a/.clang-format
+++ b/.clang-format
@ -51,7 +51,7 @@ IncludeBlocks: Merge
 IncludeCategories:
  - Regex:           '^.*.h"'
    Priority:        1
-  - Regex:           '^.*(boost|gflags|glog|gnsssdr|gpstk|gtest|gnuradio|pmt|uhd|volk)/'
+  - Regex:           '^.*(boost|gflags|glog|gnsssdr|gnuradio|gpstk|gsl|gtest|pmt|uhd|volk)/'
    Priority:        2
  - Regex:           '^.*(armadillo|matio|pugixml)'
    Priority:        2
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
@ -41,8 +41,8 @@
 #include "gps_sdr_signal_processing.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <algorithm>
 #include <gsl/gsl>
+#include <algorithm>


 GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
@ -65,6 +65,7 @@
 #include <gnuradio/gr_complex.h>     // for gr_complex
 #include <gnuradio/thread/thread.h>  // for scoped_lock
 #include <gnuradio/types.h>          // for gr_vector_const_void_star
+#include <gsl/gsl>                   // for Guidelines Support Library
 #include <volk/volk_complex.h>       // for lv_16sc_t
 #include <complex>
 #include <cstdint>
@ -72,12 +73,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif

 class Gnss_Synchro;
 class pcps_acquisition;
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@ -92,23 +92,11 @@ else()
    target_link_libraries(algorithms_libs PRIVATE Boost::filesystem Boost::system)
 endif()

-include(CheckCXXSourceCompiles)
-check_cxx_source_compiles("
-    #include <span>
-    int main()
-    { std::span<float> sv; }"
-    has_span
+target_include_directories(algorithms_libs
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs/gsl/include
 )

-if(${has_span})
-    target_compile_definitions(algorithms_libs PUBLIC -DHAS_SPAN=1)
-else()
-    target_include_directories(algorithms_libs
-        PUBLIC
-            ${CMAKE_SOURCE_DIR}/src/algorithms/libs/gsl/include
-    )
-endif()
-
 target_link_libraries(algorithms_libs
    PUBLIC
        Armadillo::armadillo
--- a/src/algorithms/libs/beidou_b1i_signal_processing.h
+++ b/src/algorithms/libs/beidou_b1i_signal_processing.h
@ -33,17 +33,10 @@
 #ifndef GNSS_SDR_BEIDOU_B1I_SDR_SIGNAL_PROCESSING_H_
 #define GNSS_SDR_BEIDOU_B1I_SDR_SIGNAL_PROCESSING_H_

+#include <gsl/gsl>
 #include <complex>
 #include <cstdint>

-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-
-
 //! Generates int32_t GPS L1 C/A code for the desired SV ID and code shift
 void beidou_b1i_code_gen_int(gsl::span<int32_t> _dest, int32_t _prn, uint32_t _chip_shift);

--- a/src/algorithms/libs/beidou_b3i_signal_processing.h
+++ b/src/algorithms/libs/beidou_b3i_signal_processing.h
@ -33,16 +33,10 @@
 #ifndef GNSS_SDR_BEIDOU_B3I_SIGNAL_PROCESSING_H_
 #define GNSS_SDR_BEIDOU_B3I_SIGNAL_PROCESSING_H_

+#include <gsl/gsl>
 #include <complex>
 #include <cstdint>

-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-
 //! Generates int BeiDou B3I code for the desired SV ID and code shift
 void beidou_b3i_code_gen_int(gsl::span<int> _dest, int32_t _prn, uint32_t _chip_shift);

--- a/src/algorithms/libs/galileo_e1_signal_processing.h
+++ b/src/algorithms/libs/galileo_e1_signal_processing.h
@ -32,15 +32,10 @@
 #ifndef GNSS_SDR_GALILEO_E1_SIGNAL_PROCESSING_H_
 #define GNSS_SDR_GALILEO_E1_SIGNAL_PROCESSING_H_

+#include <gsl/gsl>
 #include <array>
 #include <complex>
 #include <cstdint>
-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif


 /*!
--- a/src/algorithms/libs/galileo_e5_signal_processing.h
+++ b/src/algorithms/libs/galileo_e5_signal_processing.h
@ -34,16 +34,10 @@
 #ifndef GNSS_SDR_GALILEO_E5_SIGNAL_PROCESSING_H_
 #define GNSS_SDR_GALILEO_E5_SIGNAL_PROCESSING_H_

+#include <gsl/gsl>
 #include <array>
 #include <complex>
 #include <cstdint>
-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-

 /*!
 * \brief Generates Galileo E5a code at 1 sample/chip
--- a/src/algorithms/libs/glonass_l1_signal_processing.h
+++ b/src/algorithms/libs/glonass_l1_signal_processing.h
@ -33,16 +33,10 @@
 #ifndef GNSS_SDR_GLONASS_SDR_SIGNAL_PROCESSING_H_
 #define GNSS_SDR_GLONASS_SDR_SIGNAL_PROCESSING_H_

+#include <gsl/gsl>
 #include <complex>
 #include <cstdint>

-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-
 //! Generates complex GLONASS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency
 void glonass_l1_ca_code_gen_complex(gsl::span<std::complex<float>> _dest, uint32_t _chip_shift);

--- a/src/algorithms/libs/glonass_l2_signal_processing.h
+++ b/src/algorithms/libs/glonass_l2_signal_processing.h
@ -33,16 +33,10 @@
 #ifndef GNSS_SDR_GLONASS_L2_SIGNAL_PROCESSING_H_
 #define GNSS_SDR_GLONASS_L2_SIGNAL_PROCESSING_H_

+#include <gsl/gsl>
 #include <complex>
 #include <cstdint>

-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-
 //! Generates complex GLONASS L2 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency
 void glonass_l2_ca_code_gen_complex(gsl::span<std::complex<float>> _dest, uint32_t _chip_shift);

--- a/src/algorithms/libs/gnss_signal_processing.h
+++ b/src/algorithms/libs/gnss_signal_processing.h
@ -35,17 +35,10 @@
 #ifndef GNSS_SDR_GNSS_SIGNAL_PROCESSING_H_
 #define GNSS_SDR_GNSS_SIGNAL_PROCESSING_H_

+#include <gsl/gsl>
 #include <complex>
 #include <cstdint>

-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-
-
 /*!
 * \brief This function generates a complex exponential in _dest.
 *
--- a/src/algorithms/libs/gps_l2c_signal.h
+++ b/src/algorithms/libs/gps_l2c_signal.h
@ -33,17 +33,10 @@
 #ifndef GNSS_SDR_GPS_L2C_SIGNAL_H_
 #define GNSS_SDR_GPS_L2C_SIGNAL_H_

+#include <gsl/gsl>
 #include <complex>
 #include <cstdint>

-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-
-
 //! Generates complex GPS L2C M code for the desired SV ID
 void gps_l2c_m_code_gen_complex(gsl::span<std::complex<float>> _dest, uint32_t _prn);
 void gps_l2c_m_code_gen_float(gsl::span<float> _dest, uint32_t _prn);
--- a/src/algorithms/libs/gps_l5_signal.h
+++ b/src/algorithms/libs/gps_l5_signal.h
@ -33,16 +33,10 @@
 #ifndef GNSS_SDR_GPS_L5_SIGNAL_H_
 #define GNSS_SDR_GPS_L5_SIGNAL_H_

+#include <gsl/gsl>
 #include <complex>
 #include <cstdint>

-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-
 //! Generates complex GPS L5I code for the desired SV ID
 void gps_l5i_code_gen_complex(gsl::span<std::complex<float>> _dest, uint32_t _prn);

--- a/src/algorithms/libs/gps_sdr_signal_processing.h
+++ b/src/algorithms/libs/gps_sdr_signal_processing.h
@ -33,16 +33,10 @@
 #ifndef GNSS_SDR_GPS_SDR_SIGNAL_PROCESSING_H_
 #define GNSS_SDR_GPS_SDR_SIGNAL_PROCESSING_H_

+#include <gsl/gsl>
 #include <complex>
 #include <cstdint>

-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
-
 //! Generates int GPS L1 C/A code for the desired SV ID and code shift
 void gps_l1_ca_code_gen_int(gsl::span<int32_t> _dest, int32_t _prn, uint32_t _chip_shift);

--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@ -57,15 +57,15 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>   // for io_signature
 #include <gnuradio/thread/thread.h>  // for scoped_lock
-#include <matio.h>                   // for Mat_VarCreate
-#include <pmt/pmt_sugar.h>           // for mp
+#include <gsl/gsl>
+#include <matio.h>          // for Mat_VarCreate
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <algorithm>  // for fill_n
 #include <array>
 #include <cmath>      // for fmod, round, floor
 #include <exception>  // for exception
-#include <gsl/gsl>
-#include <iostream>  // for cout, cerr
+#include <iostream>   // for cout, cerr
 #include <map>
 #include <numeric>

--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
@ -49,14 +49,14 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>   // for io_signature
 #include <gnuradio/thread/thread.h>  // for scoped_lock
-#include <matio.h>                   // for Mat_VarCreate
-#include <pmt/pmt_sugar.h>           // for mp
+#include <gsl/gsl>
+#include <matio.h>          // for Mat_VarCreate
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <algorithm>  // for fill_n
 #include <cmath>      // for fmod, round, floor
 #include <exception>  // for exception
-#include <gsl/gsl>
-#include <iostream>  // for cout, cerr
+#include <iostream>   // for cout, cerr
 #include <map>
 #include <numeric>
 #include <vector>
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
@ -45,12 +45,12 @@
 #include "tracking_discriminators.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <gsl/gsl>
 #include <matio.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <array>
 #include <cmath>
 #include <exception>
-#include <gsl/gsl>
 #include <iostream>
 #include <memory>
 #include <sstream>
--- a/src/tests/unit-tests/arithmetic/code_generation_test.cc
+++ b/src/tests/unit-tests/arithmetic/code_generation_test.cc
@ -31,14 +31,9 @@

 #include "gnss_signal_processing.h"
 #include "gps_sdr_signal_processing.h"
+#include <gsl/gsl>
 #include <chrono>
 #include <complex>
-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif


 TEST(CodeGenerationTest, CodeGenGPSL1Test)
--- a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc
+++ b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc
@ -32,14 +32,9 @@
 #include "GPS_L1_CA.h"
 #include "gnss_signal_processing.h"
 #include <armadillo>
-#include <chrono>
-#include <complex>
-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
 #include <gsl/gsl>
-#endif
+#include <chrono>
+#include <complex>e

 DEFINE_int32(size_carrier_test, 100000, "Size of the arrays used for complex carrier testing");