summaryrefslogtreecommitdiff
path: root/gr-channels/lib
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2020-10-30 18:22:33 +0100
committermormj <34754695+mormj@users.noreply.github.com>2020-11-03 14:07:23 -0500
commit0ddc7dbc95ca6fb4c4a62a3c027104d6dd71fc3b (patch)
treeb454053fdc123711f3011b8a703de38e1d783ba3 /gr-channels/lib
parent1cfd6287635e339b313e1826fdfda23f474c91c8 (diff)
modernization: `override` instead of virtual in all compilation units
Diffstat (limited to 'gr-channels/lib')
-rw-r--r--gr-channels/lib/cfo_model_impl.h16
-rw-r--r--gr-channels/lib/channel_model2_impl.h16
-rw-r--r--gr-channels/lib/channel_model_impl.h20
-rw-r--r--gr-channels/lib/dynamic_channel_model_impl.h36
-rw-r--r--gr-channels/lib/fading_model_impl.h16
-rw-r--r--gr-channels/lib/selective_fading_model2_impl.h16
-rw-r--r--gr-channels/lib/selective_fading_model_impl.h16
-rw-r--r--gr-channels/lib/sro_model_impl.h16
8 files changed, 76 insertions, 76 deletions
diff --git a/gr-channels/lib/cfo_model_impl.h b/gr-channels/lib/cfo_model_impl.h
index e3742ab687..d7216bb910 100644
--- a/gr-channels/lib/cfo_model_impl.h
+++ b/gr-channels/lib/cfo_model_impl.h
@@ -40,22 +40,22 @@ public:
double max_dev_hz,
double noise_seed = 0);
- ~cfo_model_impl();
- void setup_rpc();
+ ~cfo_model_impl() override;
+ void setup_rpc() override;
int work(int, gr_vector_const_void_star&, gr_vector_void_star&) override;
- void set_std_dev(double _dev)
+ void set_std_dev(double _dev) override
{
d_std_dev_hz = _dev;
d_noise = gr::analog::fastnoise_source_f::make(
analog::GR_GAUSSIAN, d_std_dev_hz, d_noise_seed);
}
- void set_max_dev(double _dev) { d_max_dev_hz = _dev; }
- void set_samp_rate(double _rate) { d_samp_rate = _rate; }
+ void set_max_dev(double _dev) override { d_max_dev_hz = _dev; }
+ void set_samp_rate(double _rate) override { d_samp_rate = _rate; }
- double std_dev() const { return d_std_dev_hz; }
- double max_dev() const { return d_max_dev_hz; }
- double samp_rate() const { return d_samp_rate; }
+ double std_dev() const override { return d_std_dev_hz; }
+ double max_dev() const override { return d_max_dev_hz; }
+ double samp_rate() const override { return d_samp_rate; }
};
} /* namespace channels */
diff --git a/gr-channels/lib/channel_model2_impl.h b/gr-channels/lib/channel_model2_impl.h
index 8d4b08fe40..1df7084805 100644
--- a/gr-channels/lib/channel_model2_impl.h
+++ b/gr-channels/lib/channel_model2_impl.h
@@ -46,17 +46,17 @@ public:
double noise_seed,
bool block_tags);
- ~channel_model2_impl();
+ ~channel_model2_impl() override;
- void setup_rpc();
+ void setup_rpc() override;
- void set_noise_voltage(double noise_voltage);
- void set_taps(const std::vector<gr_complex>& taps);
- void set_timing_offset(double epsilon);
+ void set_noise_voltage(double noise_voltage) override;
+ void set_taps(const std::vector<gr_complex>& taps) override;
+ void set_timing_offset(double epsilon) override;
- double noise_voltage() const;
- std::vector<gr_complex> taps() const;
- double timing_offset() const;
+ double noise_voltage() const override;
+ std::vector<gr_complex> taps() const override;
+ double timing_offset() const override;
};
} /* namespace channels */
diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h
index 3670dfada1..a8c92551ed 100644
--- a/gr-channels/lib/channel_model_impl.h
+++ b/gr-channels/lib/channel_model_impl.h
@@ -45,19 +45,19 @@ public:
double noise_seed,
bool block_tags);
- ~channel_model_impl();
+ ~channel_model_impl() override;
- void setup_rpc();
+ void setup_rpc() override;
- void set_noise_voltage(double noise_voltage);
- void set_frequency_offset(double frequency_offset);
- void set_taps(const std::vector<gr_complex>& taps);
- void set_timing_offset(double epsilon);
+ void set_noise_voltage(double noise_voltage) override;
+ void set_frequency_offset(double frequency_offset) override;
+ void set_taps(const std::vector<gr_complex>& taps) override;
+ void set_timing_offset(double epsilon) override;
- double noise_voltage() const;
- double frequency_offset() const;
- std::vector<gr_complex> taps() const;
- double timing_offset() const;
+ double noise_voltage() const override;
+ double frequency_offset() const override;
+ std::vector<gr_complex> taps() const override;
+ double timing_offset() const override;
};
} /* namespace channels */
diff --git a/gr-channels/lib/dynamic_channel_model_impl.h b/gr-channels/lib/dynamic_channel_model_impl.h
index d8ea8f0efa..5b73beb8de 100644
--- a/gr-channels/lib/dynamic_channel_model_impl.h
+++ b/gr-channels/lib/dynamic_channel_model_impl.h
@@ -51,32 +51,32 @@ public:
double noise_amp,
double noise_seed);
- ~dynamic_channel_model_impl();
+ ~dynamic_channel_model_impl() override;
- void setup_rpc();
+ void setup_rpc() override;
- double samp_rate() const { return d_sro_model->samp_rate(); }
- double sro_dev_std() const { return d_sro_model->std_dev(); }
- double sro_dev_max() const { return d_sro_model->max_dev(); }
- double cfo_dev_std() const { return d_cfo_model->std_dev(); }
- double cfo_dev_max() const { return d_cfo_model->max_dev(); }
- double noise_amp() const { return d_noise->amplitude(); }
- double doppler_freq() const { return d_fader->fDTs() * samp_rate(); }
- double K() const { return d_fader->K(); }
+ double samp_rate() const override { return d_sro_model->samp_rate(); }
+ double sro_dev_std() const override { return d_sro_model->std_dev(); }
+ double sro_dev_max() const override { return d_sro_model->max_dev(); }
+ double cfo_dev_std() const override { return d_cfo_model->std_dev(); }
+ double cfo_dev_max() const override { return d_cfo_model->max_dev(); }
+ double noise_amp() const override { return d_noise->amplitude(); }
+ double doppler_freq() const override { return d_fader->fDTs() * samp_rate(); }
+ double K() const override { return d_fader->K(); }
- void set_samp_rate(double sr)
+ void set_samp_rate(double sr) override
{
d_fader->set_fDTs(doppler_freq() / samp_rate());
d_sro_model->set_samp_rate(sr);
d_cfo_model->set_samp_rate(sr);
}
- void set_sro_dev_std(double dev) { d_sro_model->set_max_dev(dev); }
- void set_sro_dev_max(double dev) { d_sro_model->set_max_dev(dev); }
- void set_cfo_dev_std(double dev) { d_cfo_model->set_std_dev(dev); }
- void set_cfo_dev_max(double dev) { d_cfo_model->set_max_dev(dev); }
- void set_noise_amp(double amp) { d_noise->set_amplitude(amp); }
- void set_doppler_freq(double f) { d_fader->set_fDTs(f / samp_rate()); }
- void set_K(double K) { d_fader->set_K(K); }
+ void set_sro_dev_std(double dev) override { d_sro_model->set_max_dev(dev); }
+ void set_sro_dev_max(double dev) override { d_sro_model->set_max_dev(dev); }
+ void set_cfo_dev_std(double dev) override { d_cfo_model->set_std_dev(dev); }
+ void set_cfo_dev_max(double dev) override { d_cfo_model->set_max_dev(dev); }
+ void set_noise_amp(double amp) override { d_noise->set_amplitude(amp); }
+ void set_doppler_freq(double f) override { d_fader->set_fDTs(f / samp_rate()); }
+ void set_K(double K) override { d_fader->set_K(K); }
};
} /* namespace channels */
diff --git a/gr-channels/lib/fading_model_impl.h b/gr-channels/lib/fading_model_impl.h
index fd421f7092..4e6bd07cd7 100644
--- a/gr-channels/lib/fading_model_impl.h
+++ b/gr-channels/lib/fading_model_impl.h
@@ -28,28 +28,28 @@ private:
public:
fading_model_impl(unsigned int N, float fDTs, bool LOS, float K, uint32_t seed);
- ~fading_model_impl();
- void setup_rpc();
+ ~fading_model_impl() override;
+ void setup_rpc() override;
int work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) override;
- virtual float fDTs() { return d_fader.d_fDTs; }
- virtual float K() { return d_fader.d_K; }
- virtual float step() { return d_fader.d_step; }
+ float fDTs() override { return d_fader.d_fDTs; }
+ float K() override { return d_fader.d_K; }
+ float step() override { return d_fader.d_step; }
- virtual void set_fDTs(float fDTs)
+ void set_fDTs(float fDTs) override
{
d_fader.d_fDTs = fDTs;
d_fader.d_step = powf(0.00125 * fDTs, 1.1);
}
- virtual void set_K(float K)
+ void set_K(float K) override
{
d_fader.d_K = K;
d_fader.scale_los = sqrtf(d_fader.d_K) / sqrtf(d_fader.d_K + 1);
d_fader.scale_nlos = (1 / sqrtf(d_fader.d_K + 1));
}
- virtual void set_step(float step) { d_fader.d_step = step; }
+ void set_step(float step) override { d_fader.d_step = step; }
};
} /* namespace channels */
diff --git a/gr-channels/lib/selective_fading_model2_impl.h b/gr-channels/lib/selective_fading_model2_impl.h
index 0538ba1386..83ae7ac972 100644
--- a/gr-channels/lib/selective_fading_model2_impl.h
+++ b/gr-channels/lib/selective_fading_model2_impl.h
@@ -46,30 +46,30 @@ public:
std::vector<float> delays_maxdev,
std::vector<float> mags,
unsigned int ntaps);
- ~selective_fading_model2_impl();
+ ~selective_fading_model2_impl() override;
// Disallow copy. This is a heavy object.
selective_fading_model2_impl(const selective_fading_model2_impl&) = delete;
selective_fading_model2_impl& operator=(const selective_fading_model2_impl&) = delete;
- void setup_rpc();
+ void setup_rpc() override;
int work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) override;
std::vector<gr_complex> d_taps;
- virtual float fDTs() { return d_faders[0].d_fDTs; }
- virtual float K() { return d_faders[0].d_K; }
- virtual float step() { return d_faders[0].d_step; }
+ float fDTs() override { return d_faders[0].d_fDTs; }
+ float K() override { return d_faders[0].d_K; }
+ float step() override { return d_faders[0].d_step; }
- virtual void set_fDTs(float fDTs)
+ void set_fDTs(float fDTs) override
{
for (auto& fader : d_faders) {
fader.d_fDTs = fDTs;
fader.d_step = powf(0.00125 * fDTs, 1.1);
}
}
- virtual void set_K(float K)
+ void set_K(float K) override
{
for (auto& fader : d_faders) {
fader.d_K = K;
@@ -77,7 +77,7 @@ public:
fader.scale_nlos = (1 / sqrtf(fader.d_K + 1));
}
}
- virtual void set_step(float step)
+ void set_step(float step) override
{
for (auto& fader : d_faders) {
fader.d_step = step;
diff --git a/gr-channels/lib/selective_fading_model_impl.h b/gr-channels/lib/selective_fading_model_impl.h
index 5523021845..7df6d19839 100644
--- a/gr-channels/lib/selective_fading_model_impl.h
+++ b/gr-channels/lib/selective_fading_model_impl.h
@@ -38,30 +38,30 @@ public:
std::vector<float> delays,
std::vector<float> mags,
int ntaps);
- ~selective_fading_model_impl();
+ ~selective_fading_model_impl() override;
// Disallow copy. This is a heavy object.
selective_fading_model_impl(const selective_fading_model_impl&) = delete;
selective_fading_model_impl& operator=(const selective_fading_model_impl&) = delete;
- void setup_rpc();
+ void setup_rpc() override;
int work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) override;
std::vector<gr_complex> d_taps;
- virtual float fDTs() { return d_faders[0].d_fDTs; }
- virtual float K() { return d_faders[0].d_K; }
- virtual float step() { return d_faders[0].d_step; }
+ float fDTs() override { return d_faders[0].d_fDTs; }
+ float K() override { return d_faders[0].d_K; }
+ float step() override { return d_faders[0].d_step; }
- virtual void set_fDTs(float fDTs)
+ void set_fDTs(float fDTs) override
{
for (auto& fader : d_faders) {
fader.d_fDTs = fDTs;
fader.d_step = powf(0.00125 * fDTs, 1.1);
}
}
- virtual void set_K(float K)
+ void set_K(float K) override
{
for (auto& fader : d_faders) {
fader.d_K = K;
@@ -69,7 +69,7 @@ public:
fader.scale_nlos = (1 / sqrtf(fader.d_K + 1));
}
}
- virtual void set_step(float step)
+ void set_step(float step) override
{
for (auto& fader : d_faders) {
fader.d_step = step;
diff --git a/gr-channels/lib/sro_model_impl.h b/gr-channels/lib/sro_model_impl.h
index 16a19c5cea..aa4313dd11 100644
--- a/gr-channels/lib/sro_model_impl.h
+++ b/gr-channels/lib/sro_model_impl.h
@@ -37,7 +37,7 @@ public:
double std_dev_hz,
double max_dev_hz,
double noise_seed = 0);
- ~sro_model_impl();
+ ~sro_model_impl() override;
void forecast(int noutput_items, gr_vector_int& ninput_items_required) override;
int general_work(int noutput_items,
@@ -49,20 +49,20 @@ public:
float interp_ratio() const;
void set_mu(float mu);
void set_interp_ratio(float interp_ratio);
- void setup_rpc();
+ void setup_rpc() override;
- void set_std_dev(double _dev)
+ void set_std_dev(double _dev) override
{
d_std_dev_hz = _dev;
d_noise =
gr::analog::fastnoise_source_f::make(analog::GR_GAUSSIAN, _dev, d_noise_seed);
}
- void set_max_dev(double _dev) { d_max_dev_hz = _dev; }
- void set_samp_rate(double _rate) { d_samp_rate = _rate; }
+ void set_max_dev(double _dev) override { d_max_dev_hz = _dev; }
+ void set_samp_rate(double _rate) override { d_samp_rate = _rate; }
- double std_dev() const { return d_std_dev_hz; }
- double max_dev() const { return d_max_dev_hz; }
- double samp_rate() const { return d_samp_rate; }
+ double std_dev() const override { return d_std_dev_hz; }
+ double max_dev() const override { return d_max_dev_hz; }
+ double samp_rate() const override { return d_samp_rate; }
};
} // namespace channels
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 12:42:19 +0000