diff --git a/src/wifi/model/wifi-tx-current-model.cc b/src/wifi/model/wifi-tx-current-model.cc index f9d34369f..2db757cdc 100644 --- a/src/wifi/model/wifi-tx-current-model.cc +++ b/src/wifi/model/wifi-tx-current-model.cc @@ -58,18 +58,15 @@ LinearWifiTxCurrentModel::GetTypeId (void) .AddConstructor () .AddAttribute ("Eta", "The efficiency of the power amplifier.", DoubleValue (0.10), - MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetEta, - &LinearWifiTxCurrentModel::GetEta), + MakeDoubleAccessor (&LinearWifiTxCurrentModel::m_eta), MakeDoubleChecker ()) .AddAttribute ("Voltage", "The supply voltage (in Volts).", DoubleValue (3.0), - MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetVoltage, - &LinearWifiTxCurrentModel::GetVoltage), + MakeDoubleAccessor (&LinearWifiTxCurrentModel::m_voltage), MakeDoubleChecker ()) .AddAttribute ("IdleCurrent", "The current in the IDLE state (in Watts).", DoubleValue (0.273333), - MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetIdleCurrent, - &LinearWifiTxCurrentModel::GetIdleCurrent), + MakeDoubleAccessor (&LinearWifiTxCurrentModel::m_idleCurrent), MakeDoubleChecker ()) ; return tid; @@ -85,45 +82,6 @@ LinearWifiTxCurrentModel::~LinearWifiTxCurrentModel() NS_LOG_FUNCTION (this); } -void -LinearWifiTxCurrentModel::SetEta (double eta) -{ - NS_LOG_FUNCTION (this << eta); - m_eta = eta; -} - -void -LinearWifiTxCurrentModel::SetVoltage (double voltage) -{ - NS_LOG_FUNCTION (this << voltage); - m_voltage = voltage; -} - -void -LinearWifiTxCurrentModel::SetIdleCurrent (double idleCurrent) -{ - NS_LOG_FUNCTION (this << idleCurrent); - m_idleCurrent = idleCurrent; -} - -double -LinearWifiTxCurrentModel::GetEta (void) const -{ - return m_eta; -} - -double -LinearWifiTxCurrentModel::GetVoltage (void) const -{ - return m_voltage; -} - -double -LinearWifiTxCurrentModel::GetIdleCurrent (void) const -{ - return m_idleCurrent; -} - double LinearWifiTxCurrentModel::CalcTxCurrent (double txPowerDbm) const { diff --git a/src/wifi/model/wifi-tx-current-model.h b/src/wifi/model/wifi-tx-current-model.h index b6157a494..2607661ff 100644 --- a/src/wifi/model/wifi-tx-current-model.h +++ b/src/wifi/model/wifi-tx-current-model.h @@ -93,42 +93,6 @@ public: LinearWifiTxCurrentModel (); virtual ~LinearWifiTxCurrentModel (); - /** - * \param eta (dimension-less) - * - * Set the power amplifier efficiency. - */ - void SetEta (double eta); - - /** - * \param voltage (Volts) - * - * Set the supply voltage. - */ - void SetVoltage (double voltage); - - /** - * \param idleCurrent (Ampere) - * - * Set the current in the IDLE state. - */ - void SetIdleCurrent (double idleCurrent); - - /** - * \return the power amplifier efficiency. - */ - double GetEta (void) const; - - /** - * \return the supply voltage. - */ - double GetVoltage (void) const; - - /** - * \return the current in the IDLE state. - */ - double GetIdleCurrent (void) const; - double CalcTxCurrent (double txPowerDbm) const;