Changeset 2333

Timestamp:

Oct 15, 2010, 2:44:23 AM (12 years ago)

Author:

Peter

Message:

fixes #556

Location:

trunk

Files:

• test/histogram_test.cc (modified) (2 diffs)
• yat/statistics/Histogram.cc (modified) (2 diffs)
• yat/statistics/Histogram.h (modified) (2 diffs)

trunk/test/histogram_test.cc

@@ -29 +29 @@
 #include <iostream>
 
+using namespace theplu::yat::statistics;
+using namespace theplu::yat;
+
+void test_stream_constructor(test::Suite&);
+
 int main(int argc, char* argv[])
 {
-  using namespace theplu::yat::statistics;
-  using namespace theplu::yat;
   theplu::yat::test::Suite suite(argc, argv);
   suite.err() << "testing histogram" << std::endl;
@@ -58 +61 @@
         boost::forward_iterator_archetype<DataWeight>());
   }
+  test_stream_constructor(suite);
 
   return suite.return_value();
 }
+
+void test_stream_constructor(test::Suite& suite)
+{
+  Histogram hist(0, 10, 10);
+  hist.add(3,2);
+  hist.add(1,3.14);
+  hist.add(20);
+  std::ostringstream oss;
+  oss << hist;
+  std::istringstream iss(oss.str());
+  Histogram hist2(iss);
+  std::ostringstream oss2;
+  oss2 << hist2;
+  if (oss.str() != oss2.str()) {
+    suite.add(false);
+    suite.err() << "output:\n" << oss.str() 
+                << "not equal to\n" << oss2.str();
+      
+  }
+}

trunk/yat/statistics/Histogram.cc

@@ -26 +26 @@
 #include "Histogram.h"
 
+#include <yat/utility/utility.h>
+
 #include <algorithm>
 #include <cassert>
 #include <cmath>
 #include <functional>
+#include <istream>
 #include <ostream>
 
@@ -40 +43 @@
     : xmax_(0), xmin_(0), sum_all_(), sum_histogram_()
   {
+  }
+
+
+  Histogram::Histogram(std::istream& is)
+  {
+    std::string line;
+    getline(is, line, ':');
+    getline(is, line, '\n');
+    xmin_ = utility::convert<double>(line);
+    getline(is, line, ':');
+    getline(is, line, '\n');
+    xmax_ = utility::convert<double>(line);
+    getline(is, line, ':');
+    getline(is, line, '\n');
+    size_t n = utility::convert<size_t>(line);
+    histogram_.resize(n);
+    getline(is, line, '\n');
+    getline(is, line, ':');
+    getline(is, line, '\n');
+    double total = utility::convert<double>(line);
+    getline(is, line, '\n');
+    getline(is, line, '\n');
+    std::vector<std::vector<double> > data;
+    utility::load(is, data);
+    for (size_t i=0; i<histogram_.size(); ++i) {
+      assert(data[i].size()==2);
+      add(data[i][0], data[i][1]);
+    }
+    add(xmax_, total - averager_all().sum_w());
   }
 

trunk/yat/statistics/Histogram.h

@@ -33 +33 @@
 #include <boost/concept_check.hpp>
 
+#include <iosfwd>
 #include <string>
 #include <vector>
@@ -57 +58 @@
     ///
     Histogram(void);
+
+    /**
+       \brief The istream constructor.
+
+       This constructor creates a Histogram from output (possibly)
+       created with operator<<. Note that the output from operator<<
+       does not contain all information required to restore the
+       Histogram. The values of all bins are restored, but the
+       averagers, averager_all(void) and averager_histogram(void), and
+       more specifically the second moment (sum_xx) in the averagers
+       cannot be restored due to lack of information in the output.
+
+       \since New in yat 0.7
+    */
+    Histogram(std::istream&);
 
     ///