Changeset 1616 for trunk/yat/random

Timestamp:

Nov 5, 2008, 10:36:48 PM (15 years ago)

Author:

Peter

Message:

fixes #459

Location:

trunk/yat/random

Files:

• random.cc (modified) (1 diff)
• random.h (modified) (3 diffs)

trunk/yat/random/random.cc

@@ -180 +180 @@
 
   DiscreteGeneral::DiscreteGeneral(const statistics::Histogram& hist)
-  {
-    double* p = new double[ hist.nof_bins() ];
+    : gen_(NULL)
+  {
+    p_.reserve(hist.nof_bins());
     for (size_t i=0; i<hist.nof_bins(); i++) 
-      p[ i ] = hist[i];
-    gen_ = gsl_ran_discrete_preproc( hist.nof_bins(), p );
-    delete p;
-    if (!gen_)
-      throw utility::GSL_error("DiscreteGeneral::DiscreteGeneral failed to setup generator.");
+      p_.push_back(hist[i]);
+    preproc();
+  }
+
+
+  DiscreteGeneral::DiscreteGeneral(const DiscreteGeneral& other)
+    : gen_(NULL), p_(other.p_)
+  {
+    preproc();
   }
 
 
   DiscreteGeneral::~DiscreteGeneral(void)
+  {
+    free();
+  }
+
+
+  void DiscreteGeneral::free(void)
   {
     if (gen_)
       gsl_ran_discrete_free( gen_ );
     gen_ = NULL;
+  }
+
+
+  void DiscreteGeneral::preproc(void)
+  {
+    assert(!gen_);
+    assert(p_.size());
+    gen_ = gsl_ran_discrete_preproc( p_.size(), &p_.front() );
+    if (!gen_)
+      throw utility::GSL_error("DiscreteGeneral failed to setup generator.");
+  }
+
+
+  DiscreteGeneral& DiscreteGeneral::operator=(const DiscreteGeneral& rhs)
+  {
+    free();
+    p_ = rhs.p_;
+    preproc();
+    return *this;
   }
 

trunk/yat/random/random.h

@@ -31 +31 @@
 #include <algorithm>
 #include <string>
+#include <vector>
 
 namespace theplu {
@@ -275 +276 @@
     DiscreteGeneral(const statistics::Histogram& hist);
     
+    /**
+       \brief Copy constructor
+
+       \since Explicitely implemented in yat 0.5
+     */
+    DiscreteGeneral(const DiscreteGeneral&);
+
     ///
     /// @brief Destructor
@@ -290 +298 @@
     unsigned long operator()(void) const;
 
-  private:
-     gsl_ran_discrete_t* gen_;
+    /**
+       \brief Assignment operator
+
+       \since Explicitely implemented in yat 0.5
+     */
+    DiscreteGeneral& operator=(const DiscreteGeneral&);
+
+  private:
+    void free(void);
+    void preproc(void);
+
+    gsl_ran_discrete_t* gen_;
+    std::vector<double> p_;
   };