Changeset 379 for trunk

Timestamp:

02/24/09 13:40:11 (3 years ago)

Author:

apdavison

Message:

Moved the test for RPy into the function within which it is used, to avoid importing it every time the module is used.

Files:

• trunk/src/stgen.py (modified) (3 diffs)

trunk/src/stgen.py

@@ -162 +162 @@
         if seed != None:
             self.rng.seed(seed)
+        self.rpy_checked = False
 
     def seed(self,seed):
@@ -283 +284 @@
         # return empty if no spikes
         if len(ps) == 0:
-            return SpikeTrain(numpy.array([]), t_start=t[0],t_stop=t_stop)
+            if array:
+                return numpy.array([])
+            else:
+                return SpikeTrain(numpy.array([]), t_start=t[0],t_stop=t_stop)
         
         # gen uniform rand on 0,1 for each spike
@@ -390 +394 @@
     # use slow python implementation for the time being
     # TODO: provide optimized C/weave implementation if possible
-
-
-    def _inh_gamma_generator_unimplemented(self, a, b, t, t_stop, array=False):
-        raise Exception("inh_gamma_generator is disabled as dependency RPy was not found.")
-
-    if check_dependency('rpy'):
-        inh_gamma_generator = _inh_gamma_generator_python
-    else:
-        inh_gamma_generator = _inh_gamma_generator_unimplemented
+      
+    def inh_gamma_generator(self, a, b, t, t_stop, array=False):
+        if not self.rpy_checked:
+            self.have_rpy = check_dependency('rpy')
+            self.rpy_checked = True
+        if self.have_rpy:
+            return self._inh_gamma_generator_python(a, b, t, t_stop, array)
+        else:
+            raise Exception("inh_gamma_generator is disabled as dependency RPy was not found.")