t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Bastian Bloessl
2017-03-06 12:49:53 +01:00
parent 144cbbf796 21bcc8b639
commit 7b119ba59e
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/equalizer/lms.cc
+5 -5
View File
@@ -30,17 +30,17 @@ void lms::equalize(gr_complex *in, int n, gr_complex *symbols, uint8_t *bits, bo
double signal = 0; double signal = 0;
double noise = 0; double noise = 0;
for(int i = 0; i < 64; i++) { for(int i = 0; i < 64; i++) {
if((i == 32) || (i < 6) || ( i > 58)) {
continue;
}
noise += std::pow(std::abs(d_H[i] - in[i]), 2); noise += std::pow(std::abs(d_H[i] - in[i]), 2);
signal += std::pow(std::abs(d_H[i] + in[i]), 2); signal += std::pow(std::abs(d_H[i] + in[i]), 2);
}
d_snr = 10 * std::log10(signal / noise / 2);
for(int i = 0; i < 64; i++) {
d_H[i] += in[i]; d_H[i] += in[i];
d_H[i] /= LONG[i] * gr_complex(2, 0); d_H[i] /= LONG[i] * gr_complex(2, 0);
} }
d_snr = 10 * std::log10(signal / noise / 2);
} else { } else {
int c = 0; int c = 0;
for(int i = 0; i < 64; i++) { for(int i = 0; i < 64; i++) {
lib/equalizer/ls.cc
+5 -5
View File
@@ -30,17 +30,17 @@ void ls::equalize(gr_complex *in, int n, gr_complex *symbols, uint8_t *bits, boo
double signal = 0; double signal = 0;
double noise = 0; double noise = 0;
for(int i = 0; i < 64; i++) { for(int i = 0; i < 64; i++) {
if((i == 32) || (i < 6) || ( i > 58)) {
continue;
}
noise += std::pow(std::abs(d_H[i] - in[i]), 2); noise += std::pow(std::abs(d_H[i] - in[i]), 2);
signal += std::pow(std::abs(d_H[i] + in[i]), 2); signal += std::pow(std::abs(d_H[i] + in[i]), 2);
}
d_snr = 10 * std::log10(signal / noise / 2);
for(int i = 0; i < 64; i++) {
d_H[i] += in[i]; d_H[i] += in[i];
d_H[i] /= LONG[i] * gr_complex(2, 0); d_H[i] /= LONG[i] * gr_complex(2, 0);
} }
d_snr = 10 * std::log10(signal / noise / 2);
} else { } else {
int c = 0; int c = 0;
lib/equalizer/sta.cc
+8 -5
View File
@@ -30,17 +30,17 @@ void sta::equalize(gr_complex *in, int n, gr_complex *symbols, uint8_t *bits, bo
double signal = 0; double signal = 0;
double noise = 0; double noise = 0;
for(int i = 0; i < 64; i++) { for(int i = 0; i < 64; i++) {
if((i == 32) || (i < 6) || ( i > 58)) {
continue;
}
noise += std::pow(std::abs(d_H[i] - in[i]), 2); noise += std::pow(std::abs(d_H[i] - in[i]), 2);
signal += std::pow(std::abs(d_H[i] + in[i]), 2); signal += std::pow(std::abs(d_H[i] + in[i]), 2);
}
d_snr = 10 * std::log10(signal / noise / 2);
for(int i = 0; i < 64; i++) {
d_H[i] += in[i]; d_H[i] += in[i];
d_H[i] /= LONG[i] * gr_complex(2, 0); d_H[i] /= LONG[i] * gr_complex(2, 0);
} }
d_snr = 10 * std::log10(signal / noise / 2);
} else { } else {
gr_complex H_update[64]; gr_complex H_update[64];
@@ -81,6 +81,9 @@ void sta::equalize(gr_complex *in, int n, gr_complex *symbols, uint8_t *bits, bo
} }
for(int i = 0; i < 64; i++) { for(int i = 0; i < 64; i++) {
if((i < 6) || ( i > 58)) {
continue;
}
d_H[i] = gr_complex(1-alpha,0) * d_H[i] + gr_complex(alpha,0) * H_update[i]; d_H[i] = gr_complex(1-alpha,0) * d_H[i] + gr_complex(alpha,0) * H_update[i];
} }
} }