Remove iostream from header files

and in redundant places such as in unit tests
This commit is contained in:
Carles Fernandez 2018-02-25 22:49:06 +01:00
parent 372790392d
commit 24f6003ba0
64 changed files with 102 additions and 192 deletions

View File

@ -33,7 +33,6 @@
#define GNSS_SDR_HYBRID_LS_PVT_H_ #define GNSS_SDR_HYBRID_LS_PVT_H_
#include <fstream> #include <fstream>
#include <iostream>
#include <map> #include <map>
#include <string> #include <string>
#include "ls_pvt.h" #include "ls_pvt.h"

View File

@ -33,11 +33,11 @@
#ifndef GNSS_SDR_KML_PRINTER_H_ #ifndef GNSS_SDR_KML_PRINTER_H_
#define GNSS_SDR_KML_PRINTER_H_ #define GNSS_SDR_KML_PRINTER_H_
#include <iostream> #include "pvt_solution.h"
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <string> #include <string>
#include "pvt_solution.h"
/*! /*!
* \brief Prints PVT information to OGC KML format file (can be viewed with Google Earth) * \brief Prints PVT information to OGC KML format file (can be viewed with Google Earth)

View File

@ -37,7 +37,6 @@
#define GNSS_SDR_NMEA_PRINTER_H_ #define GNSS_SDR_NMEA_PRINTER_H_
#include <iostream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include "pvt_solution.h" #include "pvt_solution.h"

View File

@ -53,7 +53,6 @@
#include <string> #include <string>
#include <fstream> #include <fstream>
#include <iostream>
#include <sstream> // for stringstream #include <sstream> // for stringstream
#include <iomanip> // for setprecision #include <iomanip> // for setprecision
#include <map> #include <map>

View File

@ -32,7 +32,6 @@
*/ */
#include "rtcm_printer.h" #include "rtcm_printer.h"
#include <iostream>
#include <iomanip> #include <iomanip>
#include <fcntl.h> // for O_RDWR #include <fcntl.h> // for O_RDWR
#include <termios.h> // for tcgetattr #include <termios.h> // for tcgetattr

View File

@ -35,7 +35,6 @@
#define GNSS_SDR_RTCM_PRINTER_H_ #define GNSS_SDR_RTCM_PRINTER_H_
#include <fstream> // std::ofstream #include <fstream> // std::ofstream
#include <iostream> // std::cout
#include <memory> // std::shared_ptr #include <memory> // std::shared_ptr
#include "rtcm.h" #include "rtcm.h"

View File

@ -55,7 +55,6 @@
#define GNSS_SDR_RTKLIB_SOLVER_H_ #define GNSS_SDR_RTKLIB_SOLVER_H_
#include <fstream> #include <fstream>
#include <iostream>
#include <map> #include <map>
#include <string> #include <string>
#include "rtklib_rtkpos.h" #include "rtklib_rtkpos.h"

View File

@ -34,6 +34,7 @@
#include "labsat23_source.h" #include "labsat23_source.h"
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <iostream>
#include <sstream> #include <sstream>

View File

@ -32,10 +32,10 @@
#define GNSS_SDR_LABSAT23_SOURCE_H #define GNSS_SDR_LABSAT23_SOURCE_H
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <string> #include <cstdint>
#include <iostream>
#include <fstream> #include <fstream>
#include <stdint.h> #include <string>
class labsat23_source; class labsat23_source;

View File

@ -34,7 +34,6 @@
#ifndef GNSS_SDR_SUPL_CLIENT_H_ #ifndef GNSS_SDR_SUPL_CLIENT_H_
#define GNSS_SDR_SUPL_CLIENT_H_ #define GNSS_SDR_SUPL_CLIENT_H_
#include <iostream>
#include <fstream> #include <fstream>
#include <map> #include <map>
#include <string> #include <string>

View File

