Changeset 475 for trunk

Timestamp:

11/11/10 14:13:19 (19 months ago)

Author:

emuller

Message:

Get rid of annoying 'scipy missing' message when using NeuroTools.parameters

Files:

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

trunk/src/random.py

@@ -19 +19 @@
 import numpy, numpy.random
 
-have_scipy = check_dependency('scipy')
-
-    
+  
 class ParameterDist(object):
 
@@ -67 +65 @@
         either mean,var ('ms', the default) or a,b ('ab')
         """
+
+        if check_dependency('scipy'):
+            self.next = self._next_scipy
+
         self.repr_mode = repr_mode
         if 'm' in params and mean==None:
@@ -93 +95 @@
         self.dist_name = 'GammaDist'
 
-    if have_scipy:
+    def _next_scipy(self,n=1):
         import scipy.stats
-        def next(self,n=1):
-            return scipy.stats.gamma.rvs(self.params['a'],size=n)*self.params['b']
-    else:
-        def next(self,n=1):
-            raise Exception('Error scipy was not found at import time.  GammaDist realization disabled.')
-        
+        return scipy.stats.gamma.rvs(self.params['a'],size=n)*self.params['b']
+    def _next_no_scipy(self,n=1):
+        raise Exception('Error scipy was not found at import time.  GammaDist realization disabled.')
+
+    next = _next_no_scipy
+    
     def mean(self):
         return self.params['a']*self.params['b']
@@ -119 +121 @@
     mean + std
     
-    Generally the distribution is implemented
-    by scipy.stats.gamma.pdf(x/b,a)/b
-
-    For more info, in ipython type:
-    >>> ? scipy.stats.gamma 
-
     """