Changeset 852 in Sophya

Timestamp:

Apr 10, 2000, 2:59:45 PM (25 years ago)

Author:

ansari

Message:

nbrandom-> SysTools/srandgen.h .c + suppr. pclassid.h Reza 10/4/2000

Location:

trunk/SophyaLib/NTools

Files:

• NTools.o.list (modified) (1 diff)
• cimage.h (modified) (1 diff)
• nbrandom.c (deleted)
• nbrandom.h (modified) (1 diff)
• poly.h (modified) (3 diffs)
• rzimage.h (modified) (2 diffs)

trunk/SophyaLib/NTools/NTools.o.list

@@ -22 +22 @@
 median.o
 nbmath.o
-nbrandom.o
 nbtri.o
 ntoolsinit.o

trunk/SophyaLib/NTools/cimage.h

@@ -34 +34 @@
   virtual ~Image();
 
-  int_4                 ClassId() const       { return (ClassId_Image+DataType((T)0)); }
   static PPersist*      Create()              { return new Image<T>;}
 

trunk/SophyaLib/NTools/nbrandom.h

@@ -5 +5 @@
 #define NBRANDOM_H_SEEN
 
-#include "machdefs.h"
-#include <stdlib.h>
-#ifdef __MWERKS__
-#include "unixmac.h"
-#endif
+/*   Pour compatibilite anterieure R. Ansari 04/2000  */
+/*                remplace par srandgen.h             */
 
-#define frand01() ( (float) drand48() )
-#define drand01() ( drand48() )
-#define ranf01() drand01()
-
-#define frandpm1() ( 2. * frand01() - 1.)
-#define drandpm1() ( 2. * drand01() - 1.)
-#define ranfpm1() drandpm1()
-
-struct tirage_alea {
-  int Nbin;
-  double Min,Max,Lbin;
-  double *Tab;
-};
-typedef struct tirage_alea TIREALEA;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void Ini_Ranf_Quick(long seed_val, int lp);
-void Ini_Ranf(unsigned short seed_16v[3], int lp);
-void Get_Ranf(unsigned short seed_16v[3], int lp);
-void Auto_Ini_Ranf(int lp);
-
-void SetGauRange(double range);
-float NorRand1(void);
-double GauRnd1(double am, double s);
-float NorRand(void);
-double GauRnd(double am, double s);
-int NormCo(double *a,double *b
-          ,double mx,double my,double sx,double sy,double ro);
-void NormGau(double *x,double *y
-            ,double mx,double my,double sa,double sb,double teta);
-
-TIREALEA *init_tirage_alea(int nbin,double xmin,double xmax,double (*fonc) (double));
-double tirage_alea(TIREALEA *alea);
-int end_tirage_alea(TIREALEA *alea);
-
-#ifdef __cplusplus
-}
-#endif
+#include "srandgen.h"
 
 #endif

trunk/SophyaLib/NTools/poly.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: poly.h,v 1.5 2000-04-03 17:41:08 ansari Exp $
+// $Id: poly.h,v 1.6 2000-04-10 12:59:45 ansari Exp $
 //
 
@@ -26 +26 @@
   Poly(int degre = 0);
   Poly(Poly const& a);
-
-  enum {classId = ClassId_Poly1};
-  int_4  ClassId() const         { return classId; }
 
   inline int Degre() const {UpdateDegIfDirty(); return deg;}
@@ -125 +122 @@
   Poly2(Poly const& polX, Poly const& polY);
   Poly2(Poly2 const& a);
-
-  enum {classId = ClassId_Poly2};
-  int_4 ClassId() const         { return classId; }
 
   inline int DegX() const {UpdateDegIfDirty(); return degX;}

trunk/SophyaLib/NTools/rzimage.h

@@ -39 +39 @@
   //class RzImage EXC_AWARE {
 public:
-  enum {classId = ClassId_Image };
 
                 RzImage(PBaseDataTypes dType, int sizx, int sizy, 
@@ -50 +49 @@
   virtual       ~RzImage(); 
 
-  int_4                 ClassId() const         { return classId; }
   static PPersist*      Create()                { return new RzImage;}