@ -31,7 +31,6 @@
*/ */
#include "glonass_gnav_utc_model.h" #include "glonass_gnav_utc_model.h"
#include <cmath>
Glonass_Gnav_Utc_Model::Glonass_Gnav_Utc_Model() Glonass_Gnav_Utc_Model::Glonass_Gnav_Utc_Model()
{ {
@ -44,6 +43,7 @@ Glonass_Gnav_Utc_Model::Glonass_Gnav_Utc_Model()
d_B2 = 0.0; d_B2 = 0.0;
} }
double Glonass_Gnav_Utc_Model::utc_time(double glonass_time_corrected) double Glonass_Gnav_Utc_Model::utc_time(double glonass_time_corrected)
{ {
double t_utc; double t_utc;

View File

@ -36,7 +36,6 @@
#include "boost/assign.hpp" #include "boost/assign.hpp"
#include <boost/serialization/nvp.hpp> #include <boost/serialization/nvp.hpp>
#include <iostream>
/*! /*!
* \brief This class is a storage for the GLONASS GNAV UTC MODEL data as described in GLONASS ICD (Edition 5.1) * \brief This class is a storage for the GLONASS GNAV UTC MODEL data as described in GLONASS ICD (Edition 5.1)

View File

@ -39,8 +39,6 @@ Gnss_Satellite::Gnss_Satellite()
} }
Gnss_Satellite::Gnss_Satellite(const std::string& system_, unsigned int PRN_) Gnss_Satellite::Gnss_Satellite(const std::string& system_, unsigned int PRN_)
{ {
Gnss_Satellite::reset(); Gnss_Satellite::reset();
@ -50,15 +48,10 @@ Gnss_Satellite::Gnss_Satellite(const std::string& system_, unsigned int PRN_)
} }
Gnss_Satellite::~Gnss_Satellite() Gnss_Satellite::~Gnss_Satellite()
{} {}
void Gnss_Satellite::reset() void Gnss_Satellite::reset()
{ {
system_set = {"GPS", "Glonass", "SBAS", "Galileo", "Beidou"}; system_set = {"GPS", "Glonass", "SBAS", "Galileo", "Beidou"};
@ -74,7 +67,6 @@ void Gnss_Satellite::reset()
} }
std::ostream& operator<<(std::ostream &out, const Gnss_Satellite &sat) // output std::ostream& operator<<(std::ostream &out, const Gnss_Satellite &sat) // output
{ {
std::string tag(""); std::string tag("");
@ -138,23 +130,23 @@ void Gnss_Satellite::set_system(const std::string& system_)
void Gnss_Satellite::update_PRN(unsigned int PRN_) void Gnss_Satellite::update_PRN(unsigned int PRN_)
{ {
if (system.compare("Glonass") != 0) if (system.compare("Glonass") != 0)
{ {
DLOG(INFO) << "Trying to update PRN for not GLONASS system"; DLOG(INFO) << "Trying to update PRN for not GLONASS system";
PRN = 0; PRN = 0;
} }
else else
{ {
if (PRN_ < 1 or PRN_ > 24) if (PRN_ < 1 or PRN_ > 24)
{ {
DLOG(INFO) << "This PRN is not defined"; DLOG(INFO) << "This PRN is not defined";
// Adjusting for PRN 26, now used in // Adjusting for PRN 26, now used in
PRN = PRN_; PRN = PRN_;
} }
else else
{ {
PRN = PRN_; PRN = PRN_;
} }
} }
} }
@ -179,17 +171,17 @@ void Gnss_Satellite::set_PRN(unsigned int PRN_)
} }
} }
else if (system.compare("Glonass") == 0) else if (system.compare("Glonass") == 0)
{ {
if (PRN_ < 1 or PRN_ > 24) if (PRN_ < 1 or PRN_ > 24)
{ {
DLOG(INFO) << "This PRN is not defined"; DLOG(INFO) << "This PRN is not defined";
PRN = 0; PRN = 0;
} }
else else
{ {
PRN = PRN_; PRN = PRN_;
} }
} }
else if (system.compare("SBAS") == 0) else if (system.compare("SBAS") == 0)
{ {
if (PRN_ == 122){ PRN = PRN_; } // WAAS Inmarsat 3F4 (AOR-W) if (PRN_ == 122){ PRN = PRN_; } // WAAS Inmarsat 3F4 (AOR-W)
@ -205,15 +197,15 @@ void Gnss_Satellite::set_PRN(unsigned int PRN_)
} }
else if (system.compare("Galileo") == 0) else if (system.compare("Galileo") == 0)
{ {
if (PRN_ < 1 or PRN_ > 36) if (PRN_ < 1 or PRN_ > 36)
{ {
DLOG(INFO) << "This PRN is not defined"; DLOG(INFO) << "This PRN is not defined";
PRN = 0; PRN = 0;
} }
else else
{ {
PRN = PRN_; PRN = PRN_;
} }
} }
else else
{ {
@ -241,10 +233,6 @@ unsigned int Gnss_Satellite::get_PRN() const
} }
std::string Gnss_Satellite::get_system() const std::string Gnss_Satellite::get_system() const
{ {
// Get the satellite system {"GPS", "Glonass", "SBAS", "Galileo", "Beidou"} // Get the satellite system {"GPS", "Glonass", "SBAS", "Galileo", "Beidou"}
@ -253,6 +241,7 @@ std::string Gnss_Satellite::get_system() const
return system_; return system_;
} }
std::string Gnss_Satellite::get_system_short() const std::string Gnss_Satellite::get_system_short() const
{ {
// Get the satellite system {"G", "R", "S", "E", "C"} // Get the satellite system {"G", "R", "S", "E", "C"}
@ -260,8 +249,6 @@ std::string Gnss_Satellite::get_system_short() const
} }
std::string Gnss_Satellite::get_block() const std::string Gnss_Satellite::get_block() const
{ {
// Get the satellite block // Get the satellite block
@ -271,16 +258,14 @@ std::string Gnss_Satellite::get_block() const
} }
std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int PRN_) std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int PRN_)
{ {
std::string block_ = "Unknown"; std::string block_ = "Unknown";
if (system_.compare("GPS") == 0) if (system_.compare("GPS") == 0)
{ {
// info from https://www.navcen.uscg.gov/?Do=constellationStatus
switch ( PRN_ ) switch ( PRN_ )
{ {
// info from https://www.navcen.uscg.gov/?Do=constellationStatus
case 1 : case 1 :
block_ = std::string("IIF"); // Plane D block_ = std::string("IIF"); // Plane D
break; break;
@ -382,14 +367,12 @@ std::string Gnss_Satellite::what_block(const std::string& system_, unsigned int
} }
} }
if (system_.compare("Glonass") == 0) if (system_.compare("Glonass") == 0)
{ {
switch ( PRN_ )
{
// Info from http://www.sdcm.ru/smglo/grupglo?version=eng&site=extern // Info from http://www.sdcm.ru/smglo/grupglo?version=eng&site=extern
// See also http://www.glonass-center.ru/en/GLONASS/ // See also http://www.glonass-center.ru/en/GLONASS/
switch ( PRN_ )
{
case 1 : case 1 :
block_ = std::string("1"); // Plane 1 block_ = std::string("1"); // Plane 1
rf_link = 1; rf_link = 1;

View File

@ -34,7 +34,6 @@
#include <string> #include <string>
#include <set> #include <set>
#include <iostream>
#include <map> #include <map>

View File

@ -32,7 +32,6 @@
#include "gps_cnav_ephemeris.h" #include "gps_cnav_ephemeris.h"
#include <cmath> #include <cmath>
#include <iostream>
Gps_CNAV_Ephemeris::Gps_CNAV_Ephemeris() Gps_CNAV_Ephemeris::Gps_CNAV_Ephemeris()
{ {
@ -120,8 +119,8 @@ double Gps_CNAV_Ephemeris::sv_clock_drift(double transmitTime)
dt = check_t(transmitTime - d_Toc); dt = check_t(transmitTime - d_Toc);
d_satClkDrift = d_A_f0 + d_A_f1 * dt + d_A_f2 * (dt * dt) + sv_clock_relativistic_term(transmitTime); d_satClkDrift = d_A_f0 + d_A_f1 * dt + d_A_f2 * (dt * dt) + sv_clock_relativistic_term(transmitTime);
//Correct satellite group delay // Correct satellite group delay
d_satClkDrift-=d_TGD; d_satClkDrift -= d_TGD;
return d_satClkDrift; return d_satClkDrift;
} }
@ -201,7 +200,6 @@ double Gps_CNAV_Ephemeris::satellitePosition(double transmitTime)
const double A_REF = 26559710.0; // See IS-GPS-200H, pp. 170 const double A_REF = 26559710.0; // See IS-GPS-200H, pp. 170
double d_sqrt_A = sqrt(A_REF + d_DELTA_A); double d_sqrt_A = sqrt(A_REF + d_DELTA_A);
const double GM = 3.986005e14; //!< Universal gravitational constant times the mass of the Earth, [m^3/s^2] const double GM = 3.986005e14; //!< Universal gravitational constant times the mass of the Earth, [m^3/s^2]
const double OMEGA_DOT_REF = -2.6e-9; // semicircles / s, see IS-GPS-200H pp. 164 const double OMEGA_DOT_REF = -2.6e-9; // semicircles / s, see IS-GPS-200H pp. 164
const double OMEGA_EARTH_DOT = 7.2921151467e-5; //!< Earth rotation rate, [rad/s] const double OMEGA_EARTH_DOT = 7.2921151467e-5; //!< Earth rotation rate, [rad/s]
@ -218,7 +216,7 @@ double Gps_CNAV_Ephemeris::satellitePosition(double transmitTime)
// Mean motion difference from computed value // Mean motion difference from computed value
double delta_n_a=d_Delta_n+0.5*d_DELTA_DOT_N*tk; double delta_n_a = d_Delta_n + 0.5 * d_DELTA_DOT_N * tk;
// Corrected mean motion // Corrected mean motion
n = n0 + delta_n_a; n = n0 + delta_n_a;

View File

@ -49,13 +49,8 @@ double Gps_CNAV_Utc_Model::utc_time(double gpstime_corrected, int i_GPS_week)
{ {
double t_utc; double t_utc;
double t_utc_daytime; double t_utc_daytime;
double Delta_t_UTC = d_DeltaT_LS + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * static_cast<double>(i_GPS_week - i_WN_T)); double Delta_t_UTC = d_DeltaT_LS + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * static_cast<double>(i_GPS_week - i_WN_T));
//std::cout<<"d_DeltaT_LS="<<d_DeltaT_LS
// <<"d_A0="<<d_A0
// <<"d_A1="<<d_A1
// <<"d_t_OT="<<d_t_OT
// <<"i_WN_T="<<i_WN_T<<std::endl;
// Determine if the effectivity time of the leap second event is in the past // Determine if the effectivity time of the leap second event is in the past
int weeksToLeapSecondEvent = i_WN_LSF - i_GPS_week; int weeksToLeapSecondEvent = i_WN_LSF - i_GPS_week;
@ -104,10 +99,10 @@ double Gps_CNAV_Utc_Model::utc_time(double gpstime_corrected, int i_GPS_week)
/* 20.3.3.5.2.4c /* 20.3.3.5.2.4c
* Whenever the effectivity time of the leap second event, as indicated by the * Whenever the effectivity time of the leap second event, as indicated by the
* WNLSF and DN values, is in the "past" (relative to the user's current time), * WNLSF and DN values, is in the "past" (relative to the user's current time),
* and the user<EFBFBD>s current time does not fall in the time span as given above * and the user's current time does not fall in the time span as given above
* in 20.3.3.5.2.4b,*/ * in 20.3.3.5.2.4b,*/
/* FOR CNAV: Replace the 20.3.3.5.2.4c with 30.3.3.6.2 UTC and GPS Time as follows */ /* FOR CNAV: Replace the 20.3.3.5.2.4c with 30.3.3.6.2 UTC and GPS Time as follows */
double tmp_d= (gpstime_corrected - d_t_OT + 604800 * static_cast<double>(i_GPS_week - i_WN_T)); double tmp_d = (gpstime_corrected - d_t_OT + 604800 * static_cast<double>(i_GPS_week - i_WN_T));
Delta_t_UTC = d_DeltaT_LSF + d_A0 + d_A1 * tmp_d + d_A2*tmp_d*tmp_d; Delta_t_UTC = d_DeltaT_LSF + d_A0 + d_A1 * tmp_d + d_A2*tmp_d*tmp_d;
t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400); t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400);
} }

