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

propagation: Remove ThreeGppPropagationLossModel prologue function

Browse Source
This commit is contained in:
Gabriel Ferreira
2025-07-18 12:30:53 +02:00
parent 34e786625a
commit 69e680f980
2 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/propagation/model/three-gpp-propagation-loss-model.cc
View File

@@ -263,9 +263,6 @@ NS_LOG_COMPONENT_DEFINE("ThreeGppPropagationLossModel");
NS_OBJECT_ENSURE_REGISTERED(ThreeGppPropagationLossModel);
std::function<Ptr<MobilityModel>(Ptr<const MobilityModel>, Ptr<const MobilityModel>)>
ThreeGppPropagationLossModel::m_doCalcRxPowerPrologueFunction;
TypeId
ThreeGppPropagationLossModel::GetTypeId()
{
@@ -378,19 +375,11 @@ ThreeGppPropagationLossModel::IsO2iLowPenetrationLoss(Ptr<const ChannelCondition
double
ThreeGppPropagationLossModel::DoCalcRxPower(double txPowerDbm,
Ptr<MobilityModel> c,
Ptr<MobilityModel> a,
Ptr<MobilityModel> b) const
{
NS_LOG_FUNCTION(this);
// if there is a prologue function installed, call it and replace the transmitter mobility model
auto a = m_doCalcRxPowerPrologueFunction ? m_doCalcRxPowerPrologueFunction(b, c) : c;
if (a->GetPosition() != c->GetPosition())
{
NS_LOG_DEBUG("Prologue function replaced source position "
<< c->GetPosition() << " with position " << a->GetPosition());
}
// check if the model is initialized
NS_ASSERT_MSG(m_frequency != 0.0, "First set the centre frequency");

24
src/propagation/model/three-gpp-propagation-loss-model.h
View File

@@ -75,26 +75,6 @@ class ThreeGppPropagationLossModel : public PropagationLossModel
*/
bool IsO2iLowPenetrationLoss(Ptr<const ChannelCondition> cond) const;
/**
* @brief Stop-gap solution for wraparound model
*
* Stop-gap solution for support of wraparound model in the 5G NR module. This
* method was introduced for ns-3.45 but will be removed in a future release once
* a more general solution is added elsewhere (most likely in the spectrum channel). The
* callback method registered here will be executed at the beginning of DoCalcRxPower, and the
* returned pointer to a mobility model will be subsequently used as the (replacement) source
* mobility model for the rest of DoCalcRxPower() processing.
*
* @param prologueFunction Function that receives two mobility models and compute a third, based
* on the wrapped position of the second model in respect to the first
*/
static void InstallDoCalcRxPowerPrologueFunction(
std::function<Ptr<MobilityModel>(Ptr<const MobilityModel>, Ptr<const MobilityModel>)>
prologueFunction)
{
m_doCalcRxPowerPrologueFunction = prologueFunction;
}
private:
/**
* Computes the received power by applying the pathloss model described in
@@ -320,10 +300,6 @@ class ThreeGppPropagationLossModel : public PropagationLossModel
Ptr<NormalRandomVariable>
m_normalO2iHighLossVar; //!< a normal random variable for the calculation of 02i high loss,
//!< see TR38.901 Table 7.4.3-2
/// Optional prologue function that can be used to implement wraparound models
static std::function<Ptr<MobilityModel>(Ptr<const MobilityModel>, Ptr<const MobilityModel>)>
m_doCalcRxPowerPrologueFunction;
};
/**