Attachment #2534 for bug #2467

View | Details | Raw Unified | Return to bug 2467
Collapse All | Expand All




           ++txInfoIterator)
        {
          Ptr<const SpectrumModel> txSpectrumModel = txInfoIterator->second.m_txSpectrumModel;
          SpectrumModelUid_t txSpectrumModelUid = txSpectrumModel->GetUid ();

          if (rxSpectrumModelUid != txSpectrumModelUid && !txSpectrumModel->IsOrthogonal (*rxSpectrumModel))
            {
              NS_LOG_LOGIC ("Creating converter between SpectrumModelUid " << txSpectrumModel->GetUid () << " and " << rxSpectrumModelUid);
              SpectrumConverter converter (txSpectrumModel, rxSpectrumModel);
              std::pair<SpectrumConverterMap_t::iterator, bool> ret2;
              ret2 = txInfoIterator->second.m_spectrumConverterMap.insert (std::make_pair (rxSpectrumModelUid, converter));
              NS_ASSERT (ret2.second);
            }
        }
    }
  else

          Ptr<const SpectrumModel> rxSpectrumModel = rxInfoIterator->second.m_rxSpectrumModel;
          SpectrumModelUid_t rxSpectrumModelUid = rxSpectrumModel->GetUid ();

          if (rxSpectrumModelUid != txSpectrumModelUid && !txSpectrumModel->IsOrthogonal (*rxSpectrumModel))
            {
              NS_LOG_LOGIC ("Creating converter between SpectrumModelUid " << txSpectrumModelUid << " and " << rxSpectrumModelUid);

              SpectrumConverter converter (txSpectrumModel, rxSpectrumModel);
              std::pair<SpectrumConverterMap_t::iterator, bool> ret2;

        {
          NS_LOG_LOGIC (" converting txPowerSpectrum SpectrumModelUids" << txSpectrumModelUid << " --> " << rxSpectrumModelUid);
          SpectrumConverterMap_t::const_iterator rxConverterIterator = txInfoIteratorerator->second.m_spectrumConverterMap.find (rxSpectrumModelUid);
          if (rxConverterIterator == txInfoIteratorerator->second.m_spectrumConverterMap.end ())
            {
              // No converter means TX SpectrumModel is orthogonal RX SpectrumModel
              continue;
            }
          convertedTxPowerSpectrum = rxConverterIterator->second.Convert (txParams->psd);
        }





  return m_uid;
}

bool
SpectrumModel::IsOrthogonal (const SpectrumModel &other) const
{
  for (Bands::const_iterator myIt = Begin ();
       myIt != End ();
       ++myIt)
    {
      for (Bands::const_iterator otherIt = other.Begin ();
           otherIt != other.End ();
           ++otherIt)
        {
          if (std::max (myIt->fl, otherIt->fl) < std::min (myIt->fh, otherIt->fh))
            {
              return false;
            }
        }
    }
  return true;
}


} // namespace ns3

(-)a/src/spectrum/model/spectrum-model.h (+8 lines)

Lines 120-125	Link Here

120

*/

120

*/

121

  Bands::const_iterator End () const;

121

  Bands::const_iterator End () const;

122

123

/**

124

   * Check if another SpectrumModels has bands orthogonal to our bands.

125

126

   * \param other another SpectrumModel

127

   * \returns true if bands are orthogonal

128

*/

129

  bool IsOrthogonal (const SpectrumModel &other) const;

130

123

private:

131

private:

124

  Bands m_bands;         //!< Actual definition of frequency bands within this SpectrumModel

132

  Bands m_bands;         //!< Actual definition of frequency bands within this SpectrumModel

125

  SpectrumModelUid_t m_uid;        //!< unique id for a given set of frequencies

133

  SpectrumModelUid_t m_uid;        //!< unique id for a given set of frequencies

Return to bug 2467