View File

@ -34,7 +34,7 @@
#include "boost/assign.hpp" #include "boost/assign.hpp"
#include <boost/serialization/nvp.hpp> #include <boost/serialization/nvp.hpp>
#include <iostream>
/*! /*!
* \brief This class is a storage for the GPS UTC MODEL data as described in in IS-GPS-200H * \brief This class is a storage for the GPS UTC MODEL data as described in in IS-GPS-200H

View File

@ -31,7 +31,6 @@
#include <string> #include <string>
#include <iostream>
#include "file_configuration.h" #include "file_configuration.h"

View File

@ -31,7 +31,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -42,7 +42,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <glog/logging.h> #include <glog/logging.h>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>

View File

@ -33,7 +33,6 @@
#include <chrono> #include <chrono>
#include <fstream> #include <fstream>
#include <iostream>
#include <stdexcept> #include <stdexcept>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <glog/logging.h> #include <glog/logging.h>

View File

@ -30,11 +30,7 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#include <chrono> #include <chrono>
#include <iostream>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>

View File

@ -30,7 +30,6 @@
*/ */
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <cstdlib> #include <cstdlib>
#include <iostream>
#include <boost/chrono.hpp> #include <boost/chrono.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -33,7 +33,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <glog/logging.h> #include <glog/logging.h>

