From 8ca5dceddef519db7e2256b4fcc64699b1f49893 Mon Sep 17 00:00:00 2001 From: Anton Ottosson Date: Thu, 8 Jul 2021 21:51:53 +0200 Subject: [PATCH] Make `d_H` inherited from base class. All equalizer classes had their own private `d_H` vector, despite all being derived from a common `base` class. Now `d_H` is instead a protected member of `base`, and thus accessible to the derived equalizer classes. --- lib/equalizer/base.h | 2 ++ lib/equalizer/comb.h | 3 --- lib/equalizer/lms.h | 2 -- lib/equalizer/ls.h | 1 - lib/equalizer/sta.h | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/equalizer/base.h b/lib/equalizer/base.h index 2e9193d..279c33e 100644 --- a/lib/equalizer/base.h +++ b/lib/equalizer/base.h @@ -35,6 +35,8 @@ public: protected: static const gr_complex LONG[64]; + + gr_complex d_H[64]; }; } /* namespace channel_estimation */ diff --git a/lib/equalizer/comb.h b/lib/equalizer/comb.h index cf26890..daf2e63 100644 --- a/lib/equalizer/comb.h +++ b/lib/equalizer/comb.h @@ -30,9 +30,6 @@ public: double get_snr(); private: - gr_complex d_H[64]; - - const double alpha = 0.2; }; diff --git a/lib/equalizer/lms.h b/lib/equalizer/lms.h index 094947f..41fd247 100644 --- a/lib/equalizer/lms.h +++ b/lib/equalizer/lms.h @@ -31,8 +31,6 @@ public: private: double get_snr(); - - gr_complex d_H[64]; double d_snr; const double alpha = 0.5; }; diff --git a/lib/equalizer/ls.h b/lib/equalizer/ls.h index 2bbf68c..97aad8a 100644 --- a/lib/equalizer/ls.h +++ b/lib/equalizer/ls.h @@ -30,7 +30,6 @@ public: virtual void equalize(gr_complex *in, int n, gr_complex *symbols, uint8_t *bits, boost::shared_ptr mod); virtual double get_snr(); private: - gr_complex d_H[64]; double d_snr; }; diff --git a/lib/equalizer/sta.h b/lib/equalizer/sta.h index bb619e7..60108f4 100644 --- a/lib/equalizer/sta.h +++ b/lib/equalizer/sta.h @@ -31,7 +31,6 @@ public: double get_snr(); private: - gr_complex d_H[64]; double d_snr; const double alpha = 0.5;