mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 20:50:33 +00:00
Code Issues Releases Wiki Activity

Minor changes in RINEX printer version setting

Browse Source
This commit is contained in:
Unknown 2017-11-10 14:38:16 +01:00
parent baf2afdd3e
commit 218844cce5
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/algorithms/PVT/libs/rinex_printer.cc
View File

@ -409,8 +409,8 @@ std::string Rinex_Printer::getLocalTime()
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Galileo_Iono& iono, const Galileo_Utc_Model& utc_model, const Galileo_Almanac& galileo_almanac) void Rinex_Printer::rinex_nav_header(std::fstream& out, const Galileo_Iono& iono, const Galileo_Utc_Model& utc_model, const Galileo_Almanac& galileo_almanac)
{ {
std::string line; std::string line;
stringVersion = "3.02"; //stringVersion = "3.02";
version = 3; //version = 3;
// -------- Line 1 // -------- Line 1
line = std::string(5, ' '); line = std::string(5, ' ');
@ -815,8 +815,8 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& iono, co
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& gps_iono, const Gps_Utc_Model& gps_utc_model, const Galileo_Iono& galileo_iono, const Galileo_Utc_Model& galileo_utc_model, const Galileo_Almanac& galileo_almanac) void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& gps_iono, const Gps_Utc_Model& gps_utc_model, const Galileo_Iono& galileo_iono, const Galileo_Utc_Model& galileo_utc_model, const Galileo_Almanac& galileo_almanac)
{ {
std::string line; std::string line;
stringVersion = "3.02"; //stringVersion = "3.02";
version = 3; //version = 3;
// -------- Line 1 // -------- Line 1
line = std::string(5, ' '); line = std::string(5, ' ');
@ -2909,11 +2909,11 @@ void Rinex_Printer::rinex_obs_header(std::fstream & out, const Gps_Ephemeris & e
void Rinex_Printer::rinex_obs_header(std::fstream& out, const Galileo_Ephemeris& eph, const double d_TOW_first_observation, const std::string bands) void Rinex_Printer::rinex_obs_header(std::fstream& out, const Galileo_Ephemeris& eph, const double d_TOW_first_observation, const std::string bands)
{ {
std::string line; std::string line;
version = 3; //version = 3;
// -------- Line 1 // -------- Line 1
line = std::string(5, ' '); line = std::string(5, ' ');
line += "3.02"; line += stringVersion;
line += std::string(11, ' '); line += std::string(11, ' ');
line += Rinex_Printer::leftJustify("OBSERVATION DATA", 20); line += Rinex_Printer::leftJustify("OBSERVATION DATA", 20);
line += satelliteSystem["Galileo"]; line += satelliteSystem["Galileo"];
@ -3171,11 +3171,11 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps
{ {
if(galileo_eph.e_1){} // avoid warning, not needed if(galileo_eph.e_1){} // avoid warning, not needed
std::string line; std::string line;
version = 3; //version = 3;
// -------- Line 1 // -------- Line 1
line = std::string(5, ' '); line = std::string(5, ' ');
line += "3.02"; line += stringVersion;
line += std::string(11, ' '); line += std::string(11, ' ');
line += Rinex_Printer::leftJustify("OBSERVATION DATA", 20); line += Rinex_Printer::leftJustify("OBSERVATION DATA", 20);
line += satelliteSystem["Mixed"]; line += satelliteSystem["Mixed"];

22
src/tests/system-tests/obs_system_test.cc
View File

@ -67,8 +67,8 @@ DEFINE_double(pr_error_mean_max, 25.0, "Maximum mean error in pseudorange");
DEFINE_double(pr_error_std_max, 5.0, "Maximum standard deviation in pseudorange"); DEFINE_double(pr_error_std_max, 5.0, "Maximum standard deviation in pseudorange");
DEFINE_double(cp_error_mean_max, 5.0, "Maximum mean error in carrier phase"); DEFINE_double(cp_error_mean_max, 5.0, "Maximum mean error in carrier phase");
DEFINE_double(cp_error_std_max, 2.5, "Maximum standard deviation in carrier phase"); DEFINE_double(cp_error_std_max, 2.5, "Maximum standard deviation in carrier phase");
DEFINE_double(dp_error_mean_max, 50.0, "Maximum mean error in Doppler frequency"); DEFINE_double(dp_error_mean_max, 75.0, "Maximum mean error in Doppler frequency");
DEFINE_double(dp_error_std_max, 15.0, "Maximum standard deviation in Doppler frequency"); DEFINE_double(dp_error_std_max, 25.0, "Maximum standard deviation in Doppler frequency");
DEFINE_bool(plot_obs_sys_test, false, "Plots results of ObsSystemTest with gnuplot"); DEFINE_bool(plot_obs_sys_test, false, "Plots results of ObsSystemTest with gnuplot");
class ObsSystemTest: public ::testing::Test class ObsSystemTest: public ::testing::Test
@ -538,12 +538,12 @@ void ObsSystemTest::compute_pseudorange_error(
{ {
if(!iter_diff->is_empty()) if(!iter_diff->is_empty())
{ {
double d_mean = arma::mean(*iter_diff); double d_mean = std::sqrt(arma::mean(arma::square(*iter_diff)));
means.push_back(d_mean); means.push_back(d_mean);
double d_stddev = arma::stddev(*iter_diff); double d_stddev = arma::stddev(*iter_diff);
stddevs.push_back(d_stddev); stddevs.push_back(d_stddev);
prns.push_back(static_cast<double>(prn_id)); prns.push_back(static_cast<double>(prn_id));
std::cout << "-- Mean pseudorange difference for sat " << prn_id << ": " << d_mean; std::cout << "-- RMS pseudorange difference for sat " << prn_id << ": " << d_mean;
std::cout << " +/- " << d_stddev; std::cout << " +/- " << d_stddev;
std::cout << " [m]" << std::endl; std::cout << " [m]" << std::endl;
EXPECT_LT(d_mean, error_th_mean); EXPECT_LT(d_mean, error_th_mean);
@ -574,7 +574,7 @@ void ObsSystemTest::compute_pseudorange_error(
g1.set_grid(); g1.set_grid();
g1.set_xlabel("PRN"); g1.set_xlabel("PRN");
g1.set_ylabel("Pseudorange error [m]"); g1.set_ylabel("Pseudorange error [m]");
g1.plot_xy(prns, means, "Mean"); g1.plot_xy(prns, means, "RMS error");
g1.plot_xy(prns, stddevs, "Standard deviation"); g1.plot_xy(prns, stddevs, "Standard deviation");
//g1.savetops("FFT_execution_times_extended"); //g1.savetops("FFT_execution_times_extended");
//g1.savetopdf("FFT_execution_times_extended", 18); //g1.savetopdf("FFT_execution_times_extended", 18);
@ -602,12 +602,12 @@ void ObsSystemTest::compute_carrierphase_error(
{ {
if(!iter_diff->is_empty()) if(!iter_diff->is_empty())
{ {
double d_mean = arma::mean(*iter_diff); double d_mean = std::sqrt(arma::mean(arma::square(*iter_diff)));
means.push_back(d_mean); means.push_back(d_mean);
double d_stddev = arma::stddev(*iter_diff); double d_stddev = arma::stddev(*iter_diff);
stddevs.push_back(d_stddev); stddevs.push_back(d_stddev);
prns.push_back(static_cast<double>(prn_id)); prns.push_back(static_cast<double>(prn_id));
std::cout << "-- Mean carrier phase difference for sat " << prn_id << ": " << d_mean; std::cout << "-- RMS carrier phase difference for sat " << prn_id << ": " << d_mean;
std::cout << " +/- " << d_stddev; std::cout << " +/- " << d_stddev;
std::cout << " whole cycles" << std::endl; std::cout << " whole cycles" << std::endl;
EXPECT_LT(d_mean, error_th_mean); EXPECT_LT(d_mean, error_th_mean);
@ -638,7 +638,7 @@ void ObsSystemTest::compute_carrierphase_error(
g1.set_grid(); g1.set_grid();
g1.set_xlabel("PRN"); g1.set_xlabel("PRN");
g1.set_ylabel("Carrier phase error [whole cycles]"); g1.set_ylabel("Carrier phase error [whole cycles]");
g1.plot_xy(prns, means, "Mean"); g1.plot_xy(prns, means, "RMS error");
g1.plot_xy(prns, stddevs, "Standard deviation"); g1.plot_xy(prns, stddevs, "Standard deviation");
//g1.savetops("FFT_execution_times_extended"); //g1.savetops("FFT_execution_times_extended");
//g1.savetopdf("FFT_execution_times_extended", 18); //g1.savetopdf("FFT_execution_times_extended", 18);
@ -666,12 +666,12 @@ void ObsSystemTest::compute_doppler_error(
{ {
if(!iter_diff->is_empty()) if(!iter_diff->is_empty())
{ {
double d_mean = arma::mean(*iter_diff); double d_mean = std::sqrt(arma::mean(arma::square(*iter_diff)));
means.push_back(d_mean); means.push_back(d_mean);
double d_stddev = arma::stddev(*iter_diff); double d_stddev = arma::stddev(*iter_diff);
stddevs.push_back(d_stddev); stddevs.push_back(d_stddev);
prns.push_back(static_cast<double>(prn_id)); prns.push_back(static_cast<double>(prn_id));
std::cout << "-- Mean Doppler difference for sat " << prn_id << ": " << d_mean; std::cout << "-- RMS Doppler difference for sat " << prn_id << ": " << d_mean;
std::cout << " +/- " << d_stddev; std::cout << " +/- " << d_stddev;
std::cout << " [Hz]" << std::endl; std::cout << " [Hz]" << std::endl;
EXPECT_LT(d_mean, error_th_mean); EXPECT_LT(d_mean, error_th_mean);
@ -702,7 +702,7 @@ void ObsSystemTest::compute_doppler_error(
g1.set_grid(); g1.set_grid();
g1.set_xlabel("PRN"); g1.set_xlabel("PRN");
g1.set_ylabel("Doppler error [Hz]"); g1.set_ylabel("Doppler error [Hz]");
g1.plot_xy(prns, means, "Mean"); g1.plot_xy(prns, means, "RMS error");
g1.plot_xy(prns, stddevs, "Standard deviation"); g1.plot_xy(prns, stddevs, "Standard deviation");
//g1.savetops("FFT_execution_times_extended"); //g1.savetops("FFT_execution_times_extended");
//g1.savetopdf("FFT_execution_times_extended", 18); //g1.savetopdf("FFT_execution_times_extended", 18);