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

(-)a/examples/wireless/ofdm-validation.cc (-1 / +1 lines)
 Lines 24-30    Link Here 
24 

          24
          

        

        

          25
          
#include <fstream>

          25
          
#include <fstream>

        

        

          26
          
#include <vector>

          26
          
#include <vector>

        

          
            

              27
              
#include <math.h>


              27
              
#include <cmath>

            

        

          28
          

          28
          

        

        

          29
          
using namespace ns3;

          29
          
using namespace ns3;

        

        

          30
          

          30
          

        



(-)a/src/energy/model/rv-battery-model.cc
      (-1 / +1 lines)




  

    

    

       Lines 24-30
       
    
  Link Here 
    

  

        

          24
          
#include "ns3/double.h"

          24
          
#include "ns3/double.h"

        

        

          25
          
#include "ns3/trace-source-accessor.h"

          25
          
#include "ns3/trace-source-accessor.h"

        

        

          26
          
#include "ns3/simulator.h"

          26
          
#include "ns3/simulator.h"

        

          
            

              27
              
#include <math.h>


              27
              
#include <cmath>

            

        

          28
          

          28
          

        

        

          29
          
NS_LOG_COMPONENT_DEFINE ("RvBatteryModel");

          29
          
NS_LOG_COMPONENT_DEFINE ("RvBatteryModel");

        

        

          30
          

          30
          

        



(-)a/src/energy/test/basic-energy-model-test.cc
      (-1 / +1 lines)




  

    

    

       Lines 33-39
       
    
  Link Here 
    

  

        

          33
          
#include "ns3/string.h"

          33
          
#include "ns3/string.h"

        

        

          34
          
#include "ns3/yans-wifi-helper.h"

          34
          
#include "ns3/yans-wifi-helper.h"

        

        

          35
          
#include "ns3/nqos-wifi-mac-helper.h"

          35
          
#include "ns3/nqos-wifi-mac-helper.h"

        

          
            

              36
              
#include <math.h>


              36
              
#include <cmath>

            

        

          37
          

          37
          

        

        

          38
          
using namespace ns3;

          38
          
using namespace ns3;

        

        

          39
          

          39
          

        



(-)a/src/energy/test/rv-battery-model-test.cc
      (-1 / +1 lines)




  

    

    

       Lines 33-39
       
    
  Link Here 
    

  

        

          33
          
#include "ns3/string.h"

          33
          
#include "ns3/string.h"

        

        

          34
          
#include "ns3/yans-wifi-helper.h"

          34
          
#include "ns3/yans-wifi-helper.h"

        

        

          35
          
#include "ns3/nqos-wifi-mac-helper.h"

          35
          
#include "ns3/nqos-wifi-mac-helper.h"

        

          
            

              36
              
#include <math.h>


              36
              
#include <cmath>

            

        

          37
          

          37
          

        

        

          38
          
using namespace ns3;

          38
          
using namespace ns3;

        

        

          39
          

          39
          

        



(-)a/src/flow-monitor/model/histogram.cc
      (-1 / +1 lines)




  

    

    

       Lines 18-24
       
    
  Link Here 
    

  

        

          18
          
// Author: Pedro Fortuna  <pedro.fortuna@inescporto.pt> <pedro.fortuna@gmail.com>

          18
          
// Author: Pedro Fortuna  <pedro.fortuna@inescporto.pt> <pedro.fortuna@gmail.com>

        

        

          19
          
//

          19
          
//

        

        

          20
          

          20
          

        

          
            

              21
              
#include <math.h>


              21
              
#include <cmath>

            

        

          22
          
#include "histogram.h"

          22
          
#include "histogram.h"

        

        

          23
          
#include "ns3/simulator.h"

          23
          
#include "ns3/simulator.h"

        

        

          24
          
#include "ns3/log.h"

          24
          
#include "ns3/log.h"

        



(-)a/src/lte/model/amc-module.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          

          21
          

        

        

          22
          
#include "amc-module.h"

          22
          
#include "amc-module.h"

        

        

          23
          
#include <ns3/log.h>

          23
          
#include <ns3/log.h>

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          

          25
          

        

        

          26
          
#ifdef __FreeBSD__

          26
          
