From a5f05e337d18c193ac57b4da0013d1cdc69f8faa Mon Sep 17 00:00:00 2001
From: Alex Schmidt <alex@treefish.org>
Date: Thu, 23 May 2013 15:18:01 +0200
Subject: [PATCH] ...

---
 o815/o815.h           |  1 -
 o815/obs.cpp          |  5 -----
 obs.hpp => obstat.hpp | 18 +++++++++---------
 paraq.cpp             | 21 +++++++++++++++++++++
 paraq.h               |  2 ++
 5 files changed, 32 insertions(+), 15 deletions(-)
 rename obs.hpp => obstat.hpp (87%)

diff --git a/o815/o815.h b/o815/o815.h
index 8b00437..91fc747 100644
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -36,7 +36,6 @@ class o815 {
     char *obsMem;
     string simid, datadesc;
     ostream *out, *log;
-    void printParas();
     paraq* paraQ;
   };
 
diff --git a/o815/obs.cpp b/o815/obs.cpp
index c10a5f4..807d4ee 100644
--- a/o815/obs.cpp
+++ b/o815/obs.cpp
@@ -35,8 +35,3 @@ o815::obs::obs(const string& _obsid, const string& _datadesc, o815 *_O815, const
   ocid = hypercache::initO(O815->programid + "-" + obsid, O815->comargs.nequi, O815->comargs.nskip,
 			   O815->comargs.obscache.first, &obsMem, obsmemSize, O815->comargs.obscache.second, log);
 }
-
-void o815::obs::printParas() {
-  for (vector<string>::iterator parait = paraQ->allParaIds.begin(); parait != paraQ->allParaIds.end(); ++parait)
-    *O815->out->out[obsid] << (*paraQ)[*parait] << "\t";
-}
diff --git a/obs.hpp b/obstat.hpp
similarity index 87%
rename from obs.hpp
rename to obstat.hpp
index 4d20bd6..d66467b 100644
--- a/obs.hpp
+++ b/obstat.hpp
@@ -1,5 +1,5 @@
-#ifndef OBS_HPP
-#define OBS_HPP
+#ifndef OBSTAT_HPP
+#define OBSTAT_HPP
 
 #include <vector>
 #include <string>
@@ -9,7 +9,7 @@
 using namespace std;
 
 template <typename obstype>
-class obs
+class obstat
 { 
 public:
   void addMeas(const obstype& val);
@@ -40,20 +40,20 @@ private:
 
 
 template <typename obstype> 
-void obs<obstype>::reset()
+void obstat<obstype>::reset()
 {
   computations.clear();
   measurements.clear();
 }
 
 template <typename obstype> 
-void obs<obstype>::addMeas(const obstype& val)
+void obstat<obstype>::addMeas(const obstype& val)
 {
   measurements.push_back( vector<obstype>(1,val) );
 }
 
 template <typename obstype>
-void obs<obstype>::addMeas(obstype val[], int valsize)
+void obstat<obstype>::addMeas(obstype val[], int valsize)
 {
   vector<obstype> tmpvec;
   for(int i=0; i<valsize; i++) tmpvec.push_back(val[i]);
@@ -61,7 +61,7 @@ void obs<obstype>::addMeas(obstype val[], int valsize)
 }
 
 template <typename obstype>
-void obs<obstype>::mean(const string& compid, vector< vector<double> > *meas, const int& ival)
+void obstat<obstype>::mean(const string& compid, vector< vector<double> > *meas, const int& ival)
 {
   computations[compid].val = 0;
   computations[compid].err = 0;
@@ -78,7 +78,7 @@ void obs<obstype>::mean(const string& compid, vector< vector<double> > *meas, co
 }
 
 template <typename obstype>
-void obs<obstype>::mean(const string& compid, vector< vector<int> > *meas, const int& ival)
+void obstat<obstype>::mean(const string& compid, vector< vector<int> > *meas, const int& ival)
 {
   computations[compid].val = 0;
   computations[compid].err = 0;
@@ -95,7 +95,7 @@ void obs<obstype>::mean(const string& compid, vector< vector<int> > *meas, const
 }				 
     
 template <typename obstype>
-void obs<obstype>::computeJack(const string& compid, double (*func)(vector< vector<obstype> > *vals, void *para), void *para)
+void obstat<obstype>::computeJack(const string& compid, double (*func)(vector< vector<obstype> > *vals, void *para), void *para)
 {
   int nmeas=measurements.size();
   double manymeans[nmeas];
diff --git a/paraq.cpp b/paraq.cpp
index 381941f..ac8fc14 100644
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -129,3 +129,24 @@ void paraq::uniqueAllParaIdsAdd(const string& paraid) {
 
   allParaIds.push_back(paraid);
 }
+
+string paraq::getParaNames() {
+  stringstream paranames;
+  
+  for (vector<string>::iterator parait = allParaIds.begin(); parait != allParaIds.end(); ++parait)
+    paranames << *parait << ":";
+  
+  return paranames.str();
+}
+
+string paraq::getParaVals() {
+  stringstream paravals;
+
+  for (vector<string>::iterator parait = allParaIds.begin(); parait != allParaIds.end(); ++parait) {
+    if ( parait != allParaIds.begin() )
+      paravals << "\t";
+    paravals << (*this)[*parait];
+  }
+
+  return paravals.str();
+}
diff --git a/paraq.h b/paraq.h
index 6aba45b..6dc582d 100644
--- a/paraq.h
+++ b/paraq.h
@@ -19,6 +19,8 @@ class paraq {
   int getTotalJobs();
   string rangeString();
   vector<string> allParaIds;
+  string getParaNames();
+  string getParaVals();
 
  private:
   int nprocs, rank;
-- 
2.39.5