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.
This commit is contained in:
@@ -35,6 +35,8 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
static const gr_complex LONG[64];
|
static const gr_complex LONG[64];
|
||||||
|
|
||||||
|
gr_complex d_H[64];
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace channel_estimation */
|
} /* namespace channel_estimation */
|
||||||
|
|||||||
@@ -30,9 +30,6 @@ public:
|
|||||||
double get_snr();
|
double get_snr();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
gr_complex d_H[64];
|
|
||||||
|
|
||||||
|
|
||||||
const double alpha = 0.2;
|
const double alpha = 0.2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -31,8 +31,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
double get_snr();
|
double get_snr();
|
||||||
|
|
||||||
|
|
||||||
gr_complex d_H[64];
|
|
||||||
double d_snr;
|
double d_snr;
|
||||||
const double alpha = 0.5;
|
const double alpha = 0.5;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ public:
|
|||||||
virtual void equalize(gr_complex *in, int n, gr_complex *symbols, uint8_t *bits, boost::shared_ptr<gr::digital::constellation> mod);
|
virtual void equalize(gr_complex *in, int n, gr_complex *symbols, uint8_t *bits, boost::shared_ptr<gr::digital::constellation> mod);
|
||||||
virtual double get_snr();
|
virtual double get_snr();
|
||||||
private:
|
private:
|
||||||
gr_complex d_H[64];
|
|
||||||
double d_snr;
|
double d_snr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public:
|
|||||||
double get_snr();
|
double get_snr();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
gr_complex d_H[64];
|
|
||||||
double d_snr;
|
double d_snr;
|
||||||
|
|
||||||
const double alpha = 0.5;
|
const double alpha = 0.5;
|
||||||
|
|||||||
Reference in New Issue
Block a user