mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-07-07 04:04:20 +00:00
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
This commit is contained in:
commit
d567bbf0cd
|
@ -1763,8 +1763,11 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ASSERT_EQ(ReadRinexObs(&true_obs_vec, gnss_synchro_master), true)
|
if (!FLAGS_duplicated_satellites_test)
|
||||||
<< "Failure reading RINEX file";
|
{
|
||||||
|
ASSERT_EQ(ReadRinexObs(&true_obs_vec, gnss_synchro_master), true)
|
||||||
|
<< "Failure reading RINEX file";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//read measured values
|
//read measured values
|
||||||
observables_dump_reader estimated_observables(tracking_ch_vec.size());
|
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));
|
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 (!FLAGS_duplicated_satellites_test)
|
||||||
if ((index.size() > 0) and (index(0) > 0))
|
|
||||||
{
|
{
|
||||||
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));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user