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

(-)a/src/lte/bindings/modulegen__gcc_ILP32.py (-6 / +6 lines)
 Lines 3832-3851   def register_Ns3LteSpectrumValueHelper_methods(root_module, cls): Link Here 
3832
    cls.add_constructor([])
3832
    cls.add_constructor([])
3833
    ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper::LteSpectrumValueHelper(ns3::LteSpectrumValueHelper const & arg0) [copy constructor]
3833
    ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper::LteSpectrumValueHelper(ns3::LteSpectrumValueHelper const & arg0) [copy constructor]
3834
    cls.add_constructor([param('ns3::LteSpectrumValueHelper const &', 'arg0')])
3834
    cls.add_constructor([param('ns3::LteSpectrumValueHelper const &', 'arg0')])
3835
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateNoisePowerSpectralDensity(uint16_t earfcn, uint8_t bandwdith, double noiseFigure) [member function]
3835
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateNoisePowerSpectralDensity(uint16_t earfcn, uint8_t bandwidth, double noiseFigure) [member function]
3836
    cls.add_method('CreateNoisePowerSpectralDensity', 
3836
    cls.add_method('CreateNoisePowerSpectralDensity', 
3837
                   'ns3::Ptr< ns3::SpectrumValue >', 
3837
                   'ns3::Ptr< ns3::SpectrumValue >', 
3838
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwdith'), param('double', 'noiseFigure')], 
3838
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwidth'), param('double', 'noiseFigure')], 
3839
                   is_static=True)
3839
                   is_static=True)
3840
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateNoisePowerSpectralDensity(double noiseFigure, ns3::Ptr<ns3::SpectrumModel> spectrumModel) [member function]
3840
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateNoisePowerSpectralDensity(double noiseFigure, ns3::Ptr<ns3::SpectrumModel> spectrumModel) [member function]
3841
    cls.add_method('CreateNoisePowerSpectralDensity', 
3841
    cls.add_method('CreateNoisePowerSpectralDensity', 
3842
                   'ns3::Ptr< ns3::SpectrumValue >', 
3842
                   'ns3::Ptr< ns3::SpectrumValue >', 
3843
                   [param('double', 'noiseFigure'), param('ns3::Ptr< ns3::SpectrumModel >', 'spectrumModel')], 
3843
                   [param('double', 'noiseFigure'), param('ns3::Ptr< ns3::SpectrumModel >', 'spectrumModel')], 
3844
                   is_static=True)
3844
                   is_static=True)
3845
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateTxPowerSpectralDensity(uint16_t earfcn, uint8_t bandwdith, double powerTx, std::vector<int, std::allocator<int> > activeRbs) [member function]
3845
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateTxPowerSpectralDensity(uint16_t earfcn, uint8_t bandwidth, double powerTx, std::vector<int, std::allocator<int> > activeRbs) [member function]
3846
    cls.add_method('CreateTxPowerSpectralDensity', 
3846
    cls.add_method('CreateTxPowerSpectralDensity', 
3847
                   'ns3::Ptr< ns3::SpectrumValue >', 
3847
                   'ns3::Ptr< ns3::SpectrumValue >', 
3848
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwdith'), param('double', 'powerTx'), param('std::vector< int >', 'activeRbs')], 
3848
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwidth'), param('double', 'powerTx'), param('std::vector< int >', 'activeRbs')], 
3849
                   is_static=True)
3849
                   is_static=True)
3850
    ## lte-spectrum-value-helper.h (module 'lte'): static double ns3::LteSpectrumValueHelper::GetCarrierFrequency(uint16_t earfcn) [member function]
3850
    ## lte-spectrum-value-helper.h (module 'lte'): static double ns3::LteSpectrumValueHelper::GetCarrierFrequency(uint16_t earfcn) [member function]
3851
    cls.add_method('GetCarrierFrequency', 
3851
    cls.add_method('GetCarrierFrequency', 
 Lines 3862-3871   def register_Ns3LteSpectrumValueHelper_methods(root_module, cls): Link Here 
3862
                   'double', 
3862
                   'double', 
3863
                   [param('uint16_t', 'earfcn')], 
3863
                   [param('uint16_t', 'earfcn')], 
3864
                   is_static=True)
3864
                   is_static=True)
