Changeset 850 in Sophya for trunk/SophyaLib/TArray/utilarr.cc

Timestamp:

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

Author:

ansari

Message:

Corrections divers + RansomSequence - Reza 10/4/2000

File:

• trunk/SophyaLib/TArray/utilarr.cc (modified) (1 diff)

trunk/SophyaLib/TArray/utilarr.cc

@@ -4 +4 @@
 #include "machdefs.h"
 #include "utilarr.h"
+#include "srandgen.h"
 
 // Classe utilitaires
+
+RandomSequence::RandomSequence(int typ, double m, double s)
+{
+  typ_ = (typ == Flat) ? Flat : Gaussian;
+  mean_ = m;
+  sig_ = s;
+}
+
+double RandomSequence::Rand()
+{
+  if (typ_ == Flat) 
+    return(drandpm1()*sig_ + mean_);
+  else return(GauRnd(mean_, sig_));
+}
+
+
 Sequence::Sequence(double start, double step, Arr_DoubleFunctionOfX f)
+  : rseq_(RandomSequence::Gaussian)
 {
   start_ = start;
   step_ = step;
   myf_ = f;
+  fgrseq_ = false;
+}
+
+Sequence::Sequence(RandomSequence rseq)
+{
+  start_ = 0.;
+  step_ = 1.;
+  myf_ = NULL;  
+  rseq_ = rseq;
+  fgrseq_ = true;
 }
 
 double Sequence::operator () (uint_4 k)
 {
-  double x = start_+(double)k*step_;
-  if (myf_)  return(myf_(x));
-  return x;
+  if (fgrseq_) return(rseq_.Rand());
+  else {
+    double x = start_+(double)k*step_;
+    if (myf_)  return(myf_(x));
+    else return x;
+  }
 }