Linting fixes

src/algorithms/signal_source/adapters/ion_gsms_signal_source.cc

@@ -19,6 +19,7 @@
 #include "ion_gsms_signal_source.h"
 #include <gnuradio/blocks/copy.h>
 #include <string>
+#include <vector>
 #include <unordered_set>
 
 #if USE_GLOG_AND_GFLAGS

src/algorithms/signal_source/adapters/ion_gsms_signal_source.h

@@ -23,6 +23,7 @@
 #include "gnss_sdr_timestamp.h"
 #include "ion_gsms.h"
 #include <string>
+#include <vector>
 
 /** \addtogroup Signal_Source
  * \{ */

src/algorithms/signal_source/libs/ion_gsms.cc

@@ -16,6 +16,9 @@
 
 #include "gnuradio/block.h"
 #include "ion_gsms.h"
+#include <memory>
+#include <algorithm>
+#include <vector>
 
 #if USE_GLOG_AND_GFLAGS
 #include <glog/logging.h>

src/algorithms/signal_source/libs/ion_gsms.h

@@ -24,7 +24,8 @@
 #include <gnuradio/sync_block.h>
 #include <filesystem>
 #include <string>
-#include <iostream>
+#include <memory>
+#include <vector>
 
 
 class IONGSMSFileSource : public gr::sync_block

src/algorithms/signal_source/libs/ion_gsms_chunk_data.cc

@@ -16,6 +16,8 @@
 
 #include "ion_gsms_chunk_data.h"
 #include <bitset>
+#include <string>
+#include <vector>
 
 #if USE_GLOG_AND_GFLAGS
 #include <glog/logging.h>
@@ -46,7 +48,7 @@ IONGSMSChunkData::IONGSMSChunkData(const GnssMetadata::Chunk& chunk, const std::
                             return stream.Id() == it;
                         }))
                         {
-                            streams_.emplace_back(lump, stream, GnssMetadata::encoding_from_string(stream.Encoding()),output_streams + output_stream_offset);
+                            streams_.emplace_back(lump, stream, GnssMetadata::encoding_from_string(stream.Encoding()), output_streams + output_stream_offset);
                             ++output_streams;
                             std::size_t sample_bitsize = stream.Packedbits() / stream.RateFactor();
                             std::size_t sample_rate = stream.RateFactor();

src/algorithms/signal_source/libs/ion_gsms_chunk_data.h

@@ -21,6 +21,8 @@
 #include "ion_gsms_stream_encodings.h"
 #include "ion_gsms_chunk_unpacking_ctx.h"
 #include <gnuradio/block.h>
+#include <string>
+#include <vector>
 
 #if USE_GLOG_AND_GFLAGS
 #include <glog/logging.h>
@@ -141,4 +143,4 @@ private:
     void* buffer_;
 };
 
-#endif //ION_GSM_CHUNK_DATA_H
+#endif  // ION_GSM_CHUNK_DATA_H

src/algorithms/signal_source/libs/ion_gsms_chunk_unpacking_ctx.h

@@ -176,4 +176,4 @@ struct IONGSMSChunkUnpackingCtx
     }
 };
 
-#endif //ION_GSM_CHUNK_UNPACKING_CTX_H
+#endif  // ION_GSM_CHUNK_UNPACKING_CTX_H

src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h

@@ -20,6 +20,8 @@
 #include "GnssMetadata.h"
 #include "configuration_interface.h"
 #include <gnuradio/block.h>
+#include <string>
+#include <vector>
 
 #if USE_GLOG_AND_GFLAGS
 #include <glog/logging.h>
@@ -37,12 +39,12 @@ public:
 public:  // Getters
     const std::string& metadata_filepath() const;
 
-private: // Private methods
+private:  // Private methods
     void load_metadata();
 
-private: // State
+private:  // State
     std::string metadata_filepath_;
     GnssMetadata::Metadata metadata_;
 };
 
-#endif //ION_GSMS_METADATA_HANDLER_H
+#endif  // ION_GSMS_METADATA_HANDLER_H

src/algorithms/signal_source/libs/ion_gsms_stream_encodings.h

@@ -19,6 +19,8 @@
 #ifndef ION_GSM_STREAM_ENCODINGS_H
 #define ION_GSM_STREAM_ENCODINGS_H
 
+#include <string>
+
 #if USE_GLOG_AND_GFLAGS
 #include <glog/logging.h>
 #else