#ifdef __FreeBSD__

        

        

          27
          
#define log2(x) (log(x)/M_LN2)

          27
          
#define log2(x) (log(x)/M_LN2)

        



(-)a/src/lte/model/enb-lte-spectrum-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#include <ns3/waveform-generator.h>

          21
          
#include <ns3/waveform-generator.h>

        

        

          22
          
#include <ns3/object-factory.h>

          22
          
#include <ns3/object-factory.h>

        

        

          23
          
#include <ns3/log.h>

          23
          
#include <ns3/log.h>

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          
#include <ns3/simulator.h>

          25
          
#include <ns3/simulator.h>

        

        

          26
          
#include <ns3/trace-source-accessor.h>

          26
          
#include <ns3/trace-source-accessor.h>

        

        

          27
          
#include "ns3/spectrum-error-model.h"

          27
          
#include "ns3/spectrum-error-model.h"

        



(-)a/src/lte/model/enb-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#include <ns3/waveform-generator.h>

          21
          
#include <ns3/waveform-generator.h>

        

        

          22
          
#include <ns3/object-factory.h>

          22
          
#include <ns3/object-factory.h>

        

        

          23
          
#include <ns3/log.h>

          23
          
#include <ns3/log.h>

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          
#include <ns3/simulator.h>

          25
          
#include <ns3/simulator.h>

        

        

          26
          
#include "ns3/spectrum-error-model.h"

          26
          
#include "ns3/spectrum-error-model.h"

        

        

          27
          
#include "enb-phy.h"

          27
          
#include "enb-phy.h"

        



(-)a/src/lte/model/lte-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#include <ns3/waveform-generator.h>

          21
          
#include <ns3/waveform-generator.h>

        

        

          22
          
#include <ns3/object-factory.h>

          22
          
#include <ns3/object-factory.h>

        

        

          23
          
#include <ns3/log.h>

          23
          
#include <ns3/log.h>

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          
#include <ns3/simulator.h>

          25
          
#include <ns3/simulator.h>

        

        

          26
          
#include "ns3/spectrum-error-model.h"

          26
          
#include "ns3/spectrum-error-model.h"

        

        

          27
          
#include "lte-phy.h"

          27
          
#include "lte-phy.h"

        



(-)a/src/lte/model/lte-spectrum-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 23-29
       
    
  Link Here 
    

  

        

          23
          
#include <ns3/waveform-generator.h>

          23
          
#include <ns3/waveform-generator.h>

        

        

          24
          
#include <ns3/object-factory.h>

          24
          
#include <ns3/object-factory.h>

        

        

          25
          
#include <ns3/log.h>

          25
          
#include <ns3/log.h>

        

          
            

              26
              
#include <math.h>


              26
              
#include <cmath>

            

        

          27
          
#include <ns3/simulator.h>

          27
          
#include <ns3/simulator.h>

        

        

          28
          
#include <ns3/trace-source-accessor.h>

          28
          
#include <ns3/trace-source-accessor.h>

        

        

          29
          
#include "ns3/spectrum-error-model.h"

          29
          
#include "ns3/spectrum-error-model.h"

        



(-)a/src/lte/model/ue-lte-spectrum-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#include <ns3/waveform-generator.h>

          21
          
#include <ns3/waveform-generator.h>

        

        

          22
          
#include <ns3/object-factory.h>

          22
          
#include <ns3/object-factory.h>

        

        

          23
          
#include <ns3/log.h>

          23
          
#include <ns3/log.h>

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          
#include <ns3/simulator.h>

          25
          
#include <ns3/simulator.h>

        

        

          26
          
#include <ns3/trace-source-accessor.h>

          26
          
#include <ns3/trace-source-accessor.h>

        

        

          27
          
#include "ns3/spectrum-error-model.h"

          27
          
#include "ns3/spectrum-error-model.h"

        



(-)a/src/lte/model/ue-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#include <ns3/waveform-generator.h>

          21
          
#include <ns3/waveform-generator.h>

        

        

          22
          
#include <ns3/object-factory.h>

          22
          
#include <ns3/object-factory.h>

        

        

          23
          
#include <ns3/log.h>

          23
          
#include <ns3/log.h>

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          
#include <ns3/simulator.h>

          25
          
