Changeset 980

Timestamp:

06/21/11 12:26:19 (11 months ago)

Author:

pierre

Message:

Minor bug with non uniform nor clipped distribution when launched with parallel_safe as True. The whole stuffs is slower, but correct now

Files:

• trunk/src/random.py (modified) (2 diffs)

trunk/src/random.py

@@ -214 +214 @@
             self.rng = NumpyRNG()
         
-    def next(self, n=1, mask_local=None):
+    def next(self, n=1, mask_local=None):        
         """Return n random numbers from the distribution."""
         res = self.rng.next(n=n,
@@ -228 +228 @@
                 if len(res) == 1:
                     while not ((res > self.min_bound) and (res < self.max_bound)):
-                        res = self.rng.next(n=n, distribution=self.name, parameters=self.parameters)
+                        res = self.rng.next(n=n, distribution=self.name, parameters=self.parameters, mask_local=mask_local)
                     return res
                 else:
                     idx = numpy.where((res > self.max_bound) | (res < self.min_bound))[0]
                     while len(idx) > 0:
-                        res[idx] = self.rng.next(len(idx), distribution=self.name, parameters=self.parameters)
+                        res[idx] = self.rng.next(n=n, distribution=self.name, parameters=self.parameters, mask_local=mask_local)[idx]
                         idx = numpy.where((res > self.max_bound) | (res < self.min_bound))[0]
                     return res