From 4ed8a44d2de4820daf988ea517f756f4b758cb73 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 19 Aug 2014 18:44:09 +0200 Subject: [PATCH] Decreasing the number of realizations so run_tests don't take ages to finish :-) --- ...cksync_ambiguous_acquisition_gsoc2014_test.cc | 16 ++++++++-------- ...a_pcps_quicksync_acquisition_gsoc2014_test.cc | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index f0bf4324a..44f1c1449 100644 --- a/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/src/tests/gnss_block/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -235,7 +235,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_2() probabilities test*/ dump_test_results = true; - num_of_realizations = 10000; + num_of_realizations = 100; config = std::make_shared(); @@ -472,7 +472,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::process_message() Pd = (double)correct_estimation_counter / (double)num_of_realizations; Pfa_a = (double)detection_counter / (double)num_of_realizations; - Pfa_p = (double)(detection_counter-correct_estimation_counter) / (double)num_of_realizations; + Pfa_p = (double)(detection_counter - correct_estimation_counter) / (double)num_of_realizations; Pmd = (double)miss_detection_counter / (double)num_of_realizations; mean_acq_time_us /= (double)num_of_realizations; @@ -498,7 +498,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, Instantiate) TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ConnectAndRun) { - LOG(INFO)<<"**Start connect and run test"; + LOG(INFO) << "**Start connect and run test"; int nsamples = floor(fs_in*integration_time_ms*1e-3); struct timeval tv; long long int begin = 0; @@ -528,14 +528,14 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ConnectAndRun) end = tv.tv_sec * 1e6 + tv.tv_usec; }) << "Failure running the top_block."<< std::endl; - std::cout << "Processed " << nsamples << " samples in " << (end - begin) << " microseconds" << std::endl; - LOG(INFO) <<"----end connect and run test-----"; - LOG(INFO) <<"**End connect and run test"; + std::cout << "Processed " << nsamples << " samples in " << (end - begin) << " microseconds" << std::endl; + LOG(INFO) << "----end connect and run test-----"; + LOG(INFO) << "**End connect and run test"; } TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResults) { - LOG(INFO)<<"Start validation of results test"; + LOG(INFO) << "Start validation of results test"; config_1(); std::shared_ptr acq_ = factory->GetBlock(config, "Acquisition", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", 1, 1, queue); @@ -621,7 +621,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResultsWithNoise) { - LOG(INFO)<<"Start validation of results with noise+interference test"; + LOG(INFO) << "Start validation of results with noise+interference test"; config_3(); std::shared_ptr acq_ = factory->GetBlock(config, "Acquisition", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", 1, 1, queue); diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 59f6ad8c0..486e62cf9 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -158,7 +158,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::config_1() num_of_realizations = 1; config = std::make_shared(); -Notice how + config->set_property("GNSS-SDR.internal_fs_hz", std::to_string(fs_in)); config->set_property("SignalSource.fs_hz", std::to_string(fs_in)); @@ -223,11 +223,11 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::config_2() max_doppler_error_hz = 2/(3*integration_time_ms*1e-3); max_delay_error_chips = 0.50; - /*Unset this flag to eliminates data logging for the Validation of results + /*Unset this flag to eliminates data logging for the Validation of results probabilities test*/ dump_test_results = true; - num_of_realizations = 10000; + num_of_realizations = 100; config = std::make_shared();