Moved boost headers in configcache to source file.

[phys/latlib.git] / obstat.hpp

diff --git a/obstat.hpp b/obstat.hpp
index 6818792fc765335c0bbfcd6405391ebeae7564a5..57a3431e6faa36078ecad0935256a6b8bc3e45d7 100644 (file)
--- a/obstat.hpp
+++ b/obstat.hpp
@@ -19,7 +19,7 @@ public:
 
   int computeJack(restype (*func)(vector< vector <meastype> > *vals, void *para), void *para=NULL);
   int computeJack(void (*preMeasFunc)(vector< vector <meastype> > *allVals, vector <meastype> *preCalculated, void *para), 
 
   int computeJack(restype (*func)(vector< vector <meastype> > *vals, void *para), void *para=NULL);
   int computeJack(void (*preMeasFunc)(vector< vector <meastype> > *allVals, vector <meastype> *preCalculated, void *para), 

-                 restype (*measFunc)(vector <meastype> *preCalculated, vector <meastype> *excludedmeas, void *para), void *para=NULL);
+                 restype (*measFunc)(vector <meastype> *preCalculated, vector <meastype> *excludedmeas, int nmeas, void *para), void *para=NULL);

 
   restype getMean(int compid) { return computations[compid].val; }
   restype getErr(int compid) { return computations[compid].err; }
 
   restype getMean(int compid) { return computations[compid].val; }
   restype getErr(int compid) { return computations[compid].err; }


@@ -87,7 +87,7 @@ template <typename meastype, typename restype>
 int obstat<meastype,restype>::computeJack(restype (*func)(vector< vector<meastype> > *vals, void *para), void *para)
 {
   int nmeas=measurements.size();
 int obstat<meastype,restype>::computeJack(restype (*func)(vector< vector<meastype> > *vals, void *para), void *para)
 {
   int nmeas=measurements.size();

-  restype manymeans[nmeas];
+  restype *manymeans = new restype[nmeas];

   result jackres;
 
   jackres.val = 0;
   result jackres;
 
   jackres.val = 0;


@@ -116,15 +116,17 @@ int obstat<meastype,restype>::computeJack(restype (*func)(vector< vector<meastyp
 
   computations.push_back(jackres);
 
 
   computations.push_back(jackres);
 

+  delete [] manymeans;
+

   return computations.size()-1;
 }
 
 template <typename meastype, typename restype>
 int obstat<meastype,restype>::computeJack(void (*preMeasFunc)(vector< vector <meastype> > *allVals, vector<meastype> *preCalculated, void *para), 
   return computations.size()-1;
 }
 
 template <typename meastype, typename restype>
 int obstat<meastype,restype>::computeJack(void (*preMeasFunc)(vector< vector <meastype> > *allVals, vector<meastype> *preCalculated, void *para), 

-                                         restype (*measFunc)(vector<meastype> *preCalculated, vector<meastype> *excludedmeas, void *para), 
+                                         restype (*measFunc)(vector<meastype> *preCalculated, vector<meastype> *excludedmeas, int nmeas, void *para),

                                          void *para) {
   int nmeas=measurements.size();
                                          void *para) {
   int nmeas=measurements.size();

-  restype manymeans[nmeas];
+  restype *manymeans = new restype[nmeas];

   result jackres;
   vector<meastype> preCalculated;
 
   result jackres;
   vector<meastype> preCalculated;
 


@@ -135,7 +137,7 @@ int obstat<meastype,restype>::computeJack(void (*preMeasFunc)(vector< vector <me
 
   int imeas=0;
   for(typename vector< vector<meastype> >::iterator removedIt = measurements.begin(); removedIt != measurements.end(); ++removedIt, imeas++) {
 
   int imeas=0;
   for(typename vector< vector<meastype> >::iterator removedIt = measurements.begin(); removedIt != measurements.end(); ++removedIt, imeas++) {

-    manymeans[imeas] = measFunc(&preCalculated, &(*removedIt), para);
+    manymeans[imeas] = measFunc(&preCalculated, &(*removedIt), measurements.size(), para);

     jackres.val += manymeans[imeas]; 
   }
   jackres.val /= nmeas;
     jackres.val += manymeans[imeas]; 
   }
   jackres.val /= nmeas;


@@ -147,6 +149,8 @@ int obstat<meastype,restype>::computeJack(void (*preMeasFunc)(vector< vector <me
 
   computations.push_back(jackres);
 
 
   computations.push_back(jackres);
 

+  delete [] manymeans;
+

   return computations.size()-1;
 }
 
   return computations.size()-1;
 }