--- a/src/core/random-variable.cc Thu Mar 29 16:33:28 2007 +0200
+++ b/src/core/random-variable.cc Thu Mar 29 16:35:34 2007 +0200
@@ -445,11 +445,11 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// ValueCDF methods
-ValueCDF::ValueCDF()
+EmpiricalVariable::ValueCDF::ValueCDF()
: value(0.0), cdf(0.0){ }
-ValueCDF::ValueCDF(double v, double c)
+EmpiricalVariable::ValueCDF::ValueCDF(double v, double c)
: value(v), cdf(c) { }
-ValueCDF::ValueCDF(const ValueCDF& c)
+EmpiricalVariable::ValueCDF::ValueCDF(const ValueCDF& c)
: value(c.value), cdf(c.cdf) { }
//-----------------------------------------------------------------------------
--- a/src/core/random-variable.h Thu Mar 29 16:33:28 2007 +0200
+++ b/src/core/random-variable.h Thu Mar 29 16:35:34 2007 +0200
@@ -534,17 +534,6 @@
double m_next; // The algorithm produces two values at a time
};
-// Value/CDF pair class for Emiprical Distributions
-//Doc:ClassXRef
-class ValueCDF {
-public:
- ValueCDF();
- ValueCDF(double v, double c);
- ValueCDF(const ValueCDF& c);
- double value;
- double cdf;
-};
-
/**
* \brief EmpiricalVariable distribution random var
* \ingroup randomvariable
@@ -580,6 +569,14 @@
virtual void CDF(double v, double c); // Value, prob <= Value
private:
+ class ValueCDF {
+ public:
+ ValueCDF();
+ ValueCDF(double v, double c);
+ ValueCDF(const ValueCDF& c);
+ double value;
+ double cdf;
+ };
virtual void Validate(); // Insure non-decreasing emiprical values
virtual double Interpolate(double, double, double, double, double);
bool validated; // True if non-decreasing validated