Changeset 3615 in Sophya for trunk/SophyaProg/Tests

Timestamp:

May 1, 2009, 1:34:31 PM (16 years ago)

Author:

cmv

Message:

Modifs relatives a l'introduction de RandomGeneratorInterface + delete de srandgen.c, cmv 01/05/2009

Location:

trunk/SophyaProg/Tests

Files:

• lpk.cc (modified) (2 diffs)
• tfft.cc (modified) (1 diff)
• timg.cc (modified) (1 diff)
• tmtrnd.cc (modified) (3 diffs)
• tsphereecp.cc (modified) (2 diffs)
• zthr.cc (modified) (2 diffs)

trunk/SophyaProg/Tests/lpk.cc

@@ -92 +92 @@
   Matrix a(n,n);
   for(i=0; i<n; i++)
-    for(j=0; j<n; j++)  a(j,i) = GauRnd(0., 1.);
+    for(j=0; j<n; j++)  a(j,i) = Gaussian(1.,0.);
   
   Vector x(n), b;
@@ -98 +98 @@
   if (prtlev > 0) 
     cout << " ------------ Vector X = \n " << x << "\n" << endl; 
-  for(i=0; i<n; i++) x(i) = GauRnd(2., 1.5);
+  for(i=0; i<n; i++) x(i) = Gaussian(1.5,2.);
   b = a*x;
 

trunk/SophyaProg/Tests/tfft.cc

@@ -70 +70 @@
   if (inp_typ_random) 
     for (i=0; i<num ; i++){
-      ino[i] = in[i] = GauRnd(0., 1.);
+      ino[i] = in[i] = Gaussian(1.,0.);
       inc[i] = complex<T> (in[i], 0.);
     }

trunk/SophyaProg/Tests/timg.cc

@@ -34 +34 @@
 // Remplissage de l'image Tirage aleatoire plat entre 1000-2000
 for(i=0; i<300; i++)
-  for(j=0; j<200; j++) img(i,j) = imgo(i,j) =  frand01()*1000.+1000.;
+  for(j=0; j<200; j++) img(i,j) = imgo(i,j) =  drand01()*1000.+1000.;
 // Verification de la dynamique de l'image
 MeanSigma(img, mean, sig);

trunk/SophyaProg/Tests/tmtrnd.cc

@@ -81 +81 @@
   TVector<r_8> DATA(VSZ);
   {
-    Timer tm("f0_tmtrnd-GauRnd/drand01");
+    Timer tm("f0_tmtrnd-Gaussian/drand01");
     if (fgg) 
-      for(sa_size_t k=0; k<VSZ; k++)  DATA(k) = GauRnd(0., 1.);
+      for(sa_size_t k=0; k<VSZ; k++)  DATA(k) = Gaussian(1.,0.);
     else 
       for(sa_size_t k=0; k<VSZ; k++)  DATA(k) = drand01();
-    cout << "[2] f0_tmtrnd/ End of random generation using GauRnd()/drand01() " << endl;
+    cout << "[2] f0_tmtrnd/ End of random generation using Gaussian()/drand01() " << endl;
   }
   POutPersist po("data0.ppf");
@@ -102 +102 @@
 //  rg.GetSeed(seed,2);  // pour imprimer l'etat du generateur
   {
-    Timer tm("f0_tmtrnd-GauRnd/drand01");
+    Timer tm("f0_tmtrnd-Gaussian/drand01");
     if (fgg) 
       for(sa_size_t k=0; k<VSZ; k++)  DATA(k) = rg.Gaussian();
@@ -130 +130 @@
 //  rg.GetSeed(seed,2);  // pour imprimer l'etat du generateur
   {
-    Timer tm("f0_tmtrnd-GauRnd/drand01");
+    Timer tm("f0_tmtrnd-Gaussian/drand01");
     if (fgg) 
       for(sa_size_t k=0; k<VSZ; k++)  DATA(k) = rg.Gaussian();

trunk/SophyaProg/Tests/tsphereecp.cc

@@ -12 +12 @@
 #include "resusage.h"
 
+#include "randr48.h"
 #include "sphereecp.h"
 #include "fiosphereecp.h"
@@ -75 +76 @@
     }
     // Compute map from spectra
-    RandomGenerator rg; 
+    ThSDR48RandGen rg; 
     SphericalTransformServer<r_8> ylmserver(rg);
     SphereECP<r_8> map(256);

trunk/SophyaProg/Tests/zthr.cc

@@ -10 +10 @@
 #include "matharr.h"
 #include "tarrinit.h"
-#include "stsrand.h"
+#include "randr48.h"
 
 #include <stdlib.h>
@@ -63 +63 @@
 void randgenths(Array& mx, double sig)
 {
-  RandomGenerator rg;
+  ThSDR48RandGen rg; 
   for(sa_size_t j=0; j<mx.SizeY(); j++)   
     for(sa_size_t i=0; i<mx.SizeX(); i++) mx(i,j) = rg.Gaussian(sig);