summaryrefslogtreecommitdiff
path: root/gr-digital/lib/ofdm_equalizer_simpledfe.cc
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2019-08-07 21:45:12 +0200
committerMarcus Müller <marcus@hostalia.de>2019-08-09 23:04:28 +0200
commitf7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch)
treee09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gr-digital/lib/ofdm_equalizer_simpledfe.cc
parent78431dc6941e3acc67c858277dfe4a0ed583643c (diff)
Tree: clang-format without the include sorting
Diffstat (limited to 'gr-digital/lib/ofdm_equalizer_simpledfe.cc')
-rw-r--r--gr-digital/lib/ofdm_equalizer_simpledfe.cc168
1 files changed, 83 insertions, 85 deletions
diff --git a/gr-digital/lib/ofdm_equalizer_simpledfe.cc b/gr-digital/lib/ofdm_equalizer_simpledfe.cc
index f618ba5657..d324cdd8c8 100644
--- a/gr-digital/lib/ofdm_equalizer_simpledfe.cc
+++ b/gr-digital/lib/ofdm_equalizer_simpledfe.cc
@@ -1,18 +1,18 @@
/* -*- c++ -*- */
/* Copyright 2012 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -26,94 +26,92 @@
#include <gnuradio/digital/ofdm_equalizer_simpledfe.h>
namespace gr {
- namespace digital {
+namespace digital {
- ofdm_equalizer_simpledfe::sptr
- ofdm_equalizer_simpledfe::make(
- int fft_len,
- const gr::digital::constellation_sptr &constellation,
- const std::vector<std::vector<int> > &occupied_carriers,
- const std::vector<std::vector<int> > &pilot_carriers,
- const std::vector<std::vector<gr_complex> > &pilot_symbols,
- int symbols_skipped,
- float alpha,
- bool input_is_shifted)
- {
- return ofdm_equalizer_simpledfe::sptr(
- new ofdm_equalizer_simpledfe(
- fft_len,
- constellation,
- occupied_carriers,
- pilot_carriers,
- pilot_symbols,
- symbols_skipped,
- alpha,
- input_is_shifted
- )
- );
- }
+ofdm_equalizer_simpledfe::sptr
+ofdm_equalizer_simpledfe::make(int fft_len,
+ const gr::digital::constellation_sptr& constellation,
+ const std::vector<std::vector<int>>& occupied_carriers,
+ const std::vector<std::vector<int>>& pilot_carriers,
+ const std::vector<std::vector<gr_complex>>& pilot_symbols,
+ int symbols_skipped,
+ float alpha,
+ bool input_is_shifted)
+{
+ return ofdm_equalizer_simpledfe::sptr(new ofdm_equalizer_simpledfe(fft_len,
+ constellation,
+ occupied_carriers,
+ pilot_carriers,
+ pilot_symbols,
+ symbols_skipped,
+ alpha,
+ input_is_shifted));
+}
- ofdm_equalizer_simpledfe::ofdm_equalizer_simpledfe(
- int fft_len,
- const gr::digital::constellation_sptr &constellation,
- const std::vector<std::vector<int> > &occupied_carriers,
- const std::vector<std::vector<int> > &pilot_carriers,
- const std::vector<std::vector<gr_complex> > &pilot_symbols,
- int symbols_skipped,
- float alpha,
- bool input_is_shifted)
- : ofdm_equalizer_1d_pilots(fft_len, occupied_carriers, pilot_carriers, pilot_symbols, symbols_skipped, input_is_shifted),
- d_constellation(constellation),
- d_alpha(alpha)
- {
- }
+ofdm_equalizer_simpledfe::ofdm_equalizer_simpledfe(
+ int fft_len,
+ const gr::digital::constellation_sptr& constellation,
+ const std::vector<std::vector<int>>& occupied_carriers,
+ const std::vector<std::vector<int>>& pilot_carriers,
+ const std::vector<std::vector<gr_complex>>& pilot_symbols,
+ int symbols_skipped,
+ float alpha,
+ bool input_is_shifted)
+ : ofdm_equalizer_1d_pilots(fft_len,
+ occupied_carriers,
+ pilot_carriers,
+ pilot_symbols,
+ symbols_skipped,
+ input_is_shifted),
+ d_constellation(constellation),
+ d_alpha(alpha)
+{
+}
- ofdm_equalizer_simpledfe::~ofdm_equalizer_simpledfe()
- {
- }
+ofdm_equalizer_simpledfe::~ofdm_equalizer_simpledfe() {}
- void
- ofdm_equalizer_simpledfe::equalize(gr_complex *frame,
- int n_sym,
- const std::vector<gr_complex> &initial_taps,
- const std::vector<tag_t> &tags)
- {
- if (!initial_taps.empty()) {
- d_channel_state = initial_taps;
- }
- gr_complex sym_eq, sym_est;
+void ofdm_equalizer_simpledfe::equalize(gr_complex* frame,
+ int n_sym,
+ const std::vector<gr_complex>& initial_taps,
+ const std::vector<tag_t>& tags)
+{
+ if (!initial_taps.empty()) {
+ d_channel_state = initial_taps;
+ }
+ gr_complex sym_eq, sym_est;
- for (int i = 0; i < n_sym; i++) {
- for (int k = 0; k < d_fft_len; k++) {
- if (!d_occupied_carriers[k]) {
- continue;
- }
- if (!d_pilot_carriers.empty() && d_pilot_carriers[d_pilot_carr_set][k]) {
- d_channel_state[k] = d_alpha * d_channel_state[k]
- + (1-d_alpha) * frame[i*d_fft_len + k] / d_pilot_symbols[d_pilot_carr_set][k];
- frame[i*d_fft_len+k] = d_pilot_symbols[d_pilot_carr_set][k];
- } else {
- sym_eq = frame[i*d_fft_len+k] / d_channel_state[k];
- // The `map_to_points` function will treat `sym_est` as an array
- // pointer. This call is "safe" because `map_to_points` is limited
- // by the dimensionality of the constellation. This class calls the
- // `constellation` class default constructor, which initializes the
- // dimensionality value to `1`. Thus, Only the single `gr_complex`
- // value will be dereferenced.
- d_constellation->map_to_points(d_constellation->decision_maker(&sym_eq), &sym_est);
- d_channel_state[k] = d_alpha * d_channel_state[k]
- + (1-d_alpha) * frame[i*d_fft_len + k] / sym_est;
- frame[i*d_fft_len+k] = sym_est;
- }
- }
- if (!d_pilot_carriers.empty()) {
- d_pilot_carr_set = (d_pilot_carr_set + 1) % d_pilot_carriers.size();
- }
- }
+ for (int i = 0; i < n_sym; i++) {
+ for (int k = 0; k < d_fft_len; k++) {
+ if (!d_occupied_carriers[k]) {
+ continue;
+ }
+ if (!d_pilot_carriers.empty() && d_pilot_carriers[d_pilot_carr_set][k]) {
+ d_channel_state[k] = d_alpha * d_channel_state[k] +
+ (1 - d_alpha) * frame[i * d_fft_len + k] /
+ d_pilot_symbols[d_pilot_carr_set][k];
+ frame[i * d_fft_len + k] = d_pilot_symbols[d_pilot_carr_set][k];
+ } else {
+ sym_eq = frame[i * d_fft_len + k] / d_channel_state[k];
+ // The `map_to_points` function will treat `sym_est` as an array
+ // pointer. This call is "safe" because `map_to_points` is limited
+ // by the dimensionality of the constellation. This class calls the
+ // `constellation` class default constructor, which initializes the
+ // dimensionality value to `1`. Thus, Only the single `gr_complex`
+ // value will be dereferenced.
+ d_constellation->map_to_points(d_constellation->decision_maker(&sym_eq),
+ &sym_est);
+ d_channel_state[k] = d_alpha * d_channel_state[k] +
+ (1 - d_alpha) * frame[i * d_fft_len + k] / sym_est;
+ frame[i * d_fft_len + k] = sym_est;
+ }
+ }
+ if (!d_pilot_carriers.empty()) {
+ d_pilot_carr_set = (d_pilot_carr_set + 1) % d_pilot_carriers.size();
+ }
}
+}
- } /* namespace digital */
+} /* namespace digital */
} /* namespace gr */
-
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 13:01:36 +0000