View File

@ -31,7 +31,6 @@
#include <chrono> #include <chrono>
#include <cstdlib> #include <cstdlib>
#include <iostream>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>

View File

@ -33,7 +33,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <stdexcept> #include <stdexcept>
#include <glog/logging.h> #include <glog/logging.h>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>

View File

@ -33,7 +33,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>

View File

@ -33,7 +33,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>

View File

@ -30,8 +30,7 @@
#include <chrono> #include <chrono>
#include <complex> #include <complex>
#include <iostream> #include <cstdint>
#include <stdint.h>
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -30,8 +30,7 @@
#include <chrono> #include <chrono>
#include <complex> #include <complex>
#include <iostream> #include <cstdint>
#include <stdint.h>
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -30,8 +30,7 @@
#include <chrono> #include <chrono>
#include <complex> #include <complex>
#include <iostream> #include <cstdint>
#include <stdint.h>
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -30,8 +30,7 @@
#include <chrono> #include <chrono>
#include <complex> #include <complex>
#include <iostream> #include <cstdint>
#include <stdint.h>
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -30,62 +30,62 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#include <iostream>
#include <cmath>
#include <matio.h>
#include "acquisition_dump_reader.h" #include "acquisition_dump_reader.h"
#include <matio.h>
#include <cmath>
#include <iostream>
bool acquisition_dump_reader::read_binary_acq() bool acquisition_dump_reader::read_binary_acq()
{ {
mat_t* matfile = Mat_Open(d_dump_filename.c_str(), MAT_ACC_RDONLY); mat_t* matfile = Mat_Open(d_dump_filename.c_str(), MAT_ACC_RDONLY);
if( matfile == NULL) if( matfile == NULL)
{ {
std::cout << "¡¡¡Unreachable Acquisition dump file!!!" << std::endl; std::cout << "¡¡¡Unreachable Acquisition dump file!!!" << std::endl;
return false; return false;
} }
matvar_t* var_= Mat_VarRead(matfile, "grid"); matvar_t* var_= Mat_VarRead(matfile, "grid");
if( var_ == NULL) if( var_ == NULL)
{ {
std::cout << "¡¡¡Unreachable grid variable into Acquisition dump file!!!" << std::endl; std::cout << "¡¡¡Unreachable grid variable into Acquisition dump file!!!" << std::endl;
Mat_Close(matfile); Mat_Close(matfile);
return false; return false;
} }
if(var_->rank != 2) if(var_->rank != 2)
{ {
std::cout << "Invalid Acquisition dump file: rank error" << std::endl; std::cout << "Invalid Acquisition dump file: rank error" << std::endl;
Mat_VarFree(var_); Mat_VarFree(var_);
Mat_Close(matfile); Mat_Close(matfile);
return false; return false;
} }
if((var_->dims[0] != d_samples_per_code) or (var_->dims[1] != d_num_doppler_bins)) if((var_->dims[0] != d_samples_per_code) or (var_->dims[1] != d_num_doppler_bins))
{ {
std::cout << "Invalid Acquisition dump file: dimension matrix error" << std::endl; std::cout << "Invalid Acquisition dump file: dimension matrix error" << std::endl;
if(var_->dims[0] != d_samples_per_code) std::cout << "Expected " << d_samples_per_code << " samples per code. Obtained " << var_->dims[0] << std::endl; if(var_->dims[0] != d_samples_per_code) std::cout << "Expected " << d_samples_per_code << " samples per code. Obtained " << var_->dims[0] << std::endl;
if(var_->dims[1] != d_num_doppler_bins) std::cout << "Expected " << d_num_doppler_bins << " Doppler bins. Obtained " << var_->dims[1] << std::endl; if(var_->dims[1] != d_num_doppler_bins) std::cout << "Expected " << d_num_doppler_bins << " Doppler bins. Obtained " << var_->dims[1] << std::endl;
Mat_VarFree(var_); Mat_VarFree(var_);
Mat_Close(matfile); Mat_Close(matfile);
return false; return false;
} }
if(var_->data_type != MAT_T_SINGLE) if(var_->data_type != MAT_T_SINGLE)
{ {
std::cout << "Invalid Acquisition dump file: data type error" << std::endl; std::cout << "Invalid Acquisition dump file: data type error" << std::endl;
Mat_VarFree(var_); Mat_VarFree(var_);
Mat_Close(matfile); Mat_Close(matfile);
return false; return false;
} }
std::vector<std::vector<float> >::iterator it1; std::vector<std::vector<float> >::iterator it1;
std::vector<float>::iterator it2; std::vector<float>::iterator it2;
float* aux = static_cast<float*>(var_->data); float* aux = static_cast<float*>(var_->data);
int k = 0; int k = 0;
float normalization_factor = std::pow(d_samples_per_code, 2); float normalization_factor = std::pow(d_samples_per_code, 2);
for(it1 = mag.begin(); it1 != mag.end(); it1++) for(it1 = mag.begin(); it1 != mag.end(); it1++)
{
for(it2 = it1->begin(); it2 != it1->end(); it2++)
{ {
*it2 = static_cast<float>(std::sqrt(aux[k])) / normalization_factor; for(it2 = it1->begin(); it2 != it1->end(); it2++)
k++; {
*it2 = static_cast<float>(std::sqrt(aux[k])) / normalization_factor;
k++;
}
} }
}
Mat_VarFree(var_); Mat_VarFree(var_);
Mat_Close(matfile); Mat_Close(matfile);

View File

@ -29,6 +29,7 @@
*/ */
#include "observables_dump_reader.h" #include "observables_dump_reader.h"
#include <iostream>
bool observables_dump_reader::read_binary_obs() bool observables_dump_reader::read_binary_obs()
{ {

View File

@ -31,7 +31,6 @@
#ifndef GNSS_SDR_OBSERVABLES_DUMP_READER_H #ifndef GNSS_SDR_OBSERVABLES_DUMP_READER_H
#define GNSS_SDR_OBSERVABLES_DUMP_READER_H #define GNSS_SDR_OBSERVABLES_DUMP_READER_H
#include <iostream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -29,6 +29,7 @@
*/ */
#include "tlm_dump_reader.h" #include "tlm_dump_reader.h"
#include <iostream>
bool tlm_dump_reader::read_binary_obs() bool tlm_dump_reader::read_binary_obs()
{ {

View File

@ -31,7 +31,6 @@
#ifndef GNSS_SDR_TLM_DUMP_READER_H #ifndef GNSS_SDR_TLM_DUMP_READER_H
#define GNSS_SDR_TLM_DUMP_READER_H #define GNSS_SDR_TLM_DUMP_READER_H
#include <iostream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -29,6 +29,7 @@
*/ */
#include "tracking_dump_reader.h" #include "tracking_dump_reader.h"
#include <iostream>
bool tracking_dump_reader::read_binary_obs() bool tracking_dump_reader::read_binary_obs()
{ {

View File

@ -31,7 +31,6 @@
#ifndef GNSS_SDR_TRACKING_DUMP_READER_H #ifndef GNSS_SDR_TRACKING_DUMP_READER_H
#define GNSS_SDR_TRACKING_DUMP_READER_H #define GNSS_SDR_TRACKING_DUMP_READER_H
#include <iostream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -29,6 +29,7 @@
*/ */
#include "tracking_true_obs_reader.h" #include "tracking_true_obs_reader.h"
#include <iostream>
bool tracking_true_obs_reader::read_binary_obs() bool tracking_true_obs_reader::read_binary_obs()
{ {

View File

@ -31,7 +31,6 @@
#ifndef GNSS_SDR_TRACKING_TRUE_OBS_READER_H #ifndef GNSS_SDR_TRACKING_TRUE_OBS_READER_H
#define GNSS_SDR_TRACKING_TRUE_OBS_READER_H #define GNSS_SDR_TRACKING_TRUE_OBS_READER_H
#include <iostream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -29,6 +29,7 @@
*/ */
#include "true_observables_reader.h" #include "true_observables_reader.h"
#include <iostream>
bool true_observables_reader::read_binary_obs() bool true_observables_reader::read_binary_obs()
{ {

View File

@ -31,7 +31,6 @@
#ifndef GNSS_SDR_TRUE_OBSERVABLES_READER_H #ifndef GNSS_SDR_TRUE_OBSERVABLES_READER_H
#define GNSS_SDR_TRUE_OBSERVABLES_READER_H #define GNSS_SDR_TRUE_OBSERVABLES_READER_H
#include <iostream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@ -33,7 +33,6 @@
#include <unistd.h> #include <unistd.h>
#include <chrono> #include <chrono>
#include <exception> #include <exception>
#include <iostream>
#include <armadillo> #include <armadillo>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>

View File

@ -30,7 +30,6 @@
#include <cstdio> #include <cstdio>
#include <iostream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include "nmea_printer.h" #include "nmea_printer.h"

View File

@ -28,7 +28,6 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#include <iostream>
#include <string> #include <string>
#include "rinex_printer.h" #include "rinex_printer.h"

View File

@ -28,13 +28,9 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
//#include <fstream>
//#include <map>
#include <string> #include <string>
//#include <boost/archive/xml_iarchive.hpp>
//#include <boost/serialization/nvp.hpp>
#include "rtcm_printer.h" #include "rtcm_printer.h"
//#include "gps_ephemeris.h"
TEST(RtcmPrinterTest, Instantiate) TEST(RtcmPrinterTest, Instantiate)
@ -51,22 +47,6 @@ TEST(RtcmPrinterTest, Instantiate)
TEST(RtcmPrinterTest, Run) TEST(RtcmPrinterTest, Run)
{ {
// std::string file_name = "./gps_ephemeris_rx.xml";
// std::map<int,Gps_Ephemeris> gps_ephemeris_map;
// try
// {
// std::ifstream ifs(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
// boost::archive::xml_iarchive xml(ifs);
// gps_ephemeris_map.clear();
// xml >> boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", gps_ephemeris_map);
// ifs.close();
// }
// catch (const std::exception& e)
// {
// //LOG(WARNING) << e.what() << "File: " << file_name;
// //std::cout << "File not found" << std::endl;
// }
std::string filename = "test.rtcm"; std::string filename = "test.rtcm";
bool flag_rtcm_tty_port = false; bool flag_rtcm_tty_port = false;
std::string rtcm_dump_devname = "/dev/pts/4"; std::string rtcm_dump_devname = "/dev/pts/4";

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>
#include <gnuradio/analog/sig_source_c.h> #include <gnuradio/analog/sig_source_c.h>

View File

@ -30,7 +30,6 @@
*/ */
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>
#include <gnuradio/analog/sig_source_c.h> #include <gnuradio/analog/sig_source_c.h>

View File

@ -33,7 +33,6 @@
#include <unistd.h> #include <unistd.h>
#include <chrono> #include <chrono>
#include <exception> #include <exception>
#include <iostream>
#include <string> #include <string>
#include <armadillo> #include <armadillo>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>

View File

@ -31,7 +31,6 @@
*/ */
#include <chrono> #include <chrono>
#include <iostream>
#include <unistd.h> #include <unistd.h>
#include <vector> #include <vector>
#include <armadillo> #include <armadillo>

View File

@ -33,7 +33,6 @@
#include <chrono> #include <chrono>
#include <fcntl.h> #include <fcntl.h>
#include <iostream>
#include <unistd.h> #include <unistd.h>
#include <armadillo> #include <armadillo>
#include <boost/thread.hpp>// to test the FPGA we have to create a simultaneous task to send the samples using the DMA and stop the test #include <boost/thread.hpp>// to test the FPGA we have to create a simultaneous task to send the samples using the DMA and stop the test

View File

@ -32,7 +32,6 @@
#include <chrono> #include <chrono>
#include <iostream>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/analog/sig_source_waveform.h>