#include <ns3/simulator.h>

        

        

          26
          
#include "ns3/spectrum-error-model.h"

          26
          
#include "ns3/spectrum-error-model.h"

        

        

          27
          
#include "ue-phy.h"

          27
          
#include "ue-phy.h"

        



(-)a/src/mobility/model/mobility-model.cc
      (-1 / +1 lines)




  

    

    

       Lines 18-24
       
    
  Link Here 
    

  

        

          18
          
 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

          18
          
 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

        

        

          19
          
 */

          19
          
 */

        

        

          20
          

          20
          

        

          
            

              21
              
#include <math.h>


              21
              
#include <cmath>

            

        

          22
          

          22
          

        

        

          23
          
#include "mobility-model.h"

          23
          
#include "mobility-model.h"

        

        

          24
          
#include "ns3/trace-source-accessor.h"

          24
          
#include "ns3/trace-source-accessor.h"

        



(-)a/src/mpi/model/distributed-simulator-impl.cc
      (-2 lines)




  

    

    

       Lines 29-36
       
    
  Link Here 
    

  

        

          29
          
#include "ns3/assert.h"

          29
          
#include "ns3/assert.h"

        

        

          30
          
#include "ns3/log.h"

          30
          
#include "ns3/log.h"

        

        

          31
          

          31
          

        

            

              32
              
#include <math.h>

              
              
            

            

              33
              

            

        

          34
          
#ifdef NS3_MPI

          32
          
#ifdef NS3_MPI

        

        

          35
          
#include <mpi.h>

          33
          
#include <mpi.h>

        

        

          36
          
#endif

          34
          
#endif

        



