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

spectrum: Small fixes to MR !257 (matrix-based channel models)

Browse Source
This commit is contained in:
Tommaso Zugno
2020-04-23 16:13:47 +02:00
committed by Tom Henderson
parent a0b58934d3
commit 3abab98fb7
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/spectrum/model/matrix-based-channel-model.cc
View File

@@ -1,7 +1,5 @@
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2015, NYU WIRELESS, Tandon School of Engineering,
* New York University
* Copyright (c) 2020 SIGNET Lab, Department of Information Engineering,
* University of Padova
*
@@ -27,4 +25,4 @@ MatrixBasedChannelModel::~MatrixBasedChannelModel()
{
}
}
}

6
src/spectrum/model/matrix-based-channel-model.h
View File

@@ -1,7 +1,5 @@
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2015, NYU WIRELESS, Tandon School of Engineering,
* New York University
* Copyright (c) 2020 SIGNET Lab, Department of Information Engineering,
* University of Padova
*
@@ -56,8 +54,7 @@ public:
/**
* Data structure that stores a channel realization, plus some other information
* that can be useful when handling channel matrices
* Data structure that stores a channel realization
*/
struct ChannelMatrix : public SimpleRefCount<ChannelMatrix>
{
@@ -66,7 +63,6 @@ public:
Double2DVector m_angle; //!< cluster angle angle[direction][n], where direction = 0(aoa), 1(zoa), 2(aod), 3(zod) in degree.
Time m_generatedTime; //!< generation time
std::pair<uint32_t, uint32_t> m_nodeIds; //!< the first element is the s-node ID, the second element is the u-node ID
bool m_los; //!< true if LOS, false if NLOS
/**
* Returns true if the ChannelMatrix object was generated

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

@@ -37,8 +37,14 @@ namespace ns3 {
class MobilityModel;
class ThreeGppAntennaArrayModel;
/**
* Extends the struct ChannelMatrix by including information that are used
* withing the class ThreeGppChannelModel
*/
struct ThreeGppChannelMatrix : public MatrixBasedChannelModel::ChannelMatrix
{
bool m_los; //!< true if LOS, false if NLOS
// TODO these are not currently used, they have to be correctly set when including the spatial consistent update procedure
/*The following parameters are stored for spatial consistent updating. The notation is
that of 3GPP technical reports, but it can apply also to other channel realizations*/
@@ -215,10 +221,10 @@ private:
* \return the channel realization
*/
Ptr<ThreeGppChannelMatrix> GetNewChannel (Vector locUT, bool los, bool o2i,
Ptr<const ThreeGppAntennaArrayModel> sAntenna,
Ptr<const ThreeGppAntennaArrayModel> uAntenna,
Angles &uAngle, Angles &sAngle,
double dis2D, double hBS, double hUT) const;
Ptr<const ThreeGppAntennaArrayModel> sAntenna,
Ptr<const ThreeGppAntennaArrayModel> uAntenna,
Angles &uAngle, Angles &sAngle,
double dis2D, double hBS, double hUT) const;
/**
* Applies the blockage model A described in 3GPP TR 38.901