Moved boost headers in configcache to source file.

[phys/latlib.git] / o815 / o815.h

diff --git a/o815/o815.h b/o815/o815.h
index 33693b002aaceba341c488662d1666e10990788b..b3ad62a79a7a0f81812ddcd6837960f9d2c28ffb 100644 (file)
--- a/o815/o815.h
+++ b/o815/o815.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <mpi.h>
 #include <stdlib.h>
 #include <vector>
 #include <mpi.h>
 #include <stdlib.h>

+#include <getopt.h>

 
 #include "latlib/paraq.h"
 #include "latlib/writeout.h"
 
 #include "latlib/paraq.h"
 #include "latlib/writeout.h"


@@ -19,36 +20,39 @@ class o815 {
 
   class obs {
   public:
 
   class obs {
   public:

-    obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize);
+    obs(const string& _obsid, const string& _datadesc, o815 *_O815, const int& _obsmemSize, const string& _obsidpostfix="");

     void finish();
     void finish();

-    void meas();
+    void meas(bool loadedobs, const int& nthmeas);

     void start();
     string getDataDesc() { return datadesc; };
     void start();
     string getDataDesc() { return datadesc; };

+    int ocid;
+    string obsid;
+    string obsidpostfix;

   private:
   private:

-    virtual void _meas(bool loadedobs)=0;
+    virtual void _meas(bool loadedobs, const int& nthmeas)=0;

     virtual void _finish()=0;
     virtual void _start()=0;
   protected:
     o815 *O815;
     char *obsMem;
     virtual void _finish()=0;
     virtual void _start()=0;
   protected:
     o815 *O815;
     char *obsMem;

-    string obsid, simid, datadesc;
+    string simid, datadesc;

     ostream *out, *log;
     ostream *out, *log;

-    int ocid;
+    paraq* paraQ;

   };
 
   class sim {
   public:
     sim(o815 *_O815, const int& _confmemSize);
     void nextConfig();
   };
 
   class sim {
   public:
     sim(o815 *_O815, const int& _confmemSize);
     void nextConfig();

-    bool toEquilibrate;

     char *confMem;
     char *confMem;

+    virtual void _newParas()=0;
+    int nequi, nskip;

   private:
   private:

-    virtual void _reset()=0;
-    virtual void _makeSweep(int nsweep)=0;
+    virtual void _makeSweep()=0;

   protected:
     o815 *O815;
     ostream *log;
   protected:
     o815 *O815;
     ostream *log;

-    int nequi, nskip;
+    int confmemSize;

   };
 
   struct {
   };
 
   struct {


@@ -59,11 +63,21 @@ class o815 {
     pair<string,int> obscache;
     pair<string,int> confcache;
     string outdir;
     pair<string,int> obscache;
     pair<string,int> confcache;
     string outdir;

-    bool idonly;
-    bool showjobnum;
+    int idonly;
+    int showjobnum;

   } comargs;
 
   } comargs;
 

-  o815(int argc, char **argv, const string& programid);
+  struct comoption {
+    string name;
+    int has_arg;
+    int *flag;
+    int val;
+    string optdesc;
+    string argdesc;
+  };
+
+  o815(int argc, char **argv, const string& _programid, comoption specOps[]=NULL, void (*helpHeader)()=NULL);
+  void postParaInit();

   ~o815();
   paraq *paraQ;
   writeout *out;
   ~o815();
   paraq *paraQ;
   writeout *out;


@@ -71,14 +85,20 @@ class o815 {
   sim* Sim;
   void mainLoop();
   string headMaster();
   sim* Sim;
   void mainLoop();
   string headMaster();

+  void addPara(const string& paraid, const double& paraDefault);
+  void addComOption(const char* name, int has_arg, int *flag, int val, const char* optdesc, const char* argdesc);
+  vector< pair<int,char*> > parsedSpecOps;
+  vector<char*> lonelyArgs;

 
 private:
 
 private:

+  vector<comoption> comOptions;

   MPI_Status mpiStatus;
   int numprocs, rank;
   static void listArg(int *target, int tlen, char *listarg);
   MPI_Status mpiStatus;
   int numprocs, rank;
   static void listArg(int *target, int tlen, char *listarg);

-  void parseArgs(int argc, char **argv);
+  void parseArgs(int argc, char **argv, comoption specOps[]);

   string programid;
   int nextParas();
   string programid;
   int nextParas();

+  comoption* getOptionByVal(int val);

 };
 
 #endif
 };
 
 #endif