@@ -27,140 +29,144 @@
 
 namespace GnssMetadata
 {
-    using StreamEncoding = unsigned char;
 
-    namespace StreamEncodings
+using StreamEncoding = unsigned char;
-    {
-        constexpr unsigned char SIGN = 0;
-        constexpr unsigned char OB = 1;
-        constexpr unsigned char SM = 2;
-        constexpr unsigned char MS = 3;
-        constexpr unsigned char TC = 4;
-        constexpr unsigned char OG = 5;
-        constexpr unsigned char OBA = 6;
-        constexpr unsigned char SMA = 7;
-        constexpr unsigned char MSA = 8;
-        constexpr unsigned char TCA = 9;
-        constexpr unsigned char OGA = 10;
-        constexpr unsigned char FP = 11;
-    }
 
-    inline StreamEncoding encoding_from_string(const std::string& str)
+namespace StreamEncodings
-    {
+{
-        if (str == "SIGN")
-            {
-                return StreamEncodings::SIGN;
-            }
-        if (str == "OB")
-            {
-                return StreamEncodings::OB;
-            }
-        if (str == "SM")
-            {
-                return StreamEncodings::SM;
-            }
-        if (str == "MS")
-            {
-                return StreamEncodings::MS;
-            }
-        if (str == "TC")
-            {
-                return StreamEncodings::TC;
-            }
-        if (str == "OG")
-            {
-                return StreamEncodings::OG;
-            }
-        if (str == "OBA")
-            {
-                return StreamEncodings::OBA;
-            }
-        if (str == "SMA")
-            {
-                return StreamEncodings::SMA;
-            }
-        if (str == "MSA")
-            {
-                return StreamEncodings::MSA;
-            }
-        if (str == "TCA")
-            {
-                return StreamEncodings::TCA;
-            }
-        if (str == "OGA")
-            {
-                return StreamEncodings::OGA;
-            }
-        if (str == "FP")
-            {
-                return StreamEncodings::FP;
-            }
-        return 0;
-    }
 
-    template <typename T>
+constexpr unsigned char SIGN = 0;
-    inline T two_bit_look_up[11][4]
+constexpr unsigned char OB = 1;
-    {
+constexpr unsigned char SM = 2;
-        [0] = {},
+constexpr unsigned char MS = 3;
-        [1   /*OB*/] = {-2, -1, 0, 1},
+constexpr unsigned char TC = 4;
-        [2   /*SM*/] = {0, 1, 0, -1},
+constexpr unsigned char OG = 5;
-        [3   /*MS*/] = {0, 0, 1, -1},
+constexpr unsigned char OBA = 6;
-        [4   /*TC*/] = {0, 1, -2, -1},
+constexpr unsigned char SMA = 7;
-        [5   /*OG*/] = {-2, -1, 1, 0},
+constexpr unsigned char MSA = 8;
-        [6  /*OBA*/] = {-3, -1, 1, 3},
+constexpr unsigned char TCA = 9;
-        [7  /*SMA*/] = {1, 3, -1, -3},
+constexpr unsigned char OGA = 10;
-        [8  /*MSA*/] = {1, -1, 3, -3},
+constexpr unsigned char FP = 11;
-        [9  /*TCA*/] = {1, 3, -3, -1},
-        [10 /*OGA*/] = {-3, -1, 3, 1},
-    };
 
-    template <typename T>
+}  // namespace StreamEncodings
-    inline T three_bit_look_up[11][8]
-    {
-        [0] = {},
-        [1   /*OB*/] = {-4, -3, -2, -1, 0, 1, 2, 3},
-        [2   /*SM*/] = {0, 1, 2, 3, 0, -1, -2, -3},
-        [3   /*MS*/] = {0, 0, 1, -1, 0, 0, 1, -1},
-        [4   /*TC*/] = {0, 1, 2, 3, -4, -3, -2, -1},
-        [5   /*OG*/] = {-4, -3, -1, -2, 3, 2, 0, 1},
-        [6  /*OBA*/] = {-7, -5, -3, -1, 1, 3, 5, 7},
-        [7  /*SMA*/] = {1, 3, 5, 7, -1, -3, -5, -7},
-        [8  /*MSA*/] = {1, -1, 3, -3, 5, -5, 7, -7},
-        [9  /*TCA*/] = {1, 3, 5, 7, -7, -5, -3, -1},
-        [10 /*OGA*/] = {-7, -5, -1, -3, 7, 5, 1, 3},
-    };
 
-    template <typename T>
+inline StreamEncoding encoding_from_string(const std::string& str)
-    inline T four_bit_look_up[11][16]
+{
-    {
+    if (str == "SIGN")
-        [0] = {},
+        {
-        [1   /*OB*/] = {-8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7},
+            return StreamEncodings::SIGN;
-        [2   /*SM*/] = {0, 1, 2, 3, 4, 5, 6, 7, 0, -1, -2, -3, -4, -5, -6, -7},
+        }
-        [3   /*MS*/] = {0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1},
+    if (str == "OB")
-        [4   /*TC*/] = {0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1},
+        {
-        [5   /*OG*/] = {-8, -7, -5, -6, -1, -2, -4, -3, 7, 6, 4, 5, 0, 1, 3, 2},
+            return StreamEncodings::OB;
-        [6  /*OBA*/] = {-15, -13, -11, -9, -7, -5, -3, -1, 1, 3, 5, 7, 9, 11, 13, 15},
+        }
-        [7  /*SMA*/] = {1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15},
+    if (str == "SM")
-        [8  /*MSA*/] = {1, -1, 3, -3, 5, -5, 7, -7, 9, -9, 11, -11, 13, -13, 15, -15},
+        {
-        [9  /*TCA*/] = {1, 3, 5, 7, 9, 11, 13, 15, -15, -13, -11, -9, -7, -5, -3, -1},
+            return StreamEncodings::SM;
-        [10 /*OGA*/] = {-15, -13, -9, -11, -1, -3, -7, -5, 15, 13, 9, 11, 1, 3, 7, 5},
+        }
-    };
+    if (str == "MS")
-
+        {
-    template <typename T>
+            return StreamEncodings::MS;
-    inline T five_bit_look_up[11][32]
+        }
-    {
+    if (str == "TC")
-        [0] = {},
+        {
-        [1   /*OB*/] = {-16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
+            return StreamEncodings::TC;
-        [2   /*SM*/] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15},
+        }
-        [3   /*MS*/] = {0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1},
+    if (str == "OG")
-        [4   /*TC*/] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1},
+        {
-        [5   /*OG*/] = {-16, -15, -13, -14, -9, -10, -12, -11, -1, -2, -4, -3, -8, -7, -5, -6, 15, 14, 12, 13, 8, 9, 11, 10, 0, 1, 3, 2, 7, 6, 4, 5},
+            return StreamEncodings::OG;
-        [6  /*OBA*/] = {-31, -29, -27, -25, -23, -21, -19, -17, -15, -13, -11, -9, -7, -5, -3, -1, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31},
+        }
-        [7  /*SMA*/] = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, -1, -3, -5, -7, -9, -11, -13, -15, -17, -19, -21, -23, -25, -27, -29, -31},
+    if (str == "OBA")
-        [8  /*MSA*/] = {1, -1, 3, -3, 5, -5, 7, -7, 9, -9, 11, -11, 13, -13, 15, -15, 17, -17, 19, -19, 21, -21, 23, -23, 25, -25, 27, -27, 29, -29, 31, -31},
+        {
-        [9  /*TCA*/] = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, -31, -29, -27, -25, -23, -21, -19, -17, -15, -13, -11, -9, -7, -5, -3, -1},
+            return StreamEncodings::OBA;
-        [10 /*OGA*/] = {-31, -29, -25, -27, -17, -19, -23, -21, -1, -3, -7, -5, -15, -13, -9, -11, 31, 29, 25, 27, 17, 19, 23, 21, 1, 3, 7, 5, 15, 13, 9, 11},
+        }
-    };
+    if (str == "SMA")
+        {
+            return StreamEncodings::SMA;
+        }
+    if (str == "MSA")
+        {
+            return StreamEncodings::MSA;
+        }
+    if (str == "TCA")
+        {
+            return StreamEncodings::TCA;
+        }
+    if (str == "OGA")
+        {
+            return StreamEncodings::OGA;
+        }
+    if (str == "FP")
+        {
+            return StreamEncodings::FP;
+        }
+    return 0;
 }
 
