Changeset 307 in Sophya for trunk/SophyaLib/NTools/generaldata.h

Timestamp:

May 19, 1999, 5:58:06 PM (26 years ago)

Author:

ansari

Message:

FIO_... + grosses modifs cmv 19/5/99

File:

• trunk/SophyaLib/NTools/generaldata.h (modified) (5 diffs)

trunk/SophyaLib/NTools/generaldata.h

@@ +1 @@
+// This may look like C code, but it is really -*- C++ -*-
+//                         C.Magneville          04/99
 #ifndef GENERALDATA_SEEN
 #define GENERALDATA_SEEN
@@ -5 +7 @@
 #include "ppersist.h"
 #include "poly.h"
+#include "anydataobj.h"
+
+namespace PlanckDPC {
 
 class GeneralFit;
+class FIO_GeneralFitData;
 
 //================================================================
@@ -12 +18 @@
 //================================================================
 
-class GeneralFitData : public PPersist {
+class GeneralFitData : public AnyDataObj {
+  friend class GeneralFit;
+  friend class FIO_GeneralFitData;
 public:
-  enum {classId = ClassId_GeneralFitData };
   enum {Def_ErrF = 1, Def_ErrX = 0};
 
   GeneralFitData(unsigned int nVar, unsigned int nDataAlloc, uint_2 errx=0);
-  GeneralFitData(GeneralFitData& data, bool clean=false);
+  GeneralFitData(const GeneralFitData& data, bool clean=false);
   GeneralFitData();
-  GeneralFitData(char *flnm);
   virtual ~GeneralFitData();
 
@@ -107 +113 @@
   double PolFit(int varx,Poly& pol,int degre,bool ey=true);
   double PolFit(int varx,int vary,Poly2& pol,int degre1,int degre2=-1,bool ez=true);
-  GeneralFitData* FitResidus(GeneralFit& gfit);
-  GeneralFitData* FitFunction(GeneralFit& gfit);
+  GeneralFitData FitResidus(GeneralFit& gfit);
+  GeneralFitData FitFunction(GeneralFit& gfit);
   string VarList_C(const char* nomx)  const;
-
-  int_4             ClassId() const        { return classId; }
-  static PPersist*  Create()               { return new GeneralFitData;}
-
-  virtual void      WriteSelf(POutPersist&) const;
-  virtual void      ReadSelf(PInPersist&);
-
-friend class GeneralFit;
 
 protected:
@@ -136 +134 @@
 };
 
+/////////////////////////////////////////////////////////////////////////
+// Classe pour la gestion de persistance
+class FIO_GeneralFitData : public  PPersist  {
+public:
+  FIO_GeneralFitData();
+  FIO_GeneralFitData(string const & filename); 
+  FIO_GeneralFitData(const GeneralFitData & obj);
+  FIO_GeneralFitData(GeneralFitData * obj);
+  virtual ~FIO_GeneralFitData();
+  virtual AnyDataObj* DataObj();
+  inline operator GeneralFitData() { return(*dobj); }
+protected :
+  virtual void ReadSelf(PInPersist&);           
+  virtual void WriteSelf(POutPersist&) const;  
+  GeneralFitData * dobj;
+  bool ownobj;
+};
+
+} // Fin du namespace
+
 #endif