diff options
| author |   Matt Ettus <MattEttus@users.noreply.github.com> | 2021-09-27 07:39:59 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-09-27 10:39:59 -0400 |
| commit | 7a329159d4c728431cffa63f02e5a9ac5b9c67c0 (patch) | |
| tree | af4cc491425b27237962c83833629797b70fa8d0 /gr-channels | |
| parent | ci: Allow per-container ctest args (diff) | |
| download | gnuradio-7a329159d4c728431cffa63f02e5a9ac5b9c67c0.tar.xz gnuradio-7a329159d4c728431cffa63f02e5a9ac5b9c67c0.zip | |
channels: Fix bad initialization of RNG seeds
* Fix bad initialization of RNG seeds. If this isn't done, multiple channels will be correlated with each other.
Signed-off-by: Matt Ettus <matt@ettus.net>
* formatting fix
Signed-off-by: Matt Ettus <matt@ettus.net>
* Fixed ordering of initialization
Signed-off-by: Matt Ettus <matt@ettus.net>
Diffstat (limited to 'gr-channels')
| -rw-r--r-- | gr-channels/lib/flat_fader_impl.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gr-channels/lib/flat_fader_impl.cc b/gr-channels/lib/flat_fader_impl.cc index 5755247c7..8f950a4e9 100644 --- a/gr-channels/lib/flat_fader_impl.cc +++ b/gr-channels/lib/flat_fader_impl.cc @@ -15,15 +15,12 @@ namespace gr { namespace channels { flat_fader_impl::flat_fader_impl(uint32_t N, float fDTs, bool LOS, float K, uint32_t seed) - : rng_1(seed), - dist_1(-GR_M_PI, GR_M_PI), - rng_2(seed + 1), + : dist_1(-GR_M_PI, GR_M_PI), dist_2(0, 1), d_N(N), d_fDTs(fDTs), - d_theta(dist_1(rng_1)), - d_theta_los(dist_1(rng_1)), + d_step(powf(0.00125 * fDTs, 1.1)), // max step size approximated from Table 2 d_m(0), d_K(K), @@ -38,6 +35,13 @@ flat_fader_impl::flat_fader_impl(uint32_t N, float fDTs, bool LOS, float K, uint scale_los(sqrtf(d_K) / sqrtf(d_K + 1)), scale_nlos(1 / sqrtf(d_K + 1)) { + rng_1 = std::mt19937(seed); + rng_2 = std::mt19937(seed + 1); + + d_theta = dist_1(rng_1); + d_theta_los = dist_1(rng_1); + + // generate initial phase values for (int i = 0; i < d_N + 1; i++) { d_psi[i] = dist_1(rng_1); |