Changeset 215

Timestamp:

Nov 7, 2004, 12:07:03 AM (18 years ago)

Author:

Jari Häkkinen

Message:

Continued work on new Histogram.

Location:

trunk/src

Files:

• Histogram.cc (modified) (5 diffs)
• Histogram.h (modified) (2 diffs)
• WeightedAverager.h (modified) (1 diff)

trunk/src/Histogram.cc

@@ -25 +25 @@
 
 
-Histogram::Histogram(const double min, const double max, const size_t)
-  : xmax_(max), xmin_(min), sum_all_(), sum_histogram_()
+Histogram::Histogram(const double min, const double max, const size_t n)
+  : histogram_(std::vector<double>(n,0.0)),
+    xmax_(max), xmin_(min),
+    sum_all_(), sum_histogram_()
 {
-  // Peter, fix me
 }
-
-
-/*
-Histogram::Histogram(const u_int nof_bins, const double min, const double max)
-  : spacing_((max-min)/nof_bins), xmax_(max), xmin_(min), sum_all_(),
-    sum_histogram_()
-{
-  histogram_=vector<statistics::WeightedAverager>(nof_bins);
-}
-*/
 
 
@@ -51 +42 @@
 int Histogram::add(const double x, const double w)
 {
+  std::cout << "Histogram::add Jari, check me!" << std::endl;
+
   sum_all_.add(x,w);
   if (x<xmin_)
@@ -64 +57 @@
 
 
-void Histogram::normalize(double factor)
-{
-  for (u_int i=0; i<histogram_.size(); i++)
-    histogram_[i]/=factor;
-}
-
-
-
-/*
 void Histogram::normalize(double scale_factor)
 {
-  for (u_int i=0; i<histogram_.size(); i++)
-    histogram_[i]/=_sum_histogram.nof_entries()*spacing_*scale_factor;
+  for (size_t i=0; i<histogram_.size(); i++)
+    histogram_[i]/=scale_factor;
 }
-*/
 
 
@@ -89 +72 @@
   sum_histogram_.reset();
 }
