Cleaning includes

2024-06-24 05:53:16 +00:00 · 2016-01-10 14:30:04 +01:00 · 2016-01-10 14:30:04 +01:00 · bc0e4f188b
commit bc0e4f188b
parent 5743f0f631
34 changed files with 37 additions and 75 deletions
--- a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
+++ b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
@ -35,6 +35,7 @@
 #include <boost/statechart/transition.hpp>
 #include <boost/statechart/custom_reaction.hpp>
 #include <boost/mpl/list.hpp>
+#include "gnss_satellite.h"


 //************ GPS WORD TO SUBFRAME DECODER STATE MACHINE **********
--- a/src/core/libs/gnss_sdr_supl_client.cc
+++ b/src/core/libs/gnss_sdr_supl_client.cc
@ -32,6 +32,7 @@
 */

 #include "gnss_sdr_supl_client.h"
+#include <cmath>
 #include <utility>

 gnss_sdr_supl_client::gnss_sdr_supl_client()
--- a/src/core/system_parameters/GPS_L1_CA.h
+++ b/src/core/system_parameters/GPS_L1_CA.h
@ -32,10 +32,8 @@
 #ifndef GNSS_SDR_GPS_L1_CA_H_
 #define GNSS_SDR_GPS_L1_CA_H_

-#include <complex>
 #include <vector>
 #include <utility> // std::pair
-#include <gnss_satellite.h>
 #include "MATH_CONSTANTS.h"

 // Physical constants
--- a/src/core/system_parameters/GPS_L2C.h
+++ b/src/core/system_parameters/GPS_L2C.h
@ -32,11 +32,9 @@
 #ifndef GNSS_SDR_GPS_L2C_H_
 #define GNSS_SDR_GPS_L2C_H_

-#include <stdint.h>
-#include <complex>
+#include <cstdint>
 #include <vector>
 #include <utility> // std::pair
-#include "gnss_satellite.h"
 #include "MATH_CONSTANTS.h"

 // Physical constants
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@ -33,8 +33,6 @@
 #ifndef GNSS_SDR_GALILEO_E1_H_
 #define GNSS_SDR_GALILEO_E1_H_

-#include <complex>
-#include <gnss_satellite.h>
 #include <string>
 #include <vector>
 #include <utility> // std::pair
--- a/src/core/system_parameters/Galileo_E5a.h
+++ b/src/core/system_parameters/Galileo_E5a.h
@ -31,8 +31,6 @@
 #ifndef GNSS_SDR_GALILEO_E5A_H_
 #define GNSS_SDR_GALILEO_E5A_H_

-#include <complex>
-#include <gnss_satellite.h>
 #include <string>
 #include <vector>
 #include <utility> // std::pair
--- a/src/core/system_parameters/galileo_ephemeris.cc
+++ b/src/core/system_parameters/galileo_ephemeris.cc
@ -29,6 +29,8 @@
 */

 #include "galileo_ephemeris.h"
+#include <cmath>
+#include "Galileo_E1.h"


 Galileo_Ephemeris::Galileo_Ephemeris()
--- a/src/core/system_parameters/galileo_ephemeris.h
+++ b/src/core/system_parameters/galileo_ephemeris.h
@ -33,11 +33,9 @@
 #ifndef GNSS_SDR_GALILEO_EPHEMERIS_H_
 #define GNSS_SDR_GALILEO_EPHEMERIS_H_

-#include <iostream>
-#include <map>
 #include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
-#include "Galileo_E1.h"
+

 /*!
 * \brief This class is a storage and orbital model functions for the Galileo SV ephemeris data as described in Galileo ICD paragraph 5.1.1
--- a/src/core/system_parameters/galileo_fnav_message.cc
+++ b/src/core/system_parameters/galileo_fnav_message.cc
@ -35,13 +35,11 @@
 */

 #include "galileo_fnav_message.h"
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/crc.hpp>      // for boost::crc_basic, boost::crc_optimal
 #include <boost/dynamic_bitset.hpp>
 #include <glog/logging.h>
 #include <iostream>
-#include <cstring>
-#include <string>
+

 typedef boost::crc_optimal<24, 0x1864CFBu, 0x0, 0x0, false, false> CRC_Galileo_FNAV_type;

