mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-18 16:15:21 +00:00
Code Issues Releases Wiki Activity

Apply automated code formatting

Browse Source 
Documented at .clang-format
See http://clang.llvm.org/docs/ClangFormat.html and http://clang.llvm.org/docs/ClangFormatStyleOptions.html
This commit is contained in:
Carles Fernandez
2018-03-03 02:03:39 +01:00
parent c9ac8c78af
commit 34f24562cf
902 changed files with 36939 additions and 34573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
View File

@@ -43,9 +43,8 @@
using google::LogMessage;
DirectResamplerConditioner::DirectResamplerConditioner(
ConfigurationInterface* configuration, std::string role,
unsigned int in_stream, unsigned int out_stream) :
role_(role), in_stream_(in_stream), out_stream_(out_stream)
ConfigurationInterface* configuration, std::string role,
unsigned int in_stream, unsigned int out_stream) : role_(role), in_stream_(in_stream), out_stream_(out_stream)
{
std::string default_item_type = "short";
std::string default_dump_file = "./data/signal_conditioner.dat";
@@ -54,10 +53,9 @@ DirectResamplerConditioner::DirectResamplerConditioner(
fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
sample_freq_in_ = configuration->property(role_ + ".sample_freq_in", 4000000.0);
sample_freq_out_ = configuration->property(role_ + ".sample_freq_out", fs_in);
if(std::fabs(fs_in - sample_freq_out_) > std::numeric_limits<double>::epsilon())
if (std::fabs(fs_in - sample_freq_out_) > std::numeric_limits<double>::epsilon())
{
std::string aux_warn = "CONFIGURATION WARNING: Parameters GNSS-SDR.internal_fs_sps and "
+ role_ + ".sample_freq_out are not set to the same value!" ;
std::string aux_warn = "CONFIGURATION WARNING: Parameters GNSS-SDR.internal_fs_sps and " + role_ + ".sample_freq_out are not set to the same value!";
LOG(WARNING) << aux_warn;
std::cout << aux_warn << std::endl;
}
@@ -110,7 +108,6 @@ DirectResamplerConditioner::DirectResamplerConditioner(
DirectResamplerConditioner::~DirectResamplerConditioner() {}
void DirectResamplerConditioner::connect(gr::top_block_sptr top_block)
{
if (dump_)

6
src/algorithms/resampler/adapters/direct_resampler_conditioner.h
View File

@@ -43,12 +43,12 @@ class ConfigurationInterface;
* \brief Interface of an adapter of a direct resampler conditioner block
* to a SignalConditionerInterface
*/
class DirectResamplerConditioner: public GNSSBlockInterface
class DirectResamplerConditioner : public GNSSBlockInterface
{
public:
DirectResamplerConditioner(ConfigurationInterface* configuration,
std::string role, unsigned int in_stream,
unsigned int out_stream);
std::string role, unsigned int in_stream,
unsigned int out_stream);
virtual ~DirectResamplerConditioner();

17
src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc
View File

@@ -39,9 +39,8 @@
using google::LogMessage;
MmseResamplerConditioner::MmseResamplerConditioner(
ConfigurationInterface* configuration, std::string role,
unsigned int in_stream, unsigned int out_stream) :
role_(role), in_stream_(in_stream), out_stream_(out_stream)
ConfigurationInterface* configuration, std::string role,
unsigned int in_stream, unsigned int out_stream) : role_(role), in_stream_(in_stream), out_stream_(out_stream)
{
std::string default_item_type = "gr_complex";
std::string default_dump_file = "./data/signal_conditioner.dat";
@@ -50,10 +49,9 @@ MmseResamplerConditioner::MmseResamplerConditioner(
fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
sample_freq_in_ = configuration->property(role_ + ".sample_freq_in", 4000000.0);
sample_freq_out_ = configuration->property(role_ + ".sample_freq_out", fs_in);
if(std::fabs(fs_in - sample_freq_out_) > std::numeric_limits<double>::epsilon())
if (std::fabs(fs_in - sample_freq_out_) > std::numeric_limits<double>::epsilon())
{
std::string aux_warn = "CONFIGURATION WARNING: Parameters GNSS-SDR.internal_fs_sps and "
+ role_ + ".sample_freq_out are not set to the same value!" ;
std::string aux_warn = "CONFIGURATION WARNING: Parameters GNSS-SDR.internal_fs_sps and " + role_ + ".sample_freq_out are not set to the same value!";
LOG(WARNING) << aux_warn;
std::cout << aux_warn << std::endl;
}
@@ -65,11 +63,11 @@ MmseResamplerConditioner::MmseResamplerConditioner(
if (item_type_.compare("gr_complex") == 0)
{
item_size_ = sizeof(gr_complex);
#ifdef GR_GREATER_38
#ifdef GR_GREATER_38
resampler_ = gr::filter::mmse_resampler_cc::make(0.0, sample_freq_in_ / sample_freq_out_);
#else
#else
resampler_ = gr::filter::fractional_resampler_cc::make(0.0, sample_freq_in_ / sample_freq_out_);
#endif
#endif
DLOG(INFO) << "sample_freq_in " << sample_freq_in_;
DLOG(INFO) << "sample_freq_out" << sample_freq_out_;
DLOG(INFO) << "Item size " << item_size_;
@@ -92,7 +90,6 @@ MmseResamplerConditioner::MmseResamplerConditioner(
MmseResamplerConditioner::~MmseResamplerConditioner() {}
void MmseResamplerConditioner::connect(gr::top_block_sptr top_block)
{
if (dump_)

12
src/algorithms/resampler/adapters/mmse_resampler_conditioner.h
View File

@@ -47,12 +47,12 @@ class ConfigurationInterface;
* \brief Interface of a MMSE resampler block adapter
* to a SignalConditionerInterface
*/
class MmseResamplerConditioner: public GNSSBlockInterface
class MmseResamplerConditioner : public GNSSBlockInterface
{
public:
MmseResamplerConditioner(ConfigurationInterface* configuration,
std::string role, unsigned int in_stream,
unsigned int out_stream);
std::string role, unsigned int in_stream,
unsigned int out_stream);
virtual ~MmseResamplerConditioner();
@@ -86,11 +86,11 @@ private:
std::string dump_filename_;
double sample_freq_in_;
double sample_freq_out_;
#ifdef GR_GREATER_38
#ifdef GR_GREATER_38
gr::filter::mmse_resampler_cc::sptr resampler_;
#else
#else
gr::filter::fractional_resampler_cc::sptr resampler_;
#endif
#endif
gr::block_sptr file_sink_;
};

29
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
View File

@@ -40,21 +40,22 @@
using google::LogMessage;
direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(
double sample_freq_in, double sample_freq_out)
double sample_freq_in, double sample_freq_out)
{
return direct_resampler_conditioner_cb_sptr(
new direct_resampler_conditioner_cb(sample_freq_in,
sample_freq_out));
new direct_resampler_conditioner_cb(sample_freq_in,
sample_freq_out));
}
direct_resampler_conditioner_cb::direct_resampler_conditioner_cb(
double sample_freq_in, double sample_freq_out) :
gr::block("direct_resampler_make_conditioner_cb", gr::io_signature::make(1,
1, sizeof(lv_8sc_t)), gr::io_signature::make(1, 1, sizeof(lv_8sc_t))),
d_sample_freq_in(sample_freq_in), d_sample_freq_out(
sample_freq_out), d_phase(0), d_lphase(0), d_history(1)
double sample_freq_in, double sample_freq_out) : gr::block("direct_resampler_make_conditioner_cb", gr::io_signature::make(1, 1, sizeof(lv_8sc_t)), gr::io_signature::make(1, 1, sizeof(lv_8sc_t))),
d_sample_freq_in(sample_freq_in),
d_sample_freq_out(
sample_freq_out),
d_phase(0),
d_lphase(0),
d_history(1)
{
const double two_32 = 4294967296.0;
// Computes the phase step multiplying the resampling ratio by 2^32 = 4294967296
@@ -74,15 +75,13 @@ direct_resampler_conditioner_cb::direct_resampler_conditioner_cb(
direct_resampler_conditioner_cb::~direct_resampler_conditioner_cb()
{
}
void direct_resampler_conditioner_cb::forecast(int noutput_items,
gr_vector_int &ninput_items_required)
gr_vector_int &ninput_items_required)
{
int nreqd = std::max(static_cast<unsigned>(1), static_cast<int>(static_cast<double>(noutput_items + 1)
* sample_freq_in() / sample_freq_out()) + history() - 1);
int nreqd = std::max(static_cast<unsigned>(1), static_cast<int>(static_cast<double>(noutput_items + 1) * sample_freq_in() / sample_freq_out()) + history() - 1);
unsigned ninputs = ninput_items_required.size();
for (unsigned i = 0; i < ninputs; i++)
@@ -93,8 +92,8 @@ void direct_resampler_conditioner_cb::forecast(int noutput_items,
int direct_resampler_conditioner_cb::general_work(int noutput_items,
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
const lv_8sc_t *in = reinterpret_cast<const lv_8sc_t *>(input_items[0]);
lv_8sc_t *out = reinterpret_cast<lv_8sc_t *>(output_items[0]);

14
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
View File

@@ -37,22 +37,22 @@
class direct_resampler_conditioner_cb;
typedef boost::shared_ptr<direct_resampler_conditioner_cb>
direct_resampler_conditioner_cb_sptr;
direct_resampler_conditioner_cb_sptr;
direct_resampler_conditioner_cb_sptr
direct_resampler_make_conditioner_cb(double sample_freq_in,
double sample_freq_out);
double sample_freq_out);
/*!
* \brief This class implements a direct resampler conditioner for std::complex<signed char>
*
* Direct resampling without interpolation
*/
class direct_resampler_conditioner_cb: public gr::block
class direct_resampler_conditioner_cb : public gr::block
{
private:
friend direct_resampler_conditioner_cb_sptr
direct_resampler_make_conditioner_cb(double sample_freq_in,
double sample_freq_out);
double sample_freq_out);
double d_sample_freq_in;
double d_sample_freq_out;
@@ -62,7 +62,7 @@ private:
unsigned int d_history;
direct_resampler_conditioner_cb(double sample_freq_in,
double sample_freq_out);
double sample_freq_out);
public:
~direct_resampler_conditioner_cb();
@@ -80,8 +80,8 @@ public:
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
int general_work(int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
};
#endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H */

30
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
View File

@@ -40,22 +40,16 @@
using google::LogMessage;
direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(
double sample_freq_in, double sample_freq_out)
double sample_freq_in, double sample_freq_out)
{
return direct_resampler_conditioner_cc_sptr(
new direct_resampler_conditioner_cc(sample_freq_in,
sample_freq_out));
new direct_resampler_conditioner_cc(sample_freq_in,
sample_freq_out));
}
direct_resampler_conditioner_cc::direct_resampler_conditioner_cc(
double sample_freq_in, double sample_freq_out) :
gr::block("direct_resampler_conditioner_cc", gr::io_signature::make(1, 1,
sizeof(gr_complex)), gr::io_signature::make(1, 1,
sizeof(gr_complex))), d_sample_freq_in(sample_freq_in),
d_sample_freq_out(sample_freq_out), d_phase(0), d_lphase(0),
d_history(1)
double sample_freq_in, double sample_freq_out) : gr::block("direct_resampler_conditioner_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)), gr::io_signature::make(1, 1, sizeof(gr_complex))), d_sample_freq_in(sample_freq_in), d_sample_freq_out(sample_freq_out), d_phase(0), d_lphase(0), d_history(1)
{
// Computes the phase step multiplying the resampling ratio by 2^32 = 4294967296
const double two_32 = 4294967296.0;
@@ -65,27 +59,22 @@ direct_resampler_conditioner_cc::direct_resampler_conditioner_cc(
}
else
{
d_phase_step = static_cast<uint32_t>(floor(two_32 * sample_freq_in / sample_freq_out));
d_phase_step = static_cast<uint32_t>(floor(two_32 * sample_freq_in / sample_freq_out));
}
set_relative_rate(1.0 * sample_freq_out / sample_freq_in);
set_output_multiple(1);
}
direct_resampler_conditioner_cc::~direct_resampler_conditioner_cc()
{
}
void direct_resampler_conditioner_cc::forecast(int noutput_items,
gr_vector_int &ninput_items_required)
gr_vector_int &ninput_items_required)
{
int nreqd = std::max(static_cast<unsigned>(1), static_cast<int>(static_cast<double>(noutput_items + 1)
* sample_freq_in() / sample_freq_out()) + history() - 1);
int nreqd = std::max(static_cast<unsigned>(1), static_cast<int>(static_cast<double>(noutput_items + 1) * sample_freq_in() / sample_freq_out()) + history() - 1);
unsigned ninputs = ninput_items_required.size();
for (unsigned i = 0; i < ninputs; i++)
{
@@ -94,10 +83,9 @@ void direct_resampler_conditioner_cc::forecast(int noutput_items,
}
int direct_resampler_conditioner_cc::general_work(int noutput_items,
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
const gr_complex *in = reinterpret_cast<const gr_complex *>(input_items[0]);
gr_complex *out = reinterpret_cast<gr_complex *>(output_items[0]);

18
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
View File

@@ -46,27 +46,27 @@ class direct_resampler_conditioner_cc;
typedef boost::shared_ptr<direct_resampler_conditioner_cc> direct_resampler_conditioner_cc_sptr;
direct_resampler_conditioner_cc_sptr
direct_resampler_make_conditioner_cc(double sample_freq_in,
double sample_freq_out);
double sample_freq_out);
/*!
* \brief This class implements a direct resampler conditioner for complex data
*
* Direct resampling without interpolation
*/
class direct_resampler_conditioner_cc: public gr::block
class direct_resampler_conditioner_cc : public gr::block
{
private:
friend direct_resampler_conditioner_cc_sptr
direct_resampler_make_conditioner_cc(double sample_freq_in,
double sample_freq_out);
double d_sample_freq_in; //! Specifies the sampling frequency of the input signal
double d_sample_freq_out; //! Specifies the sampling frequency of the output signal
double sample_freq_out);
double d_sample_freq_in; //! Specifies the sampling frequency of the input signal
double d_sample_freq_out; //! Specifies the sampling frequency of the output signal
uint32_t d_phase;
uint32_t d_lphase;
uint32_t d_phase_step;
unsigned int d_history;
direct_resampler_conditioner_cc(double sample_freq_in,
double sample_freq_out);
double sample_freq_out);
public:
~direct_resampler_conditioner_cc();
@@ -81,10 +81,10 @@ public:
}
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
int general_work(int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
};
#endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CC_H */

28
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
View File

@@ -39,20 +39,22 @@
using google::LogMessage;
direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
double sample_freq_in, double sample_freq_out)
double sample_freq_in, double sample_freq_out)
{
return direct_resampler_conditioner_cs_sptr(
new direct_resampler_conditioner_cs(sample_freq_in,
sample_freq_out));
new direct_resampler_conditioner_cs(sample_freq_in,
sample_freq_out));
}
direct_resampler_conditioner_cs::direct_resampler_conditioner_cs(
double sample_freq_in, double sample_freq_out) :
gr::block("direct_resampler_make_conditioner_cs", gr::io_signature::make(1,
1, sizeof(lv_16sc_t)), gr::io_signature::make(1, 1, sizeof(lv_16sc_t))),
d_sample_freq_in(sample_freq_in), d_sample_freq_out(
sample_freq_out), d_phase(0), d_lphase(0), d_history(1)
double sample_freq_in, double sample_freq_out) : gr::block("direct_resampler_make_conditioner_cs", gr::io_signature::make(1, 1, sizeof(lv_16sc_t)), gr::io_signature::make(1, 1, sizeof(lv_16sc_t))),
d_sample_freq_in(sample_freq_in),
d_sample_freq_out(
sample_freq_out),
d_phase(0),
d_lphase(0),
d_history(1)
{
const double two_32 = 4294967296.0;
// Computes the phase step multiplying the resampling ratio by 2^32 = 4294967296
@@ -72,15 +74,13 @@ direct_resampler_conditioner_cs::direct_resampler_conditioner_cs(
direct_resampler_conditioner_cs::~direct_resampler_conditioner_cs()
{
}
void direct_resampler_conditioner_cs::forecast(int noutput_items,
gr_vector_int &ninput_items_required)
gr_vector_int &ninput_items_required)
{
int nreqd = std::max(static_cast<unsigned>(1), static_cast<int>(static_cast<double>(noutput_items + 1)
* sample_freq_in() / sample_freq_out()) + history() - 1);
int nreqd = std::max(static_cast<unsigned>(1), static_cast<int>(static_cast<double>(noutput_items + 1) * sample_freq_in() / sample_freq_out()) + history() - 1);
unsigned ninputs = ninput_items_required.size();
for (unsigned i = 0; i < ninputs; i++)
@@ -91,8 +91,8 @@ void direct_resampler_conditioner_cs::forecast(int noutput_items,
int direct_resampler_conditioner_cs::general_work(int noutput_items,
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
const lv_16sc_t *in = reinterpret_cast<const lv_16sc_t *>(input_items[0]);
lv_16sc_t *out = reinterpret_cast<lv_16sc_t *>(output_items[0]);

16
src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
View File

@@ -37,22 +37,22 @@
class direct_resampler_conditioner_cs;
typedef boost::shared_ptr<direct_resampler_conditioner_cs>
direct_resampler_conditioner_cs_sptr;
direct_resampler_conditioner_cs_sptr;
direct_resampler_conditioner_cs_sptr
direct_resampler_make_conditioner_cs(double sample_freq_in,
double sample_freq_out);
double sample_freq_out);
/*!
* \brief This class implements a direct resampler conditioner for std::complex<short>
*
* Direct resampling without interpolation
*/
class direct_resampler_conditioner_cs: public gr::block
class direct_resampler_conditioner_cs : public gr::block
{
private:
friend direct_resampler_conditioner_cs_sptr
direct_resampler_make_conditioner_cs(double sample_freq_in,
double sample_freq_out);
double sample_freq_out);
double d_sample_freq_in;
double d_sample_freq_out;
@@ -62,7 +62,7 @@ private:
unsigned int d_history;
direct_resampler_conditioner_cs(double sample_freq_in,
double sample_freq_out);
double sample_freq_out);
public:
~direct_resampler_conditioner_cs();
@@ -78,10 +78,10 @@ public:
}
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
int general_work(int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
};
#endif /* GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H */