3865
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumModel> ns3::LteSpectrumValueHelper::GetSpectrumModel(uint16_t earfcn, uint8_t bandwdith) [member function]
3865
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumModel> ns3::LteSpectrumValueHelper::GetSpectrumModel(uint16_t earfcn, uint8_t bandwidth) [member function]
3866
    cls.add_method('GetSpectrumModel', 
3866
    cls.add_method('GetSpectrumModel', 
3867
                   'ns3::Ptr< ns3::SpectrumModel >', 
3867
                   'ns3::Ptr< ns3::SpectrumModel >', 
3868
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwdith')], 
3868
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwidth')], 
3869
                   is_static=True)
3869
                   is_static=True)
3870
    ## lte-spectrum-value-helper.h (module 'lte'): static double ns3::LteSpectrumValueHelper::GetUplinkCarrierFrequency(uint16_t earfcn) [member function]
3870
    ## lte-spectrum-value-helper.h (module 'lte'): static double ns3::LteSpectrumValueHelper::GetUplinkCarrierFrequency(uint16_t earfcn) [member function]
3871
    cls.add_method('GetUplinkCarrierFrequency', 
3871
    cls.add_method('GetUplinkCarrierFrequency', 
(-)a/src/lte/bindings/modulegen__gcc_LP64.py (-6 / +6 lines)
 Lines 3832-3851   def register_Ns3LteSpectrumValueHelper_methods(root_module, cls): Link Here 
3832
    cls.add_constructor([])
3832
    cls.add_constructor([])
3833
    ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper::LteSpectrumValueHelper(ns3::LteSpectrumValueHelper const & arg0) [copy constructor]
3833
    ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper::LteSpectrumValueHelper(ns3::LteSpectrumValueHelper const & arg0) [copy constructor]
3834
    cls.add_constructor([param('ns3::LteSpectrumValueHelper const &', 'arg0')])
3834
    cls.add_constructor([param('ns3::LteSpectrumValueHelper const &', 'arg0')])
3835
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateNoisePowerSpectralDensity(uint16_t earfcn, uint8_t bandwdith, double noiseFigure) [member function]
3835
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateNoisePowerSpectralDensity(uint16_t earfcn, uint8_t bandwidth, double noiseFigure) [member function]
3836
    cls.add_method('CreateNoisePowerSpectralDensity', 
3836
    cls.add_method('CreateNoisePowerSpectralDensity', 
3837
                   'ns3::Ptr< ns3::SpectrumValue >', 
3837
                   'ns3::Ptr< ns3::SpectrumValue >', 
3838
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwdith'), param('double', 'noiseFigure')], 
3838
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwidth'), param('double', 'noiseFigure')], 
3839
                   is_static=True)
3839
                   is_static=True)
3840
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateNoisePowerSpectralDensity(double noiseFigure, ns3::Ptr<ns3::SpectrumModel> spectrumModel) [member function]
3840
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateNoisePowerSpectralDensity(double noiseFigure, ns3::Ptr<ns3::SpectrumModel> spectrumModel) [member function]
3841
    cls.add_method('CreateNoisePowerSpectralDensity', 
3841
    cls.add_method('CreateNoisePowerSpectralDensity', 
3842
                   'ns3::Ptr< ns3::SpectrumValue >', 
3842
                   'ns3::Ptr< ns3::SpectrumValue >', 
3843
                   [param('double', 'noiseFigure'), param('ns3::Ptr< ns3::SpectrumModel >', 'spectrumModel')], 
3843
                   [param('double', 'noiseFigure'), param('ns3::Ptr< ns3::SpectrumModel >', 'spectrumModel')], 
3844
                   is_static=True)
3844
                   is_static=True)
3845
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateTxPowerSpectralDensity(uint16_t earfcn, uint8_t bandwdith, double powerTx, std::vector<int, std::allocator<int> > activeRbs) [member function]
3845
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueHelper::CreateTxPowerSpectralDensity(uint16_t earfcn, uint8_t bandwidth, double powerTx, std::vector<int, std::allocator<int> > activeRbs) [member function]
3846
    cls.add_method('CreateTxPowerSpectralDensity', 
3846
    cls.add_method('CreateTxPowerSpectralDensity', 
3847
                   'ns3::Ptr< ns3::SpectrumValue >', 
3847
                   'ns3::Ptr< ns3::SpectrumValue >', 
3848
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwdith'), param('double', 'powerTx'), param('std::vector< int >', 'activeRbs')], 
3848
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwidth'), param('double', 'powerTx'), param('std::vector< int >', 'activeRbs')], 
3849
                   is_static=True)
3849
                   is_static=True)
3850
    ## lte-spectrum-value-helper.h (module 'lte'): static double ns3::LteSpectrumValueHelper::GetCarrierFrequency(uint16_t earfcn) [member function]
3850
    ## lte-spectrum-value-helper.h (module 'lte'): static double ns3::LteSpectrumValueHelper::GetCarrierFrequency(uint16_t earfcn) [member function]
3851
    cls.add_method('GetCarrierFrequency', 
3851
    cls.add_method('GetCarrierFrequency', 
 Lines 3862-3871   def register_Ns3LteSpectrumValueHelper_methods(root_module, cls): Link Here 
3862
                   'double', 
3862
                   'double', 
3863
                   [param('uint16_t', 'earfcn')], 
3863
                   [param('uint16_t', 'earfcn')], 
3864
                   is_static=True)
3864
                   is_static=True)
3865
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumModel> ns3::LteSpectrumValueHelper::GetSpectrumModel(uint16_t earfcn, uint8_t bandwdith) [member function]
3865
    ## lte-spectrum-value-helper.h (module 'lte'): static ns3::Ptr<ns3::SpectrumModel> ns3::LteSpectrumValueHelper::GetSpectrumModel(uint16_t earfcn, uint8_t bandwidth) [member function]
3866
    cls.add_method('GetSpectrumModel', 
3866
    cls.add_method('GetSpectrumModel', 
3867
                   'ns3::Ptr< ns3::SpectrumModel >', 
3867
                   'ns3::Ptr< ns3::SpectrumModel >', 
3868
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwdith')], 
3868
                   [param('uint16_t', 'earfcn'), param('uint8_t', 'bandwidth')], 
3869
                   is_static=True)
3869
                   is_static=True)
3870
    ## lte-spectrum-value-helper.h (module 'lte'): static double ns3::LteSpectrumValueHelper::GetUplinkCarrierFrequency(uint16_t earfcn) [member function]
3870
    ## lte-spectrum-value-helper.h (module 'lte'): static double ns3::LteSpectrumValueHelper::GetUplinkCarrierFrequency(uint16_t earfcn) [member function]
3871
    cls.add_method('GetUplinkCarrierFrequency', 
3871
    cls.add_method('GetUplinkCarrierFrequency', 
(-)a/src/lte/examples/lena-dual-stripe.cc (-2 / +2 lines)
 Lines 281-291   static ns3::GlobalValue g_homeEnbDlEarfcn ("homeEnbDlEarfcn", Link Here 
281
                                           ns3::UintegerValue (100),
281
                                           ns3::UintegerValue (100),
282
                                           ns3::MakeUintegerChecker<uint16_t> ());
282
                                           ns3::MakeUintegerChecker<uint16_t> ());
283
static ns3::GlobalValue g_macroEnbBandwidth ("macroEnbBandwidth", 
283
static ns3::GlobalValue g_macroEnbBandwidth ("macroEnbBandwidth", 
284
                                             "bandwdith [num RBs] used by macro eNBs",  
284
                                             "bandwidth [num RBs] used by macro eNBs",  
285
                                             ns3::UintegerValue (25),
285
                                             ns3::UintegerValue (25),
286
                                             ns3::MakeUintegerChecker<uint16_t> ());
286
                                             ns3::MakeUintegerChecker<uint16_t> ());
287
static ns3::GlobalValue g_homeEnbBandwidth ("homeEnbBandwidth", 
287
static ns3::GlobalValue g_homeEnbBandwidth ("homeEnbBandwidth", 
288
                                            "bandwdith [num RBs] used by HeNBs",  
288
                                            "bandwidth [num RBs] used by HeNBs",  
289
                                            ns3::UintegerValue (25),
289
                                            ns3::UintegerValue (25),
290
                                            ns3::MakeUintegerChecker<uint16_t> ());
290
                                            ns3::MakeUintegerChecker<uint16_t> ());
291
static ns3::GlobalValue g_simTime ("simTime", 
291
static ns3::GlobalValue g_simTime ("simTime", 
(-)a/src/lte/model/lte-enb-rrc.h (-1 / +1 lines)
 Lines 163-169   public: Link Here 
163
  /**
163
  /**
164
   * configure cell-specific parameters
164
   * configure cell-specific parameters
165
   *
165
   *
166
   * \param ulBandwidth the uplink bandwdith in number of RB
166
   * \param ulBandwidth the uplink bandwidth in number of RB
167
   * \param dlBandwidth the downlink bandwidth in number of RB
167
   * \param dlBandwidth the downlink bandwidth in number of RB
168
   */
168
   */
169
  void ConfigureCell (uint8_t ulBandwidth,
169
  void ConfigureCell (uint8_t ulBandwidth,
(-)a/src/lte/model/lte-spectrum-value-helper.h (-3 / +3 lines)
 Lines 91-97   public: Link Here 
91
   * configuration. If such SpectrumModel does not exist, it is
91
   * configuration. If such SpectrumModel does not exist, it is
92
   * created.
92
   * created.
93
   */
93
   */
94
  static Ptr<SpectrumModel> GetSpectrumModel (uint16_t earfcn, uint8_t bandwdith);
94
  static Ptr<SpectrumModel> GetSpectrumModel (uint16_t earfcn, uint8_t bandwidth);
95
95
96
96
97
  /**
97
  /**
 Lines 107-113   public: Link Here 
107
   *
107
   *
108
   * \return a pointer to a newly allocated SpectrumValue representing the TX Power Spectral Density in W/Hz for each Resource Block
108
   * \return a pointer to a newly allocated SpectrumValue representing the TX Power Spectral Density in W/Hz for each Resource Block
109
   */
109
   */
110
  static Ptr<SpectrumValue> CreateTxPowerSpectralDensity (uint16_t earfcn, uint8_t bandwdith, double powerTx, std::vector <int> activeRbs);
110
  static Ptr<SpectrumValue> CreateTxPowerSpectralDensity (uint16_t earfcn, uint8_t bandwidth, double powerTx, std::vector <int> activeRbs);
111
111
112
112
113
  /**
113
  /**
 Lines 121-127   public: Link Here 
121
   *
121
   *
122
   * \return a pointer to a newly allocated SpectrumValue representing the noise Power Spectral Density in W/Hz for each Resource Block
122
   * \return a pointer to a newly allocated SpectrumValue representing the noise Power Spectral Density in W/Hz for each Resource Block
123
   */
123
   */
124
  static Ptr<SpectrumValue> CreateNoisePowerSpectralDensity (uint16_t earfcn, uint8_t bandwdith, double noiseFigure);
124
  static Ptr<SpectrumValue> CreateNoisePowerSpectralDensity (uint16_t earfcn, uint8_t bandwidth, double noiseFigure);
125
125
126
  /**
126
  /**
127
   *  create a SpectrumValue that models the power spectral density of AWGN
127
   *  create a SpectrumValue that models the power spectral density of AWGN
(-)a/src/lte/test/lte-test-link-adaptation.cc (-1 / +1 lines)
111
  };
111
  };
112
  int numOfTests = sizeof (snrEfficiencyMcs) / sizeof (SnrEfficiencyMcs);
112
  int numOfTests = sizeof (snrEfficiencyMcs) / sizeof (SnrEfficiencyMcs);
113
113
114
  double txPowerDbm = 30; // default eNB TX power over whole bandwdith
114
  double txPowerDbm = 30; // default eNB TX power over whole bandwidth
115
  double ktDbm = -174;    // reference LTE noise PSD
115
  double ktDbm = -174;    // reference LTE noise PSD
116
  double noisePowerDbm = ktDbm + 10 * log10 (25 * 180000); // corresponds to kT*bandwidth in linear units
116
  double noisePowerDbm = ktDbm + 10 * log10 (25 * 180000); // corresponds to kT*bandwidth in linear units
117
  double receiverNoiseFigureDb = 9.0; // default UE noise figure
117
  double receiverNoiseFigureDb = 9.0; // default UE noise figure
(-)a/src/lte/test/lte-test-pathloss-model.cc (-1 / +1 lines)
 Lines 138-144   LtePathlossModelTestSuite::LtePathlossModelTestSuite () Link Here 
138
  };
138
  };
139
139
140
140
141
  double txPowerDbm = 30; // default eNB TX power over whole bandwdith
141
  double txPowerDbm = 30; // default eNB TX power over whole bandwidth
142
  double txPowerLin = pow (10, (txPowerDbm - 30)/10);
142
  double txPowerLin = pow (10, (txPowerDbm - 30)/10);
143
  double ktDbm = -174;    // reference LTE noise PSD
143
  double ktDbm = -174;    // reference LTE noise PSD
144
  double noisePowerDbm = ktDbm + 10 * log10 (25 * 180000); // corresponds to kT*bandwidth in linear units
144
  double noisePowerDbm = ktDbm + 10 * log10 (25 * 180000); // corresponds to kT*bandwidth in linear units
(-)a/src/lte/test/reference/lte_link_budget.m (-1 / +1 lines)
5
%% Table 22.7 Reference sensitivity.
5
%% Table 22.7 Reference sensitivity.
6
6
7
f = 2160e6;  % carrier freq Hz, EARFCN = 500 (downlink)
7
f = 2160e6;  % carrier freq Hz, EARFCN = 500 (downlink)
8
nrbs = 25; % tx bandwdith configuration in number of RBs
8
nrbs = 25; % tx bandwidth configuration in number of RBs
9
bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than
9
bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than
10
		    % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1
10
		    % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1
11
kT = -174; % noise PSD in dBm / Hz
11
kT = -174; % noise PSD in dBm / Hz
(-)a/src/lte/test/reference/lte_link_budget_interference.m (-1 / +1 lines)
6
6
7
fdl = 2120e6;  % DL carrier freq Hz, EARFCN = 100
7
fdl = 2120e6;  % DL carrier freq Hz, EARFCN = 100
8
ful = 1930e6;  % UL carrier freq Hz, EARFCN = 18100 
8
ful = 1930e6;  % UL carrier freq Hz, EARFCN = 18100 
9
nrbs = 25; % tx bandwdith configuration in number of RBs
9
nrbs = 25; % tx bandwidth configuration in number of RBs
10
bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than
10
bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than
11
		    % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1
11
		    % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1
12
kT = -174; % noise PSD in dBm / Hz
12
kT = -174; % noise PSD in dBm / Hz
(-)a/src/lte/test/test-lte-antenna.cc (-3 / +2 lines)
 Lines 153-160   LteEnbAntennaTestCase::DoRun (void) Link Here 
153
  Simulator::Run ();
153
  Simulator::Run ();
154
154
155
155
156
  const double enbTxPowerDbm = 30; // default eNB TX power over whole bandwdith
156
  const double enbTxPowerDbm = 30; // default eNB TX power over whole bandwidth
157
  const double ueTxPowerDbm  = 10; // default UE TX power over whole bandwdith
157
  const double ueTxPowerDbm  = 10; // default UE TX power over whole bandwidth
158
  const double ktDbm = -174;    // reference LTE noise PSD
158
  const double ktDbm = -174;    // reference LTE noise PSD
159
  const double noisePowerDbm = ktDbm + 10 * log10 (25 * 180000); // corresponds to kT*bandwidth in linear units
159
  const double noisePowerDbm = ktDbm + 10 * log10 (25 * 180000); // corresponds to kT*bandwidth in linear units
160
  const double ueNoiseFigureDb = 9.0; // default UE noise figure
160
  const double ueNoiseFigureDb = 9.0; // default UE noise figure
161
- 

Return to bug 1507