mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug fixed in compilation of fir_filter_test.cc on Mac 

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@178 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Luis Esteve 2012-02-27 10:21:06 +00:00
parent e3cf6883fa
commit 756e6fe4e3
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/tests/gnss_block/fir_filter_test.cc
View File

@ -53,30 +53,6 @@ protected:
top_block = gr_make_top_block("Fir filter test"); top_block = gr_make_top_block("Fir filter test");
factory = new GNSSBlockFactory(); factory = new GNSSBlockFactory();
config = new InMemoryConfiguration(); config = new InMemoryConfiguration();
config->set_property("InputFilter.number_of_taps", "4");
config->set_property("InputFilter.number_of_bands", "2");
config->set_property("InputFilter.band1_begin", "0.0");
config->set_property("InputFilter.band1_end", "0.45");
config->set_property("InputFilter.band2_begin", "0.55");
config->set_property("InputFilter.band2_end", "1.0");
config->set_property("InputFilter.ampl1_begin", "1.0");
config->set_property("InputFilter.ampl1_end", "1.0");
config->set_property("InputFilter.ampl2_begin", "0.0");
config->set_property("InputFilter.ampl2_end", "0.0");
config->set_property("InputFilter.band1_error", "1.0");
config->set_property("InputFilter.band2_error", "1.0");
config->set_property("InputFilter.filter_type", "bandpass");
config->set_property("InputFilter.grid_density", "16");
// config->set_property("InputFilter.dump", "true");
gnss_block = factory->GetBlock(config, "InputFilter", "Fir_Filter", 1,
1, queue);
item_size = sizeof(gr_complex); item_size = sizeof(gr_complex);
} }
@ -84,6 +60,7 @@ protected:
delete factory; delete factory;
delete config; delete config;
} }
bool init();
gr_msg_queue_sptr queue; gr_msg_queue_sptr queue;
gr_top_block_sptr top_block; gr_top_block_sptr top_block;
GNSSBlockFactory* factory; GNSSBlockFactory* factory;
@ -93,6 +70,35 @@ protected:
}; };
bool Fir_Filter_Test::init(){
config->set_property("InputFilter.number_of_taps", "4");
config->set_property("InputFilter.number_of_bands", "2");
config->set_property("InputFilter.band1_begin", "0.0");
config->set_property("InputFilter.band1_end", "0.45");
config->set_property("InputFilter.band2_begin", "0.55");
config->set_property("InputFilter.band2_end", "1.0");
config->set_property("InputFilter.ampl1_begin", "1.0");
config->set_property("InputFilter.ampl1_end", "1.0");
config->set_property("InputFilter.ampl2_begin", "0.0");
config->set_property("InputFilter.ampl2_end", "0.0");
config->set_property("InputFilter.band1_error", "1.0");
config->set_property("InputFilter.band2_error", "1.0");
config->set_property("InputFilter.filter_type", "bandpass");
config->set_property("InputFilter.grid_density", "16");
// config->set_property("InputFilter.dump", "true");
gnss_block = factory->GetBlock(config, "InputFilter", "Fir_Filter", 1,
1, queue);
if (gnss_block == NULL) return false;
else return true;
}
TEST_F(Fir_Filter_Test, InstantiationConnectAndRunTest) TEST_F(Fir_Filter_Test, InstantiationConnectAndRunTest)
{ {
int fs_in = 8000000; int fs_in = 8000000;
@ -101,8 +107,10 @@ TEST_F(Fir_Filter_Test, InstantiationConnectAndRunTest)
long long int begin; long long int begin;
long long int end; long long int end;
ASSERT_NE( (int)gnss_block, NULL) // ASSERT_NE( (int)gnss_block, NULL)
<< "Function factory->GetInputFilter(config, queue) fails." << std::endl; // << "Function factory->GetInputFilter(config, queue) fails." << std::endl;
ASSERT_NE(init(), false) << "Function factory->GetBlock(config, queue) fails." << std::endl;
ASSERT_NO_THROW( { ASSERT_NO_THROW( {
gnss_block->connect(top_block); gnss_block->connect(top_block);