--- a/src/core/system_parameters/galileo_fnav_message.h
+++ b/src/core/system_parameters/galileo_fnav_message.h
@ -37,16 +37,12 @@
 #ifndef GNSS_SDR_GALILEO_FNAV_MESSAGE_H_
 #define GNSS_SDR_GALILEO_FNAV_MESSAGE_H_

-#include <iostream>
-#include <map>
-#include <vector>
-#include <string>
-#include <algorithm>
+
 #include <bitset>
-#include <boost/assign.hpp>
-#include <boost/cstdint.hpp>  // for boost::uint16_t
-#include <cmath>
+#include <string>
+#include <vector>
 #include <utility>
+#include <boost/cstdint.hpp>  // for boost::uint16_t
 #include "galileo_ephemeris.h"
 #include "galileo_iono.h"
 #include "galileo_almanac.h"
--- a/src/core/system_parameters/galileo_navigation_message.cc
+++ b/src/core/system_parameters/galileo_navigation_message.cc
@ -31,13 +31,11 @@
 */

 #include "galileo_navigation_message.h"
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/crc.hpp>      // for boost::crc_basic, boost::crc_optimal
 #include <boost/dynamic_bitset.hpp>
 #include <glog/logging.h>
 #include <iostream>
-#include <cstring>
-#include <string>
+

 typedef boost::crc_optimal<24, 0x1864CFBu, 0x0, 0x0, false, false> CRC_Galileo_INAV_type;

--- a/src/core/system_parameters/galileo_navigation_message.h
+++ b/src/core/system_parameters/galileo_navigation_message.h
@ -33,20 +33,17 @@
 #ifndef GNSS_SDR_GALILEO_NAVIGATION_MESSAGE_H_
 #define GNSS_SDR_GALILEO_NAVIGATION_MESSAGE_H_

-#include <iostream>
-#include <map>
-#include <vector>
-#include <string>
-#include <algorithm>
 #include <bitset>
-#include <boost/assign.hpp>
-#include <boost/cstdint.hpp>  // for boost::uint16_t
-#include <cmath>
+#include <map>
+#include <string>
 #include <utility>
+#include <vector>
+#include <boost/cstdint.hpp>  // for boost::uint32_t
 #include "galileo_ephemeris.h"
 #include "galileo_iono.h"
 #include "galileo_almanac.h"
 #include "galileo_utc_model.h"
+#include "Galileo_E1.h"

 /*!
 * \brief This class handles the Galileo I/NAV Data message, as described in the
--- a/src/core/system_parameters/galileo_utc_model.h
+++ b/src/core/system_parameters/galileo_utc_model.h
@ -33,8 +33,6 @@
 #ifndef GNSS_SDR_GALILEO_UTC_MODEL_H_
 #define GNSS_SDR_GALILEO_UTC_MODEL_H_

-#include "Galileo_E1.h"
-

 /*!
 * \brief This class is a storage for the GALILEO UTC MODEL data as described in Galileo ICD
--- a/src/core/system_parameters/gnss_signal.h
+++ b/src/core/system_parameters/gnss_signal.h
@ -33,6 +33,7 @@
 #define GNSS_SDR_GNSS_SIGNAL_H_

 #include "gnss_satellite.h"
+#include <ostream>
 #include <string>

 /*!
--- a/src/core/system_parameters/gps_acq_assist.h
+++ b/src/core/system_parameters/gps_acq_assist.h
@ -32,7 +32,6 @@
 #ifndef GNSS_SDR_GPS_ACQ_ASSIST_H_
 #define GNSS_SDR_GPS_ACQ_ASSIST_H_

-#include "GPS_L1_CA.h"


 /*!
--- a/src/core/system_parameters/gps_almanac.h
+++ b/src/core/system_parameters/gps_almanac.h
@ -32,8 +32,6 @@
 #ifndef GNSS_SDR_GPS_ALMANAC_H_
 #define GNSS_SDR_GPS_ALMANAC_H_

-#include "GPS_L1_CA.h"
-

 /*!
 * \brief This class is a storage for the GPS SV ALMANAC data as described in IS-GPS-200E
--- a/src/core/system_parameters/gps_cnav_ephemeris.h
+++ b/src/core/system_parameters/gps_cnav_ephemeris.h
@ -32,12 +32,8 @@
 #ifndef GNSS_SDR_GPS_CNAV_EPHEMERIS_H_
 #define GNSS_SDR_GPS_CNAV_EPHEMERIS_H_

-#include <iostream>
-#include <map>
-#include <string>
 #include "boost/assign.hpp"
 #include <boost/serialization/nvp.hpp>
-#include "GPS_L2C.h"


 /*!
--- a/src/core/system_parameters/gps_cnav_iono.h
+++ b/src/core/system_parameters/gps_cnav_iono.h
@ -32,7 +32,7 @@
 #ifndef GNSS_SDR_GPS_CNAV_IONO_H_
 #define GNSS_SDR_GPS_CNAV_IONO_H_

-#include "GPS_L2C.h"
+
 #include "boost/assign.hpp"
 #include <boost/serialization/nvp.hpp>

--- a/src/core/system_parameters/gps_cnav_navigation_message.cc
+++ b/src/core/system_parameters/gps_cnav_navigation_message.cc
@ -31,8 +31,7 @@
 */

 #include "gps_cnav_navigation_message.h"
