mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-06-05 16:14:09 +00:00
Remove unrequired and repeated includes
This commit is contained in:
parent
511675a97e
commit
54a0070a33
@ -30,11 +30,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "notch_filter.h"
|
#include "notch_filter.h"
|
||||||
#include <string>
|
|
||||||
#include <memory>
|
|
||||||
#include <vector>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
#include <gnuradio/blocks/file_sink.h>
|
|
||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include "configuration_interface.h"
|
#include "configuration_interface.h"
|
||||||
#include "notch_cc.h"
|
#include "notch_cc.h"
|
||||||
@ -78,8 +74,7 @@ NotchFilter::NotchFilter(ConfigurationInterface* configuration, std::string role
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOG(WARNING) << item_type_
|
LOG(WARNING) << item_type_ << " unrecognized item type for notch filter";
|
||||||
<< " unrecognized item type for notch filter";
|
|
||||||
item_size_ = sizeof(gr_complex);
|
item_size_ = sizeof(gr_complex);
|
||||||
}
|
}
|
||||||
if (dump_)
|
if (dump_)
|
||||||
@ -90,9 +85,11 @@ NotchFilter::NotchFilter(ConfigurationInterface* configuration, std::string role
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NotchFilter::~NotchFilter()
|
NotchFilter::~NotchFilter()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
void NotchFilter::connect(gr::top_block_sptr top_block)
|
void NotchFilter::connect(gr::top_block_sptr top_block)
|
||||||
{
|
{
|
||||||
if (dump_)
|
if (dump_)
|
||||||
@ -106,6 +103,7 @@ void NotchFilter::connect(gr::top_block_sptr top_block)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void NotchFilter::disconnect(gr::top_block_sptr top_block)
|
void NotchFilter::disconnect(gr::top_block_sptr top_block)
|
||||||
{
|
{
|
||||||
if (dump_)
|
if (dump_)
|
||||||
@ -120,6 +118,7 @@ gr::basic_block_sptr NotchFilter::get_left_block()
|
|||||||
return notch_filter_;
|
return notch_filter_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
gr::basic_block_sptr NotchFilter::get_right_block()
|
gr::basic_block_sptr NotchFilter::get_right_block()
|
||||||
{
|
{
|
||||||
return notch_filter_;
|
return notch_filter_;
|
||||||
|
@ -30,12 +30,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "notch_filter_lite.h"
|
#include "notch_filter_lite.h"
|
||||||
#include <string>
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <memory>
|
|
||||||
#include <vector>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
#include <gnuradio/blocks/file_sink.h>
|
|
||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include "configuration_interface.h"
|
#include "configuration_interface.h"
|
||||||
#include "notch_lite_cc.h"
|
#include "notch_lite_cc.h"
|
||||||
@ -74,7 +70,7 @@ NotchFilterLite::NotchFilterLite(ConfigurationInterface* configuration, std::str
|
|||||||
length_ = configuration->property(role + ".length", default_length_);
|
length_ = configuration->property(role + ".length", default_length_);
|
||||||
n_segments_est = configuration->property(role + ".segments_est", default_n_segments_est);
|
n_segments_est = configuration->property(role + ".segments_est", default_n_segments_est);
|
||||||
n_segments_reset = configuration->property(role + ".segments_reset", default_n_segments_reset);
|
n_segments_reset = configuration->property(role + ".segments_reset", default_n_segments_reset);
|
||||||
int n_segments_coeff = (int) ((samp_freq / coeff_rate) / ((float) length_));
|
int n_segments_coeff = static_cast<int>((samp_freq / coeff_rate) / static_cast<float>(length_));
|
||||||
n_segments_coeff = std::max(1, n_segments_coeff);
|
n_segments_coeff = std::max(1, n_segments_coeff);
|
||||||
if (item_type_.compare("gr_complex") == 0)
|
if (item_type_.compare("gr_complex") == 0)
|
||||||
{
|
{
|
||||||
@ -85,8 +81,7 @@ NotchFilterLite::NotchFilterLite(ConfigurationInterface* configuration, std::str
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOG(WARNING) << item_type_
|
LOG(WARNING) << item_type_ << " unrecognized item type for notch filter";
|
||||||
<< " unrecognized item type for notch filter";
|
|
||||||
item_size_ = sizeof(gr_complex);
|
item_size_ = sizeof(gr_complex);
|
||||||
}
|
}
|
||||||
if (dump_)
|
if (dump_)
|
||||||
@ -97,9 +92,11 @@ NotchFilterLite::NotchFilterLite(ConfigurationInterface* configuration, std::str
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NotchFilterLite::~NotchFilterLite()
|
NotchFilterLite::~NotchFilterLite()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
void NotchFilterLite::connect(gr::top_block_sptr top_block)
|
void NotchFilterLite::connect(gr::top_block_sptr top_block)
|
||||||
{
|
{
|
||||||
if (dump_)
|
if (dump_)
|
||||||
@ -113,6 +110,7 @@ void NotchFilterLite::connect(gr::top_block_sptr top_block)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void NotchFilterLite::disconnect(gr::top_block_sptr top_block)
|
void NotchFilterLite::disconnect(gr::top_block_sptr top_block)
|
||||||
{
|
{
|
||||||
if (dump_)
|
if (dump_)
|
||||||
@ -127,6 +125,7 @@ gr::basic_block_sptr NotchFilterLite::get_left_block()
|
|||||||
return notch_filter_lite_;
|
return notch_filter_lite_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
gr::basic_block_sptr NotchFilterLite::get_right_block()
|
gr::basic_block_sptr NotchFilterLite::get_right_block()
|
||||||
{
|
{
|
||||||
return notch_filter_lite_;
|
return notch_filter_lite_;
|
||||||
|
@ -30,7 +30,6 @@
|
|||||||
|
|
||||||
#include "pulse_blanking_filter.h"
|
#include "pulse_blanking_filter.h"
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
#include <gnuradio/blocks/file_sink.h>
|
|
||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include "configuration_interface.h"
|
#include "configuration_interface.h"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user