-#endif //ION_GSM_STREAM_ENCODINGS_H
+template <typename T>
+inline T two_bit_look_up[11][4]
+{
+    [0] = {},
+    [1   /*OB*/] = {-2, -1, 0, 1},
+    [2   /*SM*/] = {0, 1, 0, -1},
+    [3   /*MS*/] = {0, 0, 1, -1},
+    [4   /*TC*/] = {0, 1, -2, -1},
+    [5   /*OG*/] = {-2, -1, 1, 0},
+    [6  /*OBA*/] = {-3, -1, 1, 3},
+    [7  /*SMA*/] = {1, 3, -1, -3},
+    [8  /*MSA*/] = {1, -1, 3, -3},
+    [9  /*TCA*/] = {1, 3, -3, -1},
+    [10 /*OGA*/] = {-3, -1, 3, 1},
+};
+
+template <typename T>
+inline T three_bit_look_up[11][8]
+{
+    [0] = {},
+    [1   /*OB*/] = {-4, -3, -2, -1, 0, 1, 2, 3},
+    [2   /*SM*/] = {0, 1, 2, 3, 0, -1, -2, -3},
+    [3   /*MS*/] = {0, 0, 1, -1, 0, 0, 1, -1},
+    [4   /*TC*/] = {0, 1, 2, 3, -4, -3, -2, -1},
+    [5   /*OG*/] = {-4, -3, -1, -2, 3, 2, 0, 1},
+    [6  /*OBA*/] = {-7, -5, -3, -1, 1, 3, 5, 7},
+    [7  /*SMA*/] = {1, 3, 5, 7, -1, -3, -5, -7},
+    [8  /*MSA*/] = {1, -1, 3, -3, 5, -5, 7, -7},
+    [9  /*TCA*/] = {1, 3, 5, 7, -7, -5, -3, -1},
+    [10 /*OGA*/] = {-7, -5, -1, -3, 7, 5, 1, 3},
+};
+
+template <typename T>
+inline T four_bit_look_up[11][16]
+{
+    [0] = {},
+    [1   /*OB*/] = {-8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7},
+    [2   /*SM*/] = {0, 1, 2, 3, 4, 5, 6, 7, 0, -1, -2, -3, -4, -5, -6, -7},
+    [3   /*MS*/] = {0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1},
+    [4   /*TC*/] = {0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1},
+    [5   /*OG*/] = {-8, -7, -5, -6, -1, -2, -4, -3, 7, 6, 4, 5, 0, 1, 3, 2},
+    [6  /*OBA*/] = {-15, -13, -11, -9, -7, -5, -3, -1, 1, 3, 5, 7, 9, 11, 13, 15},
+    [7  /*SMA*/] = {1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15},
+    [8  /*MSA*/] = {1, -1, 3, -3, 5, -5, 7, -7, 9, -9, 11, -11, 13, -13, 15, -15},
+    [9  /*TCA*/] = {1, 3, 5, 7, 9, 11, 13, 15, -15, -13, -11, -9, -7, -5, -3, -1},
+    [10 /*OGA*/] = {-15, -13, -9, -11, -1, -3, -7, -5, 15, 13, 9, 11, 1, 3, 7, 5},
+};
+
+template <typename T>
+inline T five_bit_look_up[11][32]
+{
+    [0] = {},
+    [1   /*OB*/] = {-16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
+    [2   /*SM*/] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15},
+    [3   /*MS*/] = {0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0, 1, -1},
+    [4   /*TC*/] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1},
+    [5   /*OG*/] = {-16, -15, -13, -14, -9, -10, -12, -11, -1, -2, -4, -3, -8, -7, -5, -6, 15, 14, 12, 13, 8, 9, 11, 10, 0, 1, 3, 2, 7, 6, 4, 5},
+    [6  /*OBA*/] = {-31, -29, -27, -25, -23, -21, -19, -17, -15, -13, -11, -9, -7, -5, -3, -1, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31},
+    [7  /*SMA*/] = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, -1, -3, -5, -7, -9, -11, -13, -15, -17, -19, -21, -23, -25, -27, -29, -31},
+    [8  /*MSA*/] = {1, -1, 3, -3, 5, -5, 7, -7, 9, -9, 11, -11, 13, -13, 15, -15, 17, -17, 19, -19, 21, -21, 23, -23, 25, -25, 27, -27, 29, -29, 31, -31},
+    [9  /*TCA*/] = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, -31, -29, -27, -25, -23, -21, -19, -17, -15, -13, -11, -9, -7, -5, -3, -1},
+    [10 /*OGA*/] = {-31, -29, -25, -27, -17, -19, -23, -21, -1, -3, -7, -5, -15, -13, -9, -11, 31, 29, 25, 27, 17, 19, 23, 21, 1, 3, 7, 5, 15, 13, 9, 11},
+};
+
+}  // namespace GnssMetadata
+
+#endif  // ION_GSM_STREAM_ENCODINGS_H