-#include <cmath>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include <iostream>
 #include "gnss_satellite.h"


--- a/src/core/system_parameters/gps_cnav_navigation_message.h
+++ b/src/core/system_parameters/gps_cnav_navigation_message.h
@ -29,19 +29,15 @@
 */


-#ifndef GNSS_SDR_Gps_CNAV_Navigation_Message_H_
-#define GNSS_SDR_Gps_CNAV_Navigation_Message_H_
+#ifndef GNSS_SDR_GPS_CNAV_NAVIGATION_MESSAGE_H_
+#define GNSS_SDR_GPS_CNAV_NAVIGATION_MESSAGE_H_
+

-#include "stdint.h"
-#include <algorithm>
 #include <bitset>
-#include <cmath>
-#include <iostream>
 #include <map>
 #include <string>
 #include <vector>
 #include <utility>
-#include <boost/assign.hpp>
 #include "GPS_L2C.h"
 #include "gps_cnav_ephemeris.h"
 #include "gps_cnav_iono.h"
--- a/src/core/system_parameters/gps_cnav_utc_model.cc
+++ b/src/core/system_parameters/gps_cnav_utc_model.cc
@ -29,7 +29,7 @@
 */

 #include "gps_cnav_utc_model.h"
-#include <cmath>
+

 Gps_CNAV_Utc_Model::Gps_CNAV_Utc_Model()
 {
--- a/src/core/system_parameters/gps_cnav_utc_model.h
+++ b/src/core/system_parameters/gps_cnav_utc_model.h
@ -32,7 +32,6 @@
 #ifndef GNSS_SDR_GPS_CNAV_UTC_MODEL_H_
 #define GNSS_SDR_GPS_CNAV_UTC_MODEL_H_

-#include "GPS_L2C.h"
 #include "boost/assign.hpp"
 #include <boost/serialization/nvp.hpp>

--- a/src/core/system_parameters/gps_ephemeris.cc
+++ b/src/core/system_parameters/gps_ephemeris.cc
@ -31,6 +31,8 @@
 */

 #include "gps_ephemeris.h"
+#include <cmath>
+#include "GPS_L1_CA.h"

 Gps_Ephemeris::Gps_Ephemeris()
 {
--- a/src/core/system_parameters/gps_ephemeris.h
+++ b/src/core/system_parameters/gps_ephemeris.h
@ -32,12 +32,12 @@
 #ifndef GNSS_SDR_GPS_EPHEMERIS_H_
 #define GNSS_SDR_GPS_EPHEMERIS_H_

-#include <iostream>
+
 #include <map>
 #include <string>
 #include "boost/assign.hpp"
 #include <boost/serialization/nvp.hpp>
-#include "GPS_L1_CA.h"
+


 /*!
--- a/src/core/system_parameters/gps_iono.h
+++ b/src/core/system_parameters/gps_iono.h
@ -32,7 +32,7 @@
 #ifndef GNSS_SDR_GPS_IONO_H_
 #define GNSS_SDR_GPS_IONO_H_

-#include "GPS_L1_CA.h"
+
 #include "boost/assign.hpp"
 #include <boost/serialization/nvp.hpp>

--- a/src/core/system_parameters/gps_navigation_message.cc
+++ b/src/core/system_parameters/gps_navigation_message.cc
@ -1,5 +1,5 @@
 /*!
- * \file gps_navigation_message.cc
+m * \file gps_navigation_message.cc
 * \brief  Implementation of a GPS NAV Data message decoder as described in IS-GPS-200E
 *
 * See http://www.gps.gov/technical/icwg/IS-GPS-200E.pdf Appendix II
@ -32,7 +32,7 @@

 #include "gps_navigation_message.h"
 #include <cmath>
-#include "boost/date_time/posix_time/posix_time.hpp"
+#include <iostream>


 void Gps_Navigation_Message::reset()
--- a/src/core/system_parameters/gps_navigation_message.h
+++ b/src/core/system_parameters/gps_navigation_message.h
@ -32,15 +32,12 @@
 #ifndef GNSS_SDR_GPS_NAVIGATION_MESSAGE_H_
 #define GNSS_SDR_GPS_NAVIGATION_MESSAGE_H_

-#include <algorithm>
+
 #include <bitset>
-#include <cmath>
-#include <iostream>
 #include <map>
 #include <string>
-#include <vector>
 #include <utility>
-#include "boost/assign.hpp"
+#include <vector>
 #include "GPS_L1_CA.h"
 #include "gps_ephemeris.h"
 #include "gps_iono.h"
--- a/src/core/system_parameters/gps_ref_location.h
+++ b/src/core/system_parameters/gps_ref_location.h
@ -32,7 +32,6 @@
 #ifndef GNSS_SDR_GPS_REF_LOCATION_H_
 #define GNSS_SDR_GPS_REF_LOCATION_H_

-#include "GPS_L1_CA.h"
 #include "boost/assign.hpp"
 #include <boost/serialization/nvp.hpp>

--- a/src/core/system_parameters/gps_ref_time.h
+++ b/src/core/system_parameters/gps_ref_time.h
@ -32,7 +32,6 @@
 #ifndef GNSS_SDR_GPS_REF_TIME_H_
 #define GNSS_SDR_GPS_REF_TIME_H_

-#include "GPS_L1_CA.h"
 #include "boost/assign.hpp"
 #include <boost/serialization/nvp.hpp>

--- a/src/core/system_parameters/gps_utc_model.h
+++ b/src/core/system_parameters/gps_utc_model.h
@ -32,7 +32,6 @@
 #ifndef GNSS_SDR_GPS_UTC_MODEL_H_
 #define GNSS_SDR_GPS_UTC_MODEL_H_

-#include "GPS_L1_CA.h"
 #include "boost/assign.hpp"
 #include <boost/serialization/nvp.hpp>

--- a/src/core/system_parameters/rtcm.cc
+++ b/src/core/system_parameters/rtcm.cc
@ -41,6 +41,8 @@
 #include <boost/dynamic_bitset.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
+#include "Galileo_E1.h"
+

 using google::LogMessage;

--- a/src/core/system_parameters/sbas_ephemeris.cc
+++ b/src/core/system_parameters/sbas_ephemeris.cc
@ -30,8 +30,6 @@
 */


-#include <stdio.h>
-#include <math.h>
 #include <iostream>
 #include "sbas_ephemeris.h"

--- a/src/core/system_parameters/sbas_ionospheric_correction.cc
+++ b/src/core/system_parameters/sbas_ionospheric_correction.cc
@ -29,12 +29,8 @@
 */

 #include "sbas_ionospheric_correction.h"
-#include <stdarg.h>
-#include <stdio.h>
 #include <cmath>
 #include <iostream>
-#include <sstream>
-#include <boost/serialization/map.hpp>
 #include <glog/logging.h>


@ -72,7 +68,7 @@ void Sbas_Ionosphere_Correction::print(std::ostream &out)
 * \param[in]  longitude_d  Receiver's longitude in terms of WGS84 (degree)
 * \param[in]  latitude_d   Receiver's latitude in terms of WGS84 (degree)
 * \param[in]  azimuth_d    Satellite azimuth/elavation angle (rad). Azimuth is the angle of
- *                             the satellite from the userÕs location measured clockwise from north
+ *                             the satellite from the user<EFBFBD>s location measured clockwise from north
 * \param[in]  elevation_d  Elevation is the angle of the satellite from the user's location measured
 *                             with respect to the local-tangent-plane
 */
--- a/src/tests/formats/rtcm_test.cc
+++ b/src/tests/formats/rtcm_test.cc
@ -32,6 +32,7 @@
 #include <memory>
 #include <thread>
 #include "rtcm.h"
+#include "Galileo_E1.h"

 TEST(Rtcm_Test, Hex_to_bin)
 {