diff -r f074a6ada683 src/wifi/model/interference-helper.cc --- a/src/wifi/model/interference-helper.cc Wed Jan 31 20:16:58 2018 +0100 +++ b/src/wifi/model/interference-helper.cc Thu Feb 01 18:37:37 2018 +0100 @@ -88,9 +88,9 @@ * short period of time. ****************************************************************/ -InterferenceHelper::NiChange::NiChange (Time time, double delta, Ptr event) +InterferenceHelper::NiChange::NiChange (Time time, double power, Ptr event) : m_time (time), - m_delta (delta), + m_power (power), m_event (event) { } @@ -102,9 +102,15 @@ } double -InterferenceHelper::NiChange::GetDelta (void) const +InterferenceHelper::NiChange::GetPower (void) const { - return m_delta; + return m_power; +} + +void +InterferenceHelper::NiChange::AddPower (double power) +{ + m_power += power; } Ptr @@ -188,24 +194,20 @@ } Time -InterferenceHelper::GetEnergyDuration (double energyW) const +InterferenceHelper::GetEnergyDuration (double energyW) { Time now = Simulator::Now (); - double noiseInterferenceW = 0; - Time end = now; - noiseInterferenceW = m_firstPower; - for (NiChanges::const_iterator i = m_niChanges.begin (); i != m_niChanges.end (); i++) + auto i = GetPreviousPosition (now); + Time end = i->GetTime (); + while (i != m_niChanges.end ()) { - noiseInterferenceW += i->GetDelta (); + double noiseInterferenceW = i->GetPower (); end = i->GetTime (); - if (end < now) - { - continue; - } if (noiseInterferenceW < energyW) { break; } + ++i; } return end > now ? end - now : MicroSeconds (0); } @@ -213,18 +215,26 @@ void InterferenceHelper::AppendEvent (Ptr event) { - Time now = Simulator::Now (); + double previousPowerStart = 0; + double previousPowerEnd = 0; + auto itPreviousEvent = GetPreviousPosition (event->GetStartTime ()); + auto itNextEvent = GetPreviousPosition (event->GetEndTime ()); + if (m_niChanges.size() > 0) + { + previousPowerStart = itPreviousEvent->GetPower (); + previousPowerEnd = itNextEvent->GetPower (); + } if (!m_rxing) { - NiChanges::const_iterator nowIterator = GetPosition (now); - for (NiChanges::const_iterator i = m_niChanges.begin (); i != nowIterator; i++) - { - m_firstPower += i->GetDelta (); - } - m_niChanges.erase (m_niChanges.begin (), nowIterator); + m_firstPower = previousPowerStart; + m_niChanges.erase (m_niChanges.begin (), GetNextPosition (event->GetStartTime ())); } - AddNiChangeEvent (NiChange (event->GetStartTime (), event->GetRxPowerW (), event)); - AddNiChangeEvent (NiChange (event->GetEndTime (), -event->GetRxPowerW (), event)); + auto first = AddNiChangeEvent (NiChange (event->GetStartTime (), previousPowerStart, event)); + auto last = AddNiChangeEvent (NiChange (event->GetEndTime (), previousPowerEnd, event)); + for (auto i = first; i < last; i++) + { + m_niChanges.at (i).AddPower (event->GetRxPowerW ()); + } } double @@ -243,43 +253,22 @@ } double -InterferenceHelper::CalculateNoiseInterferenceW (Ptr event, NiChanges *ni) const +InterferenceHelper::CalculateNoiseInterferenceW (Ptr event, NiChanges *ni) { double noiseInterference = m_firstPower; - NiChanges::const_iterator eventIterator = m_niChanges.begin (); - while (eventIterator != m_niChanges.end ()) + auto it = m_niChanges.begin (); + while (it != m_niChanges.end () && it->GetEvent () != event) { - // Iterate the NI change list from the beginning to the end - // until find the position of the event in the NI change list - // The reason of using the event that causes the NI change to identify - // different NI changes is because in some special cases - // different NI changes happen at the same time with the same delta - // value. Therefore, it may be impossible to identify a NI change that belongs - // to which event based on just the NI time and NI delta value - if (eventIterator->GetEvent () != event) - { - // The NI changes which happen before the event should be considered - // as the interference. This considers the case that the receiving event - // arrives while another receiving event is going on. The SINR of - // the newly arrived event is calculated for checking the possibility of frame capture - noiseInterference += eventIterator->GetDelta (); - } - else - { - break; - } - ++eventIterator; + noiseInterference = it->GetPower (); + ++it; } - - for (NiChanges::const_iterator i = eventIterator + 1; i != m_niChanges.end (); ++i) + ni->push_back (NiChange (event->GetStartTime (), 0, event)); + ++it; + while (it != m_niChanges.end () && event != it->GetEvent ()) { - if (event->GetEndTime () == i->GetTime () && event == i->GetEvent ()) - { - break; - } - ni->push_back (*i); + ni->push_back (*it); + ++it; } - ni->insert (ni->begin (), NiChange (event->GetStartTime (), noiseInterference, event)); ni->push_back (NiChange (event->GetEndTime (), 0, event)); return noiseInterference; } @@ -313,19 +302,19 @@ const WifiTxVector txVector = event->GetTxVector (); double psr = 1.0; /* Packet Success Rate */ NiChanges::const_iterator j = ni->begin (); - Time previous = (*j).GetTime (); + Time previous = j->GetTime (); WifiMode payloadMode = event->GetPayloadMode (); WifiPreamble preamble = txVector.GetPreambleType (); - Time plcpHeaderStart = (*j).GetTime () + WifiPhy::GetPlcpPreambleDuration (txVector); //packet start time + preamble + Time plcpHeaderStart = j->GetTime () + WifiPhy::GetPlcpPreambleDuration (txVector); //packet start time + preamble Time plcpHsigHeaderStart = plcpHeaderStart + WifiPhy::GetPlcpHeaderDuration (txVector); //packet start time + preamble + L-SIG Time plcpTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (preamble) + WifiPhy::GetPlcpSigA1Duration (preamble) + WifiPhy::GetPlcpSigA2Duration (preamble); //packet start time + preamble + L-SIG + HT-SIG or SIG-A Time plcpPayloadStart = plcpTrainingSymbolsStart + WifiPhy::GetPlcpTrainingSymbolDuration (txVector) + WifiPhy::GetPlcpSigBDuration (preamble); //packet start time + preamble + L-SIG + HT-SIG or SIG-A + Training + SIG-B - double noiseInterferenceW = (*j).GetDelta (); + double noiseInterferenceW = m_firstPower; double powerW = event->GetRxPowerW (); - j++; + ++j; while (ni->end () != j) { - Time current = (*j).GetTime (); + Time current = j->GetTime (); NS_LOG_DEBUG ("previous= " << previous << ", current=" << current); NS_ASSERT (current >= previous); //Case 1: Both previous and current point to the payload @@ -348,9 +337,9 @@ payloadMode, txVector); NS_LOG_DEBUG ("previous is before payload and current is in the payload: mode=" << payloadMode << ", psr=" << psr); } - noiseInterferenceW += (*j).GetDelta (); - previous = (*j).GetTime (); - j++; + noiseInterferenceW = j->GetPower () - powerW; + previous = j->GetTime (); + ++j; } double per = 1 - psr; return per; @@ -363,7 +352,7 @@ const WifiTxVector txVector = event->GetTxVector (); double psr = 1.0; /* Packet Success Rate */ NiChanges::const_iterator j = ni->begin (); - Time previous = (*j).GetTime (); + Time previous = j->GetTime (); WifiPreamble preamble = txVector.GetPreambleType (); WifiMode mcsHeaderMode; if (preamble == WIFI_PREAMBLE_HT_MF || preamble == WIFI_PREAMBLE_HT_GF) @@ -382,16 +371,16 @@ mcsHeaderMode = WifiPhy::GetHePlcpHeaderMode (); } WifiMode headerMode = WifiPhy::GetPlcpHeaderMode (txVector); - Time plcpHeaderStart = (*j).GetTime () + WifiPhy::GetPlcpPreambleDuration (txVector); //packet start time + preamble + Time plcpHeaderStart = j->GetTime () + WifiPhy::GetPlcpPreambleDuration (txVector); //packet start time + preamble Time plcpHsigHeaderStart = plcpHeaderStart + WifiPhy::GetPlcpHeaderDuration (txVector); //packet start time + preamble + L-SIG Time plcpTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (preamble) + WifiPhy::GetPlcpSigA1Duration (preamble) + WifiPhy::GetPlcpSigA2Duration (preamble); //packet start time + preamble + L-SIG + HT-SIG or SIG-A Time plcpPayloadStart = plcpTrainingSymbolsStart + WifiPhy::GetPlcpTrainingSymbolDuration (txVector) + WifiPhy::GetPlcpSigBDuration (preamble); //packet start time + preamble + L-SIG + HT-SIG or SIG-A + Training + SIG-B - double noiseInterferenceW = (*j).GetDelta (); + double noiseInterferenceW = m_firstPower; double powerW = event->GetRxPowerW (); - j++; + ++j; while (ni->end () != j) { - Time current = (*j).GetTime (); + Time current = j->GetTime (); NS_LOG_DEBUG ("previous= " << previous << ", current=" << current); NS_ASSERT (current >= previous); //Case 1: previous and current after playload start: nothing to do @@ -764,9 +753,9 @@ } } - noiseInterferenceW += (*j).GetDelta (); - previous = (*j).GetTime (); - j++; + noiseInterferenceW = j->GetPower () - powerW; + previous = j->GetTime (); + ++j; } double per = 1 - psr; @@ -821,16 +810,33 @@ m_firstPower = 0; } -InterferenceHelper::NiChanges::const_iterator -InterferenceHelper::GetPosition (Time moment) +InterferenceHelper::NiChanges::iterator +InterferenceHelper::GetNextPosition (Time moment) { return std::upper_bound (m_niChanges.begin (), m_niChanges.end (), NiChange (moment, 0, NULL)); } -void +InterferenceHelper::NiChanges::iterator +InterferenceHelper::GetPreviousPosition (Time moment) +{ + InterferenceHelper::NiChanges::iterator it = GetNextPosition (moment); + --it; + return it; +} + +InterferenceHelper::NiChanges::iterator +InterferenceHelper::GetPositionBeforeTime (Time moment) +{ + InterferenceHelper::NiChanges::iterator it = std::lower_bound (m_niChanges.begin (), m_niChanges.end (), NiChange (moment, 0, NULL)); + --it; + return it; +} + +int64_t InterferenceHelper::AddNiChangeEvent (NiChange change) { - m_niChanges.insert (GetPosition (change.GetTime ()), change); + auto it = m_niChanges.insert (GetNextPosition (change.GetTime ()), change); + return std::distance (m_niChanges.begin (), it); } void @@ -845,6 +851,9 @@ { NS_LOG_FUNCTION (this); m_rxing = false; + //Update m_firstPower for frame capture + auto it = GetPositionBeforeTime (Simulator::Now ()); + m_firstPower = it->GetPower (); } } //namespace ns3 diff -r f074a6ada683 src/wifi/model/interference-helper.h --- a/src/wifi/model/interference-helper.h Wed Jan 31 20:16:58 2018 +0100 +++ b/src/wifi/model/interference-helper.h Thu Feb 01 18:37:37 2018 +0100 @@ -149,7 +149,7 @@ * energy on the medium will be higher than * the requested threshold. */ - Time GetEnergyDuration (double energyW) const; + Time GetEnergyDuration (double energyW); /** * Add the packet-related signal to interference helper. @@ -213,10 +213,10 @@ * Create a NiChange at the given time and the amount of NI change. * * \param time time of the event - * \param delta the power + * \param power the power * \param event causes this NI change */ - NiChange (Time time, double delta, Ptr event); + NiChange (Time time, double power, Ptr event); /** * Return the event time. * @@ -228,7 +228,13 @@ * * \return the power */ - double GetDelta (void) const; + double GetPower (void) const; + /** + * Add a given amount of power. + * + * \param power the power to be added to the existing value + */ + void AddPower (double power); /** * Return the event causes the corresponding NI change * @@ -246,7 +252,7 @@ private: Time m_time; ///< time - double m_delta; ///< delta + double m_power; ///< power Ptr m_event; ///< event }; /** @@ -268,7 +274,7 @@ * * \return noise and interference power */ - double CalculateNoiseInterferenceW (Ptr event, NiChanges *ni) const; + double CalculateNoiseInterferenceW (Ptr event, NiChanges *ni); /** * Calculate SNR (linear ratio) from the given signal power and noise+interference power. * (Mode is not currently used) @@ -322,18 +328,35 @@ bool m_rxing; ///< flag whether it is in receiving state /** - * Returns a const iterator to the first nichange, which is later than moment + * Returns an iterator to the first nichange that is later than moment * * \param moment time to check from * \returns an iterator to the list of NiChanges */ - NiChanges::const_iterator GetPosition (Time moment); + NiChanges::iterator GetNextPosition (Time moment); /** - * Add NiChange to the list at the appropriate position. + * Returns an iterator to the last nichange that is before than moment + * + * \param moment time to check from + * \returns an iterator to the list of NiChanges + */ + NiChanges::iterator GetPreviousPosition (Time moment); + /** + * Returns an iterator to the nichange that occured just before moment + * + * \param moment time to check from + * \returns an iterator to the list of NiChanges + */ + NiChanges::iterator GetPositionBeforeTime (Time moment); + + /** + * Add NiChange to the list at the appropriate position and + * return the iterator of the new event. * * \param change + * \returns the iterator of the new event */ - void AddNiChangeEvent (NiChange change); + int64_t AddNiChangeEvent (NiChange change); }; } //namespace ns3