Changeset 1614

Timestamp:

Nov 5, 2008, 9:08:55 PM (15 years ago)

Author:

Peter

Message:

implementing copying in RNG_state. Previously compiler generated versions were used which was not sound. Also disallowed assignment of singleton RNG. Assignment of a singleton class does not make sense.

Location:

trunk/yat/random

Files:

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

trunk/yat/random/random.cc

@@ -25 +25 @@
 #include "yat/utility/Exception.h"
 
+#include <cassert>
 #include <fstream>
 #include <sstream>
@@ -115 +116 @@
   RNG_state::RNG_state(const RNG* rng)
   {
-    if (!(rng_ = gsl_rng_clone(rng->rng())))
-      throw utility::GSL_error("RNG_state::RNG_state failed to allocate memory");
+    clone(*rng->rng());
+  }
+  
+
+  RNG_state::RNG_state(const RNG_state& state)
+  {
+    clone(*state.rng());
   }
   
@@ -129 +135 @@
   {
     return rng_;
+  }
+
+
+  void RNG_state::clone(const gsl_rng& rng)
+  {
+    assert(rng_!=&rng);
+    if (!(rng_ = gsl_rng_clone(&rng)))
+      throw utility::GSL_error("RNG_state::RNG_state failed to allocate memory");
+  }
+
+  RNG_state& RNG_state::operator=(const RNG_state& rhs)
+  {
+    if (this != &rhs) {
+      gsl_rng_free(rng_);
+      clone(*rhs.rng());
+    }
+    return *this;
   }
 

trunk/yat/random/random.h

@@ -154 +154 @@
     RNG(const RNG&);
 
+    /**
+       There can be only one RNG so assignment is always
+       self-assignment and we do not allow it
+    */
+    RNG& operator=(const RNG&);
+
     virtual ~RNG(void);
 
@@ -172 +178 @@
     RNG_state(const RNG*);
 
+    /**
+       Copy Constructor
+
+       \since Explicitely declared since yat 0.5
+     */
+    RNG_state(const RNG_state&);
+
     ///
     /// @brief Destructor
@@ -182 +195 @@
     const gsl_rng* rng(void) const;
 
+    /**
+       Assignment operator
+
+       \since Explicitely declared since yat 0.5
+     */
+    RNG_state& operator=(const RNG_state&);
+
   private:
     gsl_rng* rng_;
 
+    void clone(const gsl_rng&);
   };