Changeset 231

Timestamp:

Feb 21, 2005, 3:50:17 PM (17 years ago)

Author:

Peter

Message:

filled incomplete stuff

Location:

trunk/src

Files:

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

trunk/src/Histogram.cc

@@ -42 +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_)
@@ -50 +48 @@
     return 1;
   
-  // Peter fill this.
-  sum_all_.add(x,w);
+  sum_histogram_.add(x,w);
+  histogram_[bin(x)] += w;
   return 0;
 }
@@ -62 +60 @@
     histogram_[i]/=scale_factor;
 }
-
 
 
@@ -94 +91 @@
   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 << "# nof points in histogram : " 
+    << histogram.averager_histogram().sum_w() << '\n';
+  s << "# nof points in total:      " 
+    << histogram.averager_all().sum_w() << '\n';
   s << "# column 1: center of observation bin\n"
     << "# column 2: frequency\n";
@@ -102 +100 @@
   for (u_int i=0; i<histogram.nof_bins(); i++) {
     s.width(12);
-    s << histogram.xmin()+(i+0.5)*histogram.spacing();
+    s << histogram.observation_value(i);
     s.width(12);
     s << histogram[i] << '\n';

trunk/src/Histogram.h

@@ -136 +136 @@
 
   private:
+    // Returns zero if outside boundaries
     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_))); }
+    { return (((d<xmin_) || (d>xmax_)) ? 0 :
+              static_cast<size_t>(floor((d-xmin_)/spacing() ))); }
 
     std::vector<double> histogram_;