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

(-)a/src/lte/model/lte-spectrum-value-helper.cc (-1 / +1 lines)
 Lines 231-237   operator << (std::ostream& os, const std::vector<int>& v) Link Here 
231 
Ptr<SpectrumValue>
231 
Ptr<SpectrumValue>
232 
LteSpectrumValueHelper::CreateTxPowerSpectralDensity (uint16_t earfcn, uint8_t txBandwidthConfiguration, double powerTx, std::vector <int> activeRbs)
 232 
LteSpectrumValueHelper::CreateTxPowerSpectralDensity (uint16_t earfcn, uint8_t txBandwidthConfiguration, double powerTx, std::vector <int> activeRbs)
233 
{
 233 
{
234 
  NS_LOG_FUNCTION (earfcn << (uint16_t) txBandwidthConfiguration << powerTx << activeRbs);
 234 
  NS_LOG_FUNCTION (earfcn << (uint16_t) txBandwidthConfiguration << powerTx << &activeRbs);
235 

          235
          

        

        

          236
          
  Ptr<SpectrumModel> model = GetSpectrumModel (earfcn, txBandwidthConfiguration);

          236
          
  Ptr<SpectrumModel> model = GetSpectrumModel (earfcn, txBandwidthConfiguration);

        

        

          237
          
  Ptr<SpectrumValue> txPsd = Create <SpectrumValue> (model);

          237
          
  Ptr<SpectrumValue> txPsd = Create <SpectrumValue> (model);

        



(-)a/src/lte/test/lte-test-downlink-sinr.cc
      (-3 / +9 lines)




  

    
  

        

          145
          
  int numOfPkts = 10;

          145
          
  int numOfPkts = 10;

        

        

          146
          

          146
          

        

        

          147
          
  // Packet bursts

          147
          
  // Packet bursts

        

          
            

              148
              
  Ptr<PacketBurst> packetBursts[numOfPbs];


              148
              
  Ptr<PacketBurst> *packetBursts = new Ptr<PacketBurst>[numOfPbs];

            

        

          149
          

          149
          

        

        

          150
          
  // Packets

          150
          
  // Packets

        

          
            

              151
              
  Ptr<Packet> pkt[numOfPbs][numOfPkts];


              151
              
  Ptr<Packet> **pkt = new Ptr<Packet>* [numOfPbs];

            

            

              
              

              152
              
  for (int i = 0; i < numOfPbs; i++) pkt[i] = new Ptr<Packet> [numOfPkts];

            

        

          152
          

          153
          

        

        

          153
          
  // Phy tags

          154
          
  // Phy tags

        

          
            

              154
              
  LtePhyTag pktTag[numOfPbs];


              155
              
  LtePhyTag *pktTag = new LtePhyTag [numOfPbs];

            

        

          155
          

          156
          

        

        

          156
          
  /**

          157
          
  /**

        

        

          157
          
   * Build packet burst

          158
          
   * Build packet burst

        

  

    
  

        

          266
          
  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL(calculatedSinr, *m_sinr, 0.0000001, "Wrong SINR !");

          267
          
  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL(calculatedSinr, *m_sinr, 0.0000001, "Wrong SINR !");

        

        

          267
          
  dlPhy->Dispose ();

          268
          
  dlPhy->Dispose ();

        

        

          268
          
  Simulator::Destroy ();

          269
          
  Simulator::Destroy ();

        

            

              
              
              270
              

            

            

              271
              
  delete [] pktTag;

            

            

              272
              
  for (int i = 0; i < numOfPbs; i++) delete [] pkt[i];

            

            

              273
              
  delete [] pkt;

            

            

              274
              
  delete [] packetBursts;

            

        

          269
          
}

          275
          
}

        

        

          270
          

          276
          

        

        

          271
          
} // namespace ns3

          277
          
} // namespace ns3

        



(-)a/src/lte/test/lte-test-uplink-sinr.cc
      (-7 / +10 lines)




  

    
  

        

          154
          
  int numOfPkts = 10;

          154
          
  int numOfPkts = 10;

        

        

          155
          

          155
          

        

        

          156
          
  // Packet bursts

          156
          
  // Packet bursts

        

          
            

              157
              
  Ptr<PacketBurst> packetBursts[numOfPbs];


              157
              
  Ptr<PacketBurst> *packetBursts = new Ptr<PacketBurst>[numOfPbs];

            

        

          158
          

          158
          

        

        

          159
          
  // Packets

          159
          
  // Packets

        

          
            

              160
              
  Ptr<Packet> pkt[numOfPbs][numOfPkts];


              160
              
  Ptr<Packet> **pkt = new Ptr<Packet>* [numOfPbs];

            

            

              
              

              161
              
  for (int i = 0; i < numOfPbs; i++) pkt[i] = new Ptr<Packet> [numOfPkts];

            

        

          161
          

          162
          

        

        

          162
          
  // Phy tags

          163
          
  // Phy tags

        

          
            

              163
              
  LtePhyTag pktTag[numOfPbs];


              164
              
  LtePhyTag *pktTag = new LtePhyTag [numOfPbs];

            

            

              164
              


              
              
            

        

          165
          

          165
          

        

        

          166
          
  /**

          166
          
  /**

        

        

          167
          
   * Build packet burst (Data and interference)

          167
          
   * Build packet burst (Data and interference)

        

  

    
  

        

          304
          
  

          304
          
  

        

        

          305
          
  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL (calculatedSinr, *m_sinr, 0.0000001, "Wrong SINR !");

          305
          
  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL (calculatedSinr, *m_sinr, 0.0000001, "Wrong SINR !");

        

        

          306
          
  ulPhy->Dispose ();

          306
          
  ulPhy->Dispose ();

        

          
            

              307
              
  Simulator::Destroy ();


              307
              
  Simulator::Destroy ();  

            

            

              308
              
  


              308
              

            

            

              
              

              309
              
  delete [] pktTag;

            

            


              310
              
  for (int i = 0; i < numOfPbs; i++) delete [] pkt[i];

            

            


              311
              
  delete [] pkt;

            

            


              312
              
  delete [] packetBursts;

            

        

          309
          
}

          313
          
}

        

        

          310
          

          314
          

        

        

          311
          
} // namespace ns3

          315
          
} // namespace ns3

        

            

              312
              
- 

              
              
            






  

  Return to bug 1472