...

[phys/latlib.git] / obs.hpp

diff --git a/obs.hpp b/obs.hpp
index ae544e4e3a70dad0a2647d57dd58294ca0db0042..4d20bd6d901bff88f113d7a654a8fd87dca2ca4e 100644 (file)
--- a/obs.hpp
+++ b/obs.hpp
@@ -1,7 +1,7 @@
 #ifndef OBS_HPP
 #define OBS_HPP
 
 #ifndef OBS_HPP
 #define OBS_HPP
 

-#include <list>
+#include <vector>

 #include <string>
 #include <map>
 #include <math.h>
 #include <string>
 #include <map>
 #include <math.h>


@@ -10,61 +10,92 @@ using namespace std;
 
 template <typename obstype>
 class obs
 
 template <typename obstype>
 class obs

-{
-  struct result{
-    double val;
-    double err;
-  };
-  
+{ 

 public:
 public:

-  void addMeas(obstype val[], int valsize);

   void addMeas(const obstype& val);
   void addMeas(const obstype& val);

+  void addMeas(obstype val[], int valsize);
+
+  void computeEasy(const string& compid="one", const int& ival=0) { mean(compid, &measurements, ival); }
+
+  void computeJack(const string& compid, double (*func)(vector< vector <obstype> > *vals, void *para)=NULL, void *para=NULL);
+  void computeJack(double (*func)(vector< vector <obstype> > *vals, void *para)=NULL, void *para=NULL) { computeJack("one",func,para); }

 
 

-  void computeMean(const string& compid) { mean(compid, &measurements); }
-  void computeJack(const string& compid, double (*func)(list<obstype> *vals, void *para), void *para=NULL);
+  double getMean(const string& compid="one") { return computations[compid].val; }
+  double getErr(const string& compid="one") { return computations[compid].err; }

 
 

-  double getMean(const string& compid) { return computations[compid].val; }
-  double getErr(const string& compid) { return computations[compid].err; }
+  void reset();

 
 private:
 
 private:

-  list<obstype> measurements;
+  struct result{
+    double val;
+    double err;
+  };
+
+  vector< vector<obstype> > measurements;

   map<string,result> computations;
   
   map<string,result> computations;
   

-  void mean(const string& compid, list<double> *meas);
+  void mean(const string& compid, vector< vector <double> > *meas, const int& ival);
+  void mean(const string& compid, vector< vector <int> > *meas, const int& ival);

 };
 
 };
 

-template <typename obstype>
-void obs<obstype>::addMeas(obstype val[], int valsize)
+
+template <typename obstype> 
+void obs<obstype>::reset()

 {
 {

-  for(int i=0; i<valsize; i++) measurements.push_back(val[i]);
+  computations.clear();
+  measurements.clear();

 }
 
 template <typename obstype> 
 void obs<obstype>::addMeas(const obstype& val)
 {
 }
 
 template <typename obstype> 
 void obs<obstype>::addMeas(const obstype& val)
 {

-  measurements.push_back(val);
+  measurements.push_back( vector<obstype>(1,val) );

 }
 
 template <typename obstype>
 }
 
 template <typename obstype>

-void obs<obstype>::mean(const string& compid, list<double> *meas)
+void obs<obstype>::addMeas(obstype val[], int valsize)
+{
+  vector<obstype> tmpvec;
+  for(int i=0; i<valsize; i++) tmpvec.push_back(val[i]);
+  measurements.push_back(tmpvec);
+}
+
+template <typename obstype>
+void obs<obstype>::mean(const string& compid, vector< vector<double> > *meas, const int& ival)

 {
   computations[compid].val = 0;
   computations[compid].err = 0;
   
   int nmeas = meas->size();
 
 {
   computations[compid].val = 0;
   computations[compid].err = 0;
   
   int nmeas = meas->size();
 

-  for(list<double>::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
-    computations[compid].val += *measIt;
+  for(vector< vector<double> >::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
+    computations[compid].val += (*measIt)[ival];

   computations[compid].val /= nmeas;
   
   computations[compid].val /= nmeas;
   

-  for(list<double>::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
-    computations[compid].err += pow( *measIt - computations[compid].val, 2 );
-  computations[compid].err /= nmeas*(nmeas-1);
-  computations[compid].err = sqrt( computations[compid].err );  
+  for(vector< vector<double> >::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
+    computations[compid].err += pow( (*measIt)[ival] - computations[compid].val, 2 );
+  computations[compid].err = sqrt( computations[compid].err ) / nmeas;  
+}
+
+template <typename obstype>
+void obs<obstype>::mean(const string& compid, vector< vector<int> > *meas, const int& ival)
+{
+  computations[compid].val = 0;
+  computations[compid].err = 0;
+  
+  int nmeas = meas->size();
+
+  for(vector< vector<int> >::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
+    computations[compid].val += (*measIt)[ival];
+  computations[compid].val /= nmeas;
+  
+  for(vector< vector<int> >::iterator measIt = meas->begin(); measIt != meas->end(); ++measIt)
+    computations[compid].err += pow( (*measIt)[ival] - computations[compid].val, 2 );
+  computations[compid].err = sqrt( computations[compid].err ) / nmeas;

 }                               
     
 template <typename obstype>
 }                               
     
 template <typename obstype>

-void obs<obstype>::computeJack(const string& compid, double (*func)(list<obstype> *vals, void *para), void *para)
+void obs<obstype>::computeJack(const string& compid, double (*func)(vector< vector<obstype> > *vals, void *para), void *para)

 {
   int nmeas=measurements.size();
   double manymeans[nmeas];
 {
   int nmeas=measurements.size();
   double manymeans[nmeas];


@@ -73,26 +104,23 @@ void obs<obstype>::computeJack(const string& compid, double (*func)(list<obstype
   computations[compid].err = 0;
 
   int imeas=0;
   computations[compid].err = 0;
 
   int imeas=0;

-  for(typename list<obstype>::iterator removedIt = measurements.begin(); removedIt != measurements.end(); imeas++)
+  for(typename vector< vector<obstype> >::iterator removedIt = measurements.begin(); removedIt != measurements.end(); ++removedIt, imeas++)

     {
     {

-      obstype removed = *removedIt;
+      vector<obstype> removed = *removedIt;

       
       

-      typename list<obstype>::iterator nextAfterIt = removedIt;
-      ++nextAfterIt;
+      *removedIt = measurements.back();
+      measurements.pop_back();

 
 

-      measurements.erase(removedIt);
-     

       manymeans[imeas] = func(&measurements, para);
       computations[compid].val += manymeans[imeas];
       manymeans[imeas] = func(&measurements, para);
       computations[compid].val += manymeans[imeas];

-
-      measurements.insert(nextAfterIt, removed);
-
-      removedIt = nextAfterIt;
+      
+      measurements.push_back( *removedIt );
+      *removedIt = removed;

     }
   computations[compid].val /= nmeas;
 
   for(int imean=0; imean<nmeas; imean++)
     }
   computations[compid].val /= nmeas;
 
   for(int imean=0; imean<nmeas; imean++)

-    computations[compid].err += pow( computations[compid].val - manymeans[imean], 2 );
+    computations[compid].err += pow( manymeans[imean] - computations[compid].val, 2 );

   computations[compid].err *= (double)(nmeas-1)/nmeas;
   computations[compid].err = sqrt(computations[compid].err);
 }
   computations[compid].err *= (double)(nmeas-1)/nmeas;
   computations[compid].err = sqrt(computations[compid].err);
 }