-
-
-
-/*
-const statistics::WeightedAverager& Histogram::operator[](double d) const
-{
-  if ((d<xmin_) || (d>xmax_))
-    return statistics::WeightedAverager();// requested bin not within boundaries
-  return histogram_[static_cast<u_int>(floor((d-xmin_) /
-               spacing_))];
-}
-*/
 
 
@@ -118 +89 @@
 
 
-std::ostream& operator<<(std::ostream& s,const Histogram& b)
+std::ostream& operator<<(std::ostream& s,const Histogram& histogram)
 {
-  s << "# min           : " << b.xmin() << '\n';
-  s << "# max           : " << b.xmax() << '\n';
-  s << "# spacing       : " << b.spacing() << '\n';
-  s << "# number of bins: " << b.nof_bins() << '\n';
-
-//   s << "# histogram averager: " << b.averager_histogram() << '\n';
-  s << "#            entries: " << b.averager_histogram().sum_w() << '\n';
-//   s << "# all averager      : " << b.averager_all() << '\n';
-  s << "#            entries: " << b.averager_all().sum_w() << '\n';
+  s << "# histogram min : " << histogram.xmin() << '\n';
+  s << "# histogram max : " << histogram.xmax() << '\n';
+  s << "# number of bins: " << histogram.nof_bins() << '\n';
+  s << "# histogram averager: " << histogram.averager_histogram() << '\n';
+  s << "#       all averager: " << histogram.averager_all() << '\n';
 
   s << "# column 1: center of observation bin\n"
-    << "# column 2: frequency\n"
-    << "# column 3: relative frequency\n"
-    << "# column 4: average of observations in bin\n"
-    << "# column 5: stddev of frequency\n";
+    << "# column 2: frequency\n";
 
-  double observation=b.xmin()+b.spacing()/2;
-  for (u_int i=0; i<b.nof_bins(); i++) {
+  for (u_int i=0; i<histogram.nof_bins(); i++) {
     s.width(12);
-    s << observation;
+    s << histogram.xmin()+(i+0.5)*histogram.spacing();
     s.width(12);
-    s << b[i];
-    s.width(12);
-// Peter, fix me
-//     if (b.nof_entries_all())
-//       s << b[i].sum_w()/b.nof_entries_all();
-//     else
-//       s << 0;
-    s.width(12);
-//     s << b[i] << "\n";
-    observation+=b.spacing();
+    s << histogram[i] << '\n';
   }
 

trunk/src/Histogram.h

@@ -80 +80 @@
       { return sum_histogram_; }
 
-    // Peter, public or private?
-    inline int bin(double d);
+    ///
+    /// @return The number of bins in the histogram
+    ///
+    inline size_t nof_bins(void) const { return histogram_.size(); }
+
+    ///
+    /// Rescale the histogram using the scale factor \a
+    /// scale_factor. You may need to averager_all or
+    /// averager_histogram to set the proper scale factor.
+    ///
+    void normalize(double scale_factor=1);
+
+    ///
+    /// @return The value of the histogram corresponding to bin \a
+    /// bin.
+    ///
+    /// @note No check is done that \a bin is within the size of the
+    /// histogram.
+    ///
+    inline double observation_value(const size_t bin) const
+      { return xmin_+spacing()*(bin+0.5); }
+
+    ///
+    /// Set everyting to default values, here it means that everything
+    /// is set to zero except the boundary values that are kept.
+    ///
+    void reset(void);
+
+    ///
+    /// @return The size of the bins in the histogram.
+    ///
+    inline double spacing(void) const { return (xmax_-xmin_)/nof_bins(); }
+
+    ///
+    /// @return The histogram upper boundary.
+    ///
+    /// @note The upper boundary value is inside the histogram.
+    ///
+    inline double xmax(void) const { return xmax_; }
+
+    ///
+    /// @return The histogram lower boundary.
+    ///
+    /// @note The lower boundary value is outside the histogram.
+    ///
+    inline double xmin(void) const { return xmin_; }
+
+    ///
+    /// @return The count of bin \a bin.in the histogram.
+    inline double operator[](size_t bin) const { return histogram_[bin]; } 
+
+    ///
+    /// The assignment operator
+    const Histogram& operator=(const Histogram&);
+
+  private:
+    inline size_t bin(double d)
+      { std::cout << "Histogram::bin Jari, implement me!" << std::endl; return 0; };
 //      { return (((d<xmin_) || (d>xmax_)) ? -1 :
 //                static_cast<int>(floor((d-xmin_)/spacing_))); }
 
-    inline u_int nof_bins(void) const { return histogram_.size(); }
-    inline double nof_entries_all(void) const { return sum_all_.sum_w(); }
-    inline double nof_entries_histogram(void) const
-      { return sum_histogram_.sum_w(); }
-    void normalize(double scale_factor=1);
-    void normalize_all(void);
-    void normalize_histogram(void);
-    inline double observation_value(const u_int i) const
-      { return xmin_+spacing()*(i+0.5); }
-    void reset(void);
-    inline double spacing(void) const { return 0; } // Peter, fix me
-    inline double xmax(void) const { return xmax_; }
-    inline double xmin(void) const { return xmin_; }
-
-    inline double operator[](size_t bin) const { return histogram_[bin]; } 
-    double operator[](double) const;
-
-    const Histogram& operator=(const Histogram&);
-
-  private:
     std::vector<double> histogram_;
     double xmax_;
@@ -112 +148 @@
   };
 
+///
+/// The Histogram output operator
+///
 std::ostream& operator<<(std::ostream& s,const Histogram&);
 

trunk/src/WeightedAverager.h

@@ -132 +132 @@
   };
 
+///
+/// The WeightedAverager output operator
+///
+std::ostream& operator<<(std::ostream& s,const WeightedAverager&);
 
 }} // of namespace statistics and namespace theplu