[hamradio-commits] [gnss-sdr] 12/60: Fixing test

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 85c35ea0a54e8bb90c8bf4feddbd043991d6223e
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Feb 27 15:58:07 2015 +0100

    Fixing test
---
 .../adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc |  5 +++++
 .../adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h  |  7 +++++++
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc       |  2 ++
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc     | 14 +++++++-------
 ...galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 12 +++++++++---
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
index ad21e08..740a6d9 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
@@ -304,6 +304,11 @@ float GalileoE5aNoncoherentIQAcquisitionCaf::calculate_threshold(float pfa)
     return threshold;
 }
 
+void GalileoE5aNoncoherentIQAcquisitionCaf::set_state(int state)
+{
+        acquisition_cc_->set_state(state);
+}
+
 
 void GalileoE5aNoncoherentIQAcquisitionCaf::connect(gr::top_block_sptr top_block)
 {
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
index addc5d9..646c3a5 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
@@ -129,6 +129,13 @@ public:
 	  */
 	 void reset();
 
+     /*!
+      * \brief If set to 1, ensures that acquisition starts at the
+      * first available sample.
+      * \param state - int=1 forces start of acquisition
+      */
+	 void set_state(int state);
+
 private:
 	 ConfigurationInterface* configuration_;
 	 galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr acquisition_cc_;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
index 1b213a9..3313fb3 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -304,6 +304,8 @@ void galileo_e5a_noncoherentIQ_acquisition_caf_cc::set_state(int state)
 }
 
 
+
+
 int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items,
         gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items)
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index f4f9fb8..e6dd1e0 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -172,13 +172,13 @@ void galileo_pcps_8ms_acquisition_cc::set_state(int state)
     d_state = state;
     if (d_state == 1)
         {
-            d_gnss_synchro->Acq_delay_samples = 0.0;
-            d_gnss_synchro->Acq_doppler_hz = 0.0;
-            d_gnss_synchro->Acq_samplestamp_samples = 0;
-            d_well_count = 0;
-            d_mag = 0.0;
-            d_input_power = 0.0;
-            d_test_statistics = 0.0;
+			d_gnss_synchro->Acq_delay_samples = 0.0;
+			d_gnss_synchro->Acq_doppler_hz = 0.0;
+			d_gnss_synchro->Acq_samplestamp_samples = 0;
+			d_well_count = 0;
+			d_mag = 0.0;
+			d_input_power = 0.0;
+			d_test_statistics = 0.0;
         }
     else if (d_state == 0)
         {}
diff --git a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index 2731f63..065bd55 100644
--- a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -646,6 +646,8 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, ValidationOfSIM)
         top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0);
      }) << "Failure connecting the blocks of acquisition test." << std::endl;
 
+    acquisition->reset();
+    acquisition->init();
     // USING SIGNAL FROM FILE SOURCE
     /*
     ASSERT_NO_THROW( {
@@ -676,7 +678,7 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, ValidationOfSIM)
                 {
                     gnss_synchro.PRN = 19; //real
                     //gnss_synchro.PRN = 11; //sim
-                    break;
+                    //break;
                 }
                 //        	case 1:
                 //        	    {
@@ -702,10 +704,14 @@ TEST_F(GalileoE5aPcpsAcquisitionGSoC2014GensourceTest, ValidationOfSIM)
             //                {
             //                    gnss_synchro.PRN = 19; // This satellite is not visible
             //                }
-            acquisition->set_local_code();
-
             start_queue();
 
+            acquisition->reset();
+            acquisition->init();
+            acquisition->set_gnss_synchro(&gnss_synchro);
+            acquisition->set_local_code();
+            acquisition->set_state(1);
+
             EXPECT_NO_THROW( {
                 top_block->run(); // Start threads and wait
             }) << "Failure running the top_block."<< std::endl;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git