From 3abab98fb77deb3edb71ce0ca592acee7b9a2bdf Mon Sep 17 00:00:00 2001 From: Tommaso Zugno Date: Thu, 23 Apr 2020 16:13:47 +0200 Subject: [PATCH] spectrum: Small fixes to MR !257 (matrix-based channel models) --- src/spectrum/model/matrix-based-channel-model.cc | 4 +--- src/spectrum/model/matrix-based-channel-model.h | 6 +----- src/spectrum/model/three-gpp-channel-model.h | 14 ++++++++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/spectrum/model/matrix-based-channel-model.cc b/src/spectrum/model/matrix-based-channel-model.cc index 79200ce14..a287e79f3 100644 --- a/src/spectrum/model/matrix-based-channel-model.cc +++ b/src/spectrum/model/matrix-based-channel-model.cc @@ -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() { } -} \ No newline at end of file +} diff --git a/src/spectrum/model/matrix-based-channel-model.h b/src/spectrum/model/matrix-based-channel-model.h index 351ae9e7d..28e8ab8ed 100644 --- a/src/spectrum/model/matrix-based-channel-model.h +++ b/src/spectrum/model/matrix-based-channel-model.h @@ -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 { @@ -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 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 diff --git a/src/spectrum/model/three-gpp-channel-model.h b/src/spectrum/model/three-gpp-channel-model.h index d34219360..726e4dfaf 100644 --- a/src/spectrum/model/three-gpp-channel-model.h +++ b/src/spectrum/model/three-gpp-channel-model.h @@ -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 GetNewChannel (Vector locUT, bool los, bool o2i, - Ptr sAntenna, - Ptr uAntenna, - Angles &uAngle, Angles &sAngle, - double dis2D, double hBS, double hUT) const; + Ptr sAntenna, + Ptr uAntenna, + Angles &uAngle, Angles &sAngle, + double dis2D, double hBS, double hUT) const; /** * Applies the blockage model A described in 3GPP TR 38.901