F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spectrum: Remove local Shuffle method and use core Shuffle method

Browse Source
This commit is contained in:
Ivey
2024-11-19 12:29:55 -05:00
committed by Gabriel Ferreira
parent 0a91fea676
commit 0243367d34
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/spectrum/model/three-gpp-channel-model.cc
View File

@@ -18,6 +18,7 @@
#include "ns3/node.h"
#include "ns3/phased-array-model.h"
#include "ns3/pointer.h"
#include "ns3/shuffle.h"
#include "ns3/simulator.h"
#include "ns3/string.h"
@@ -3039,10 +3040,10 @@ ThreeGppChannelModel::GenerateChannelParameters(const Ptr<const ChannelCondition
for (uint8_t cIndex = 0; cIndex < channelParams->m_reducedClusterNumber; cIndex++)
{
Shuffle(&rayAodRadian[cIndex][0], &rayAodRadian[cIndex][table3gpp->m_raysPerCluster]);
Shuffle(&rayAoaRadian[cIndex][0], &rayAoaRadian[cIndex][table3gpp->m_raysPerCluster]);
Shuffle(&rayZodRadian[cIndex][0], &rayZodRadian[cIndex][table3gpp->m_raysPerCluster]);
Shuffle(&rayZoaRadian[cIndex][0], &rayZoaRadian[cIndex][table3gpp->m_raysPerCluster]);
Shuffle(rayAodRadian[cIndex].begin(), rayAodRadian[cIndex].end(), m_uniformRvShuffle);
Shuffle(rayAoaRadian[cIndex].begin(), rayAoaRadian[cIndex].end(), m_uniformRvShuffle);
Shuffle(rayZodRadian[cIndex].begin(), rayZodRadian[cIndex].end(), m_uniformRvShuffle);
Shuffle(rayZoaRadian[cIndex].begin(), rayZoaRadian[cIndex].end(), m_uniformRvShuffle);
}
// store values
@@ -3868,15 +3869,6 @@ ThreeGppChannelModel::CalcAttenuationOfBlockage(
return powerAttenuation;
}
void
ThreeGppChannelModel::Shuffle(double* first, double* last) const
{
for (auto i = (last - first) - 1; i > 0; --i)
{
std::swap(first[i], first[m_uniformRvShuffle->GetInteger(0, i)]);
}
}
int64_t
ThreeGppChannelModel::AssignStreams(int64_t stream)
{

7
src/spectrum/model/three-gpp-channel-model.h
View File

@@ -143,13 +143,6 @@ class ThreeGppChannelModel : public MatrixBasedChannelModel
*/
static std::pair<double, double> WrapAngles(double azimuthRad, double inclinationRad);
/**
* @brief Shuffle the elements of a simple sequence container of type double
* @param first Pointer to the first element among the elements to be shuffled
* @param last Pointer to the last element among the elements to be shuffled
*/
void Shuffle(double* first, double* last) const;
/**
* Extends the struct ChannelParams by including information that is used
* within the ThreeGppChannelModel class