Fix old code that crept in
authorRaj Bhattacharjea <raj.b@gatech.edu>
Tue, 20 Jan 2009 16:36:08 -0500
changeset 4223 86a97665dcb0
parent 4222 509a818e8cdf
child 4224 40e5d5af3c71
Fix old code that crept in
bindings/python/ns3_module_core.py
src/core/random-variable.cc
src/core/random-variable.h
--- a/bindings/python/ns3_module_core.py	Tue Jan 20 14:43:52 2009 -0500
+++ b/bindings/python/ns3_module_core.py	Tue Jan 20 16:36:08 2009 -0500
@@ -1424,12 +1424,12 @@
     return
 
 def register_Ns3NormalVariable_methods(root_module, cls):
-    ## random-variable.h: ns3::NormalVariable::INFINITE_VALUE [variable]
-    cls.add_static_attribute('INFINITE_VALUE', 'double const', is_const=True)
     ## random-variable.h: ns3::NormalVariable::NormalVariable() [constructor]
     cls.add_constructor([])
-    ## random-variable.h: ns3::NormalVariable::NormalVariable(double m, double v, double b=ns3::NormalVariable::INFINITE_VALUE) [constructor]
-    cls.add_constructor([param('double', 'm'), param('double', 'v'), param('double', 'b', default_value='ns3::NormalVariable::INFINITE_VALUE')])
+    ## random-variable.h: ns3::NormalVariable::NormalVariable(double m, double v) [constructor]
+    cls.add_constructor([param('double', 'm'), param('double', 'v')])
+    ## random-variable.h: ns3::NormalVariable::NormalVariable(double m, double v, double b) [constructor]
+    cls.add_constructor([param('double', 'm'), param('double', 'v'), param('double', 'b')])
     cls.add_copy_constructor()
     return
 
--- a/src/core/random-variable.cc	Tue Jan 20 14:43:52 2009 -0500
+++ b/src/core/random-variable.cc	Tue Jan 20 16:36:08 2009 -0500
@@ -906,6 +906,9 @@
 NormalVariable::NormalVariable()
   : RandomVariable (NormalVariableImpl ())
 {}
+NormalVariable::NormalVariable(double m, double v)
+  : RandomVariable (NormalVariableImpl (m, v))
+{}
 NormalVariable::NormalVariable(double m, double v, double b)
   : RandomVariable (NormalVariableImpl (m, v, b))
 {}
--- a/src/core/random-variable.h	Tue Jan 20 14:43:52 2009 -0500
+++ b/src/core/random-variable.h	Tue Jan 20 16:36:08 2009 -0500
@@ -476,7 +476,6 @@
 class NormalVariable : public RandomVariable
 {
 public:
-   static const double INFINITE_VALUE;
   /**
    * Constructs an normal random variable  with a mean
    * value of 0 and variance of 1.
@@ -484,12 +483,20 @@
   NormalVariable();
 
   /**
+   * \brief Construct a normal random variable with specified mean and variance.
+   * \param m Mean value
+   * \param v Variance
+   */ 
+  NormalVariable(double m, double v);
+
+  /**
    * \brief Construct a normal random variable with specified mean and variance
    * \param m Mean value
    * \param v Variance
-   * \param b Bound.  The NormalVariable is bounded within +-bound.
+   * \param b Bound.  The NormalVariable is bounded symetrically about the mean
+   * [mean-bound,mean+bound]
    */ 
-  NormalVariable(double m, double v, double b = INFINITE_VALUE);
+  NormalVariable(double m, double v, double b);
 };
 
 /**