(-)a/src/network/utils/error-model.cc
      (-1 / +1 lines)




  

    

    

       Lines 19-25
       
    
  Link Here 
    

  

        

          19
          
 * This code has been ported from ns-2 (queue/errmodel.{cc,h}

          19
          
 * This code has been ported from ns-2 (queue/errmodel.{cc,h}

        

        

          20
          
 */

          20
          
 */

        

        

          21
          

          21
          

        

          
            

              22
              
#include <math.h>


              22
              
#include <cmath>

            

        

          23
          

          23
          

        

        

          24
          
#include "error-model.h"

          24
          
#include "error-model.h"

        

        

          25
          

          25
          

        



(-)a/src/network/utils/radiotap-header.cc
      (-1 / +1 lines)




  

    

    

       Lines 19-25
       
    
  Link Here 
    

  

        

          19
          
 */

          19
          
 */

        

        

          20
          

          20
          

        

        

          21
          
#include <iomanip>

          21
          
#include <iomanip>

        

          
            

              22
              
#include <math.h>


              22
              
#include <cmath>

            

        

          23
          
#include "ns3/log.h"

          23
          
#include "ns3/log.h"

        

        

          24
          
#include "radiotap-header.h"

          24
          
#include "radiotap-header.h"

        

        

          25
          

          25
          

        



(-)a/src/propagation/model/cost231-propagation-loss-model.cc
      (-1 / +1 lines)




  

    

    

       Lines 24-30
       
    
  Link Here 
    

  

        

          24
          
#include "ns3/mobility-model.h"

          24
          
#include "ns3/mobility-model.h"

        

        

          25
          
#include "ns3/double.h"

          25
          
#include "ns3/double.h"

        

        

          26
          
#include "ns3/pointer.h"

          26
          
#include "ns3/pointer.h"

        

          
            

              27
              
#include <math.h>


              27
              
#include <cmath>

            

        

          28
          
#include "cost231-propagation-loss-model.h"

          28
          
#include "cost231-propagation-loss-model.h"

        

        

          29
          

          29
          

        

        

          30
          
namespace ns3 {

          30
          
namespace ns3 {

        



(-)a/src/propagation/model/jakes-propagation-loss-model.cc
      (-1 / +1 lines)




  

    

    

       Lines 25-31
       
    
  Link Here 
    

  

        

          25
          
#include "ns3/mobility-model.h"

          25
          
#include "ns3/mobility-model.h"

        

        

          26
          
#include "ns3/log.h"

          26
          
#include "ns3/log.h"

        

        

          27
          
#include "jakes-propagation-loss-model.h"

          27
          
#include "jakes-propagation-loss-model.h"

        

          
            

              28
              
#include <math.h>


              28
              
#include <cmath>

            

        

          29
          

          29
          

        

        

          30
          
NS_LOG_COMPONENT_DEFINE ("Jakes");

          30
          
NS_LOG_COMPONENT_DEFINE ("Jakes");

        

        

          31
          

          31
          

        



(-)a/src/propagation/model/propagation-loss-model.cc
      (-1 / +1 lines)




  

    

    

       Lines 26-32
       
    
  Link Here 
    

  

        

          26
          
#include "ns3/mobility-model.h"

          26
          
#include "ns3/mobility-model.h"

        

        

          27
          
#include "ns3/boolean.h"

          27
          
#include "ns3/boolean.h"

        

        

          28
          
#include "ns3/double.h"

          28
          
#include "ns3/double.h"

        

          
            

              29
              
#include <math.h>


              29
              
#include <cmath>

            

        

          30
          

          30
          

        

        

          31
          
NS_LOG_COMPONENT_DEFINE ("PropagationLossModel");

          31
          
NS_LOG_COMPONENT_DEFINE ("PropagationLossModel");

        

        

          32
          

          32
          

        



(-)a/src/spectrum/model/constant-spectrum-propagation-loss.cc
      (-1 / +1 lines)




  

    

    

       Lines 18-24
       
    
  Link Here 
    

  

        

          18
          
 * Author: Manuel Requena <manuel.requena@cttc.es>

          18
          
 * Author: Manuel Requena <manuel.requena@cttc.es>

        

        

          19
          
 */

          19
          
 */

        

        

          20
          

          20
          

        

          
            

              21
              
#include <math.h>


              21
              
#include <cmath>

            

        

          22
          

          22
          

        

        

          23
          
#include "ns3/log.h"

          23
          
#include "ns3/log.h"

        

        

          24
          

          24
          

        



(-)a/src/spectrum/model/friis-spectrum-propagation-loss.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          

          21
          

        

        

          22
          
#include <ns3/mobility-model.h>

          22
          
#include <ns3/mobility-model.h>

        

        

          23
          
#include <ns3/friis-spectrum-propagation-loss.h>

          23
          
#include <ns3/friis-spectrum-propagation-loss.h>

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          

          25
          

        

        

          26
          

          26
          

        

        

          27
          

          27
          

        



(-)a/src/spectrum/model/half-duplex-ideal-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#include <ns3/waveform-generator.h>

          21
          
#include <ns3/waveform-generator.h>

        

        

          22
          
#include <ns3/object-factory.h>

          22
          
#include <ns3/object-factory.h>

        

        

          23
          
#include <ns3/log.h>

          23
          
#include <ns3/log.h>

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          
#include <ns3/simulator.h>

          25
          
#include <ns3/simulator.h>

        

        

          26
          
#include <ns3/trace-source-accessor.h>

          26
          
#include <ns3/trace-source-accessor.h>

        

        

          27
          
#include <ns3/packet-burst.h>

          27
          
#include <ns3/packet-burst.h>

        



(-)a/src/spectrum/model/spectrum-value.cc
      (-1 / +1 lines)




  

    

    

       Lines 20-26
       
    
  Link Here 
    

  

        

          20
          
 */

          20
          
 */

        

        

          21
          

          21
          

        

        

          22
          
#include <ns3/spectrum-value.h>

          22
          
#include <ns3/spectrum-value.h>

        

          
            

              23
              
#include <math.h>


              23
              
#include <cmath>

            

        

          24
          
#include <ns3/log.h>

          24
          
#include <ns3/log.h>

        

        

          25
          

          25
          

        

        

          26
          
#ifdef __FreeBSD__

          26
          
#ifdef __FreeBSD__

        



(-)a/src/spectrum/test/spectrum-value-test.cc
      (-1 / +1 lines)




  

    

    

       Lines 24-30
       
    
  Link Here 
    

  

        

          24
          
#include <ns3/log.h>

          24
          
#include <ns3/log.h>

        

        

          25
          
#include <ns3/test.h>

          25
          
#include <ns3/test.h>

        

        

          26
          
#include <iostream>

          26
          
#include <iostream>

        

          
            

              27
              
#include <math.h>


              27
              
#include <cmath>

            

        

          28
          

          28
          

        

        

          29
          
#include "spectrum-test.h"

          29
          
#include "spectrum-test.h"

        

        

          30
          

          30
          

        



(-)a/src/stats/test/basic-data-calculators-test-suite.cc
      (-1 / +1 lines)




  

    

    

       Lines 18-24
       
    
  Link Here 
    

  

        

          18
          
 * Author: Mitch Watrous (watrous@u.washington.edu)

          18
          
 * Author: Mitch Watrous (watrous@u.washington.edu)

        

        

          19
          
 */

          19
          
 */

        

        

          20
          

          20
          

        

          
            

              21
              
#include <math.h>


              21
              
#include <cmath>

            

        

          22
          

          22
          

        

        

          23
          
#include "ns3/test.h"

          23
          
#include "ns3/test.h"

        

        

          24
          
#include "ns3/basic-data-calculators.h"

          24
          
#include "ns3/basic-data-calculators.h"

        



(-)a/src/tools/test/average-test-suite.cc
      (-1 / +1 lines)




  

    

    

       Lines 18-24
       
    
  Link Here 
    

  

        

          18
          
 * Author: Mitch Watrous (watrous@u.washington.edu)

          18
          
 * Author: Mitch Watrous (watrous@u.washington.edu)

        

        

          19
          
 */

          19
          
 */

        

        

          20
          

          20
          

        

          
            

              21
              
#include <math.h>


              21
              
#include <cmath>

            

        

          22
          

          22
          

        

        

          23
          
#include "ns3/test.h"

          23
          
#include "ns3/test.h"

        

        

          24
          
#include "ns3/average.h"

          24
          
#include "ns3/average.h"

        



(-)a/src/wifi/model/dcf-manager.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#include "ns3/assert.h"

          21
          
#include "ns3/assert.h"

        

        

          22
          
#include "ns3/log.h"

          22
          
#include "ns3/log.h"

        

        

          23
          
#include "ns3/simulator.h"

          23
          
#include "ns3/simulator.h"

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          

          25
          

        

        

          26
          
#include "dcf-manager.h"

          26
          
#include "dcf-manager.h"

        

        

          27
          
#include "wifi-phy.h"

          27
          
#include "wifi-phy.h"

        



(-)a/src/wifi/model/dsss-error-rate-model.cc
      (-2 / +2 lines)




  

    

    

       Lines 19-25
       
    
  Link Here 
    

  

        

          19
          
 */

          19
          
 */

        

        

          20
          
#include "ns3/log.h"

          20
          
#include "ns3/log.h"

        

        

          21
          
#include "dsss-error-rate-model.h"

          21
          
#include "dsss-error-rate-model.h"

        

          
            

              22
              
#include <math.h>


              22
              
#include <cmath>

            

        

          23
          

          23
          

        

        

          24
          
NS_LOG_COMPONENT_DEFINE ("DsssErrorRateModel");

          24
          
NS_LOG_COMPONENT_DEFINE ("DsssErrorRateModel");

        

        

          25
          

          25
          

        

  

    

    

       Lines 161-167
       
    
  Link Here 
    

  

        

          161
          

          161
          

        

        

          162
          
double DsssErrorRateModel::SymbolErrorProb256Cck (double e1)

          162
          
double DsssErrorRateModel::SymbolErrorProb256Cck (double e1)

        

        

          163
          
{

          163
          
{

        

          
            

              164
              
  return 1.0 - pow (1.0 - SymbolErrorProb16Cck (e1 / 2.0), 2.0);


              164
              
  return 1.0 - pow (1.0 - SymbolErrorProb16Cck (e1 / 2.0), 2);

            

        

          165
          
}

          165
          
}

        

        

          166
          

          166
          

        

        

          167
          
#endif

          167
          
#endif

        



(-)a/src/wifi/model/ideal-wifi-manager.cc
      (-1 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#include "wifi-phy.h"

          21
          
#include "wifi-phy.h"

        

        

          22
          
#include "ns3/assert.h"

          22
          
#include "ns3/assert.h"

        

        

          23
          
#include "ns3/double.h"

          23
          
#include "ns3/double.h"

        

          
            

              24
              
#include <math.h>


              24
              
#include <cmath>

            

        

          25
          

          25
          

        

        

          26
          
namespace ns3 {

          26
          
namespace ns3 {

        

        

          27
          

          27
          

        



(-)a/src/wifi/model/nist-error-rate-model.cc
      (-31 / +31 lines)




  

    

    

       Lines 74-80
       
    
  Link Here 
    

  

        

          74
          
  return ber;

          74
          
  return ber;

        

        

          75
          
}

          75
          
}

        

        

          76
          
double

          76
          
double

        

          
            

              77
              
NistErrorRateModel::GetFecBpskBer (double snr, double nbits,


              77
              
NistErrorRateModel::GetFecBpskBer (double snr, uint32_t nbits,

            

        

          78
          
                                   uint32_t bValue) const

          78
          
                                   uint32_t bValue) const

        

        

          79
          
{

          79
          
{

        

        

          80
          
  double ber = GetBpskBer (snr);

          80
          
  double ber = GetBpskBer (snr);

        

  

    

    

       Lines 88-94
       
    
  Link Here 
    

  

        

          88
          
  return pms;

          88
          
  return pms;

        

        

          89
          
}

          89
          
}

        

        

          90
          
double

          90
          
double

        

          
            

              91
              
NistErrorRateModel::GetFecQpskBer (double snr, double nbits,


              91
              
NistErrorRateModel::GetFecQpskBer (double snr, uint32_t nbits,

            

        

          92
          
                                   uint32_t bValue) const

          92
          
                                   uint32_t bValue) const

        

        

          93
          
{

          93
          
{

        

        

          94
          
  double ber = GetQpskBer (snr);

          94
          
  double ber = GetQpskBer (snr);

        

  

    

    

       Lines 109-155
       
    
  Link Here 
    

  

        

          109
          
  if (bValue == 1)

          109
          
  if (bValue == 1)

        

        

          110
          
    {

          110
          
    {

        

        

          111
          
      // code rate 1/2, use table 3.1.1

          111
          
      // code rate 1/2, use table 3.1.1

        

          
            

              112
              
      pe = 0.5 * ( 36.0 * pow (D, 10.0)


              112
              
      pe = 0.5 * ( 36.0 * pow (D, 10)

            

            

              113
              
                   + 211.0 * pow (D, 12.0)


              113
              
                   + 211.0 * pow (D, 12)

            

            

              114
              
                   + 1404.0 * pow (D, 14.0)


              114
              
                   + 1404.0 * pow (D, 14)

            

            

              115
              
                   + 11633.0 * pow (D, 16.0)


              115
              
                   + 11633.0 * pow (D, 16)

            

            

              116
              
                   + 77433.0 * pow (D, 18.0)


              116
              
                   + 77433.0 * pow (D, 18)

            

            

              117
              
                   + 502690.0 * pow (D, 20.0)


              117
              
                   + 502690.0 * pow (D, 20)

            

            

              118
              
                   + 3322763.0 * pow (D, 22.0)


              118
              
                   + 3322763.0 * pow (D, 22)

            

            

              119
              
                   + 21292910.0 * pow (D, 24.0)


              119
              
                   + 21292910.0 * pow (D, 24)

            

            

              120
              
                   + 134365911.0 * pow (D, 26.0)


              120
              
                   + 134365911.0 * pow (D, 26)

            

        

          121
          
                   );

          121
          
                   );

        

        

          122
          
    }

          122
          
    }

        

        

          123
          
  else if (bValue == 2)

          123
          
  else if (bValue == 2)

        

        

          124
          
    {

          124
          
    {

        

        

          125
          
      // code rate 2/3, use table 3.1.2

          125
          
      // code rate 2/3, use table 3.1.2

        

        

          126
          
      pe = 1.0 / (2.0 * bValue) *

          126
          
      pe = 1.0 / (2.0 * bValue) *

        

          
            

              127
              
        ( 3.0 * pow (D, 6.0)


              127
              
        ( 3.0 * pow (D, 6)

            

            

              128
              
          + 70.0 * pow (D, 7.0)


              128
              
          + 70.0 * pow (D, 7)

            

            

              129
              
          + 285.0 * pow (D, 8.0)


              129
              
          + 285.0 * pow (D, 8)

            

            

              130
              
          + 1276.0 * pow (D, 9.0)


              130
              
          + 1276.0 * pow (D, 9)

            

            

              131
              
          + 6160.0 * pow (D, 10.0)


              131
              
          + 6160.0 * pow (D, 10)

            

            

              132
              
          + 27128.0 * pow (D, 11.0)


              132
              
          + 27128.0 * pow (D, 11)

            

            

              133
              
          + 117019.0 * pow (D, 12.0)


              133
              
          + 117019.0 * pow (D, 12)

            

            

              134
              
          + 498860.0 * pow (D, 13.0)


              134
              
          + 498860.0 * pow (D, 13)

            

            

              135
              
          + 2103891.0 * pow (D, 14.0)


              135
              
          + 2103891.0 * pow (D, 14)

            

            

              136
              
          + 8784123.0 * pow (D, 15.0)


              136
              
          + 8784123.0 * pow (D, 15)

            

        

          137
          
        );

          137
          
        );

        

        

          138
          
    }

          138
          
    }

        

        

          139
          
  else if (bValue == 3)

          139
          
  else if (bValue == 3)

        

        

          140
          
    {

          140
          
    {

        

        

          141
          
      // code rate 3/4, use table 3.1.2

          141
          
      // code rate 3/4, use table 3.1.2

        

        

          142
          
      pe = 1.0 / (2.0 * bValue) *

          142
          
      pe = 1.0 / (2.0 * bValue) *

        

          
            

              143
              
        ( 42.0 * pow (D, 5.0)


              143
              
        ( 42.0 * pow (D, 5)

            

            

              144
              
          + 201.0 * pow (D, 6.0)


              144
              
          + 201.0 * pow (D, 6)

            

            

              145
              
          + 1492.0 * pow (D, 7.0)


              145
              
          + 1492.0 * pow (D, 7)

            

            

              146
              
          + 10469.0 * pow (D, 8.0)


              146
              
          + 10469.0 * pow (D, 8)

            

            

              147
              
          + 62935.0 * pow (D, 9.0)


              147
              
          + 62935.0 * pow (D, 9)

            

            

              148
              
          + 379644.0 * pow (D, 10.0)


              148
              
          + 379644.0 * pow (D, 10)

            

            

              149
              
          + 2253373.0 * pow (D, 11.0)


              149
              
          + 2253373.0 * pow (D, 11)

            

            

              150
              
          + 13073811.0 * pow (D, 12.0)


              150
              
          + 13073811.0 * pow (D, 12)

            

            

              151
              
          + 75152755.0 * pow (D, 13.0)


              151
              
          + 75152755.0 * pow (D, 13)

            

            

              152
              
          + 428005675.0 * pow (D, 14.0)


              152
              
          + 428005675.0 * pow (D, 14)

            

        

          153
          
        );

          153
          
        );

        

        

          154
          
    }

          154
          
    }

        

        

          155
          
  else

          155
          
  else

        



(-)a/src/wifi/model/nist-error-rate-model.h
      (-2 / +2 lines)




  

    

    

       Lines 50-58
       
    
  Link Here 
    

  

        

          50
          
  double GetQpskBer (double snr) const;

          50
          
  double GetQpskBer (double snr) const;

        

        

          51
          
  double Get16QamBer (double snr) const;

          51
          
  double Get16QamBer (double snr) const;

        

        

          52
          
  double Get64QamBer (double snr) const;

          52
          
  double Get64QamBer (double snr) const;

        

          
            

              53
              
  double GetFecBpskBer (double snr, double nbits,


              53
              
  double GetFecBpskBer (double snr, uint32_t nbits,

            

        

          54
          
                        uint32_t bValue) const;

          54
          
                        uint32_t bValue) const;

        

          
            

              55
              
  double GetFecQpskBer (double snr, double nbits,


              55
              
  double GetFecQpskBer (double snr, uint32_t nbits,

            

        

          56
          
                        uint32_t bValue) const;

          56
          
                        uint32_t bValue) const;

        

        

          57
          
  double GetFec16QamBer (double snr, uint32_t nbits,

          57
          
  double GetFec16QamBer (double snr, uint32_t nbits,

        

        

          58
          
                         uint32_t bValue) const;

          58
          
                         uint32_t bValue) const;

        



(-)a/src/wifi/model/wifi-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 31-37
       
    
  Link Here 
    

  

        

          31
          
#include "ns3/uinteger.h"

          31
          
#include "ns3/uinteger.h"

        

        

          32
          
#include "ns3/enum.h"

          32
          
#include "ns3/enum.h"

        

        

          33
          
#include "ns3/trace-source-accessor.h"

          33
          
#include "ns3/trace-source-accessor.h"

        

          
            

              34
              
#include <math.h>


              34
              
#include <cmath>

            

        

          35
          

          35
          

        

        

          36
          
NS_LOG_COMPONENT_DEFINE ("WifiPhy");

          36
          
NS_LOG_COMPONENT_DEFINE ("WifiPhy");

        

        

          37
          

          37
          

        



(-)a/src/wifi/model/yans-error-rate-model.cc
      (-1 / +1 lines)




  

    

    

       Lines 61-67
       
    
  Link Here 
    

  

        

          61
          
  double EbNo = snr * signalSpread / phyRate;

          61
          
  double EbNo = snr * signalSpread / phyRate;

        

        

          62
          
  double z = sqrt ((1.5 * Log2 (m) * EbNo) / (m - 1.0));

          62
          
  double z = sqrt ((1.5 * Log2 (m) * EbNo) / (m - 1.0));

        

        

          63
          
  double z1 = ((1.0 - 1.0 / sqrt (m)) * erfc (z));

          63
          
  double z1 = ((1.0 - 1.0 / sqrt (m)) * erfc (z));

        

          
            

              64
              
  double z2 = 1 - pow ((1 - z1), 2.0);


              64
              
  double z2 = 1 - pow ((1 - z1), 2);

            

        

          65
          
  double ber = z2 / Log2 (m);

          65
          
  double ber = z2 / Log2 (m);

        

        

          66
          
  NS_LOG_INFO ("Qam m=" << m << " rate=" << phyRate << " snr=" << snr << " ber=" << ber);

          66
          
  NS_LOG_INFO ("Qam m=" << m << " rate=" << phyRate << " snr=" << snr << " ber=" << ber);

        

        

          67
          
  return ber;

          67
          
  return ber;

        



(-)a/src/wifi/model/yans-wifi-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 35-41
       
    
  Link Here 
    

  

        

          35
          
#include "ns3/pointer.h"

          35
          
#include "ns3/pointer.h"

        

        

          36
          
#include "ns3/net-device.h"

          36
          
#include "ns3/net-device.h"

        

        

          37
          
#include "ns3/trace-source-accessor.h"

          37
          
#include "ns3/trace-source-accessor.h"

        

          
            

              38
              
#include <math.h>


              38
              
#include <cmath>

            

        

          39
          

          39
          

        

        

          40
          
NS_LOG_COMPONENT_DEFINE ("YansWifiPhy");

          40
          
NS_LOG_COMPONENT_DEFINE ("YansWifiPhy");

        

        

          41
          

          41
          

        



(-)a/src/wimax/model/simple-ofdm-wimax-phy.cc
      (-1 / +1 lines)




  

    

    

       Lines 34-40
       
    
  Link Here 
    

  

        

          34
          
#include "ns3/trace-source-accessor.h"

          34
          
#include "ns3/trace-source-accessor.h"

        

        

          35
          
#include "ns3/random-variable.h"

          35
          
#include "ns3/random-variable.h"

        

        

          36
          
#include <string>

          36
          
#include <string>

        

          
            

              37
              
#include <math.h>


              37
              
#include <cmath>

            

        

          38
          
NS_LOG_COMPONENT_DEFINE ("SimpleOfdmWimaxPhy");

          38
          
NS_LOG_COMPONENT_DEFINE ("SimpleOfdmWimaxPhy");

        

        

          39
          
namespace ns3 {

          39
          
namespace ns3 {

        

        

          40
          

          40
          

        






  

  Return to bug 1276