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

spectrum: fix wrong usage of atan

Browse Source
This commit is contained in:
Tommaso Zugno
2020-06-04 19:18:46 +02:00
parent 5dab92583b
commit 54c788d74e
2 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,19 +68,11 @@ DoBeamforming (Ptr<NetDevice> thisDevice, Ptr<ThreeGppAntennaArrayModel> thisAnt
// compute the azimuth and the elevation angles
Angles completeAngle (bPos,aPos);
double posX = bPos.x - aPos.x;
double phiAngle = atan ((bPos.y - aPos.y) / posX);
if (posX < 0)
{
phiAngle = phiAngle + M_PI;
}
if (phiAngle < 0)
{
phiAngle = phiAngle + 2 * M_PI;
}
double hAngleRadian = fmod ((phiAngle + M_PI),2 * M_PI - M_PI); // the azimuth angle
double hAngleRadian = fmod (completeAngle.phi, 2.0 * M_PI); // the azimuth angle
if (hAngleRadian < 0)
{
hAngleRadian += 2.0 * M_PI;
}
double vAngleRadian = completeAngle.theta; // the elevation angle
// retrieve the number of antenna elements

22
src/spectrum/test/three-gpp-channel-test-suite.cc
View File

@@ -402,28 +402,20 @@ ThreeGppSpectrumPropagationLossModelTest::~ThreeGppSpectrumPropagationLossModelT
void
ThreeGppSpectrumPropagationLossModelTest::DoBeamforming (Ptr<NetDevice> thisDevice, Ptr<ThreeGppAntennaArrayModel> thisAntenna, Ptr<NetDevice> otherDevice, Ptr<ThreeGppAntennaArrayModel> otherAntenna)
{
uint8_t noPlane = 1;
ThreeGppAntennaArrayModel::ComplexVector antennaWeights;
Vector aPos = thisDevice->GetNode ()->GetObject<MobilityModel> ()->GetPosition ();
Vector bPos = otherDevice->GetNode ()->GetObject<MobilityModel> ()->GetPosition ();
// compute the azimuth and the elevation angles
Angles completeAngle (bPos,aPos);
double posX = bPos.x - aPos.x;
double phiAngle = atan ((bPos.y - aPos.y) / posX);
if (posX < 0)
{
phiAngle = phiAngle + M_PI;
}
if (phiAngle < 0)
{
phiAngle = phiAngle + 2 * M_PI;
}
double hAngleRadian = fmod ((phiAngle + (M_PI / noPlane)),2 * M_PI / noPlane) - (M_PI / noPlane);
double vAngleRadian = completeAngle.theta;
double hAngleRadian = fmod (completeAngle.phi, 2.0 * M_PI); // the azimuth angle
if (hAngleRadian < 0)
{
hAngleRadian += 2.0 * M_PI;
}
double vAngleRadian = completeAngle.theta; // the elevation angle
int totNoArrayElements = thisAntenna->GetNumberOfElements ();
double power = 1 / sqrt (totNoArrayElements);