X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/2941710185479c3748e991a3932c4af8832204a9..81106ca76faf22180d0cd4bc1402847378e4ff68:/o815/o815.h?ds=inline

diff --git a/o815/o815.h b/o815/o815.h
index 5776917..242d1e8 100644
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -8,6 +8,7 @@
 
 #include "latlib/paraq.h"
 #include "latlib/writeout.h"
+#include "latlib/hypercache.h"
 
 using namespace std;
 
@@ -18,11 +19,13 @@ class o815 {
 
   class obs {
   public:
-    obs(const string& _obsid, const string& _datadesc, o815 *_O815, char *_obsmem, const int& _obsmemSize);
+    obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize);
     void finish();
-    void meas();
+    void meas(bool loadedobs);
     void start();
     string getDataDesc() { return datadesc; };
+    int ocid;
+    string obsid;
   private:
     virtual void _meas(bool loadedobs)=0;
     virtual void _finish()=0;
@@ -30,9 +33,25 @@ class o815 {
   protected:
     o815 *O815;
     char *obsMem;
-    ostream *oout;
-    ostream *olog;
-    string obsid, datadesc;
+    string simid, datadesc;
+    ostream *out, *log;
+    void printParas();
+    paraq* paraQ;
+  };
+
+  class sim {
+  public:
+    sim(o815 *_O815, const int& _confmemSize);
+    void nextConfig();
+    bool toEquilibrate;
+    char *confMem;
+  private:
+    virtual void _reset()=0;
+    virtual void _makeSweep(int nsweep)=0;
+  protected:
+    o815 *O815;
+    ostream *log;
+    int nequi, nskip;
   };
 
   struct {
@@ -52,8 +71,10 @@ class o815 {
   paraq *paraQ;
   writeout *out;
   vector<obs*> observables;
+  sim* Sim;
   void mainLoop();
   string headMaster();
+  void addPara(const string& paraid, const double& paraDefault);
 
 private:
   MPI_Status mpiStatus;
@@ -61,6 +82,7 @@ private:
   static void listArg(int *target, int tlen, char *listarg);
   void parseArgs(int argc, char **argv);
   string programid;
+  int nextParas();
 };
 
 #endif