mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-06-27 23:52:53 +00:00
Code Issues Releases Wiki Activity

Code cleaning

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@273 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Carles Fernandez 2012-11-01 16:57:27 +00:00
parent 2c700a49a2
commit 9b1a64c2f2
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/algorithms/input_filter/adapters/fir_filter.cc
View File

@ -46,38 +46,35 @@ FirFilter::FirFilter(ConfigurationInterface* configuration, std::string role,
config_(configuration), role_(role), in_streams_(in_streams), config_(configuration), role_(role), in_streams_(in_streams),
out_streams_(out_streams), queue_(queue) out_streams_(out_streams), queue_(queue)
{ {
size_t item_size; size_t item_size;
(*this).init(); (*this).init();
if ((taps_item_type_.compare("float") == 0) && (input_item_type_.compare("gr_complex") == 0)
if ((taps_item_type_.compare("float") == 0) && (input_item_type_.compare( && (output_item_type_.compare("gr_complex") == 0))
"gr_complex") == 0) && (output_item_type_.compare("gr_complex")
== 0))
{ {
item_size = sizeof(gr_complex); item_size = sizeof(gr_complex);
fir_filter_ccf_ = gr_make_fir_filter_ccf(1, taps_); fir_filter_ccf_ = gr_make_fir_filter_ccf(1, taps_);
DLOG(INFO) << "input_filter(" << fir_filter_ccf_->unique_id() << ")"; DLOG(INFO) << "input_filter(" << fir_filter_ccf_->unique_id() << ")";
} }
else else
{ {
LOG_AT_LEVEL(ERROR) << taps_item_type_ LOG_AT_LEVEL(ERROR) << taps_item_type_ << " unknown input filter item type";
<< " unknown input filter item type";
} }
if (dump_) if (dump_)
{ {
DLOG(INFO) << "Dumping output into file " << dump_filename_; DLOG(INFO) << "Dumping output into file " << dump_filename_;
file_sink_ = gr_make_file_sink(item_size, dump_filename_.c_str()); file_sink_ = gr_make_file_sink(item_size, dump_filename_.c_str());
} }
} }
FirFilter::~FirFilter() FirFilter::~FirFilter()
{} {}
void FirFilter::connect(gr_top_block_sptr top_block) void FirFilter::connect(gr_top_block_sptr top_block)
{ {
if (dump_) if (dump_)
{ {
top_block->connect(fir_filter_ccf_, 0, file_sink_, 0); top_block->connect(fir_filter_ccf_, 0, file_sink_, 0);
@ -88,26 +85,32 @@ void FirFilter::connect(gr_top_block_sptr top_block)
} }
} }
void FirFilter::disconnect(gr_top_block_sptr top_block) void FirFilter::disconnect(gr_top_block_sptr top_block)
{ {
if (dump_) if (dump_)
{ {
top_block->connect(fir_filter_ccf_, 0, file_sink_, 0); top_block->connect(fir_filter_ccf_, 0, file_sink_, 0);
} }
} }
gr_basic_block_sptr FirFilter::get_left_block() gr_basic_block_sptr FirFilter::get_left_block()
{ {
return fir_filter_ccf_; return fir_filter_ccf_;
} }
gr_basic_block_sptr FirFilter::get_right_block() gr_basic_block_sptr FirFilter::get_right_block()
{ {
return fir_filter_ccf_; return fir_filter_ccf_;
} }
void FirFilter::init() void FirFilter::init()
{ {
std::string default_input_item_type = "gr_complex"; std::string default_input_item_type = "gr_complex";
@ -124,30 +127,21 @@ void FirFilter::init()
DLOG(INFO) << "role " << role_; DLOG(INFO) << "role " << role_;
input_item_type_ = config_->property(role_ + ".input_item_type", input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type);
default_input_item_type); output_item_type_ = config_->property(role_ + ".output_item_type", default_output_item_type);
output_item_type_ = config_->property(role_ + ".output_item_type", taps_item_type_ = config_->property(role_ + ".taps_item_type", default_taps_item_type);
default_output_item_type);
taps_item_type_ = config_->property(role_ + ".taps_item_type",
default_taps_item_type);
dump_ = config_->property(role_ + ".dump", false); dump_ = config_->property(role_ + ".dump", false);
dump_filename_ = config_->property(role_ + ".dump_filename", dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename);
default_dump_filename); int number_of_taps = config_->property(role_ + ".number_of_taps", default_number_of_taps);
int number_of_taps = config_->property(role_ + ".number_of_taps", unsigned int number_of_bands = config_->property(role_ + ".number_of_bands", default_number_of_bands);
default_number_of_taps);
unsigned int number_of_bands = config_->property(role_ + ".number_of_bands",
default_number_of_bands);
std::vector<double> bands; std::vector<double> bands;
std::vector<double> ampl; std::vector<double> ampl;
std::vector<double> error_w; std::vector<double> error_w;
std::string option; std::string option;
double option_value; double option_value;
for (unsigned int i = 0; i < number_of_bands; i++) for (unsigned int i = 0; i < number_of_bands; i++)
{ {
option = ".band" + boost::lexical_cast<std::string>(i + 1) + "_begin"; option = ".band" + boost::lexical_cast<std::string>(i + 1) + "_begin";
option_value = config_->property(role_ + option, default_bands[i]); option_value = config_->property(role_ + option, default_bands[i]);
bands.push_back(option_value); bands.push_back(option_value);