1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

This commit is contained in:
Carles Fernandez 2018-11-29 21:31:43 +01:00
commit d567bbf0cd
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D

View File

@ -1763,8 +1763,11 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
}
else
{
ASSERT_EQ(ReadRinexObs(&true_obs_vec, gnss_synchro_master), true)
<< "Failure reading RINEX file";
if (!FLAGS_duplicated_satellites_test)
{
ASSERT_EQ(ReadRinexObs(&true_obs_vec, gnss_synchro_master), true)
<< "Failure reading RINEX file";
}
}
//read measured values
observables_dump_reader estimated_observables(tracking_ch_vec.size());
@ -1825,10 +1828,13 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
measured_obs_vec.at(n).shed_rows(0, index(0));
}
index = arma::find(measured_obs_vec.at(n).col(0) >= true_obs_vec.at(n)(0, 0), 1, "first");
if ((index.size() > 0) and (index(0) > 0))
if (!FLAGS_duplicated_satellites_test)
{
measured_obs_vec.at(n).shed_rows(0, index(0));
index = arma::find(measured_obs_vec.at(n).col(0) >= true_obs_vec.at(n)(0, 0), 1, "first");
if ((index.size() > 0) and (index(0) > 0))
{
measured_obs_vec.at(n).shed_rows(0, index(0));
}
}
}