Changeset 2118 for trunk/brian/monitor.py

Timestamp:

09/08/10 17:23:13 (21 months ago)

Author:

bfontaine

Message:

updated van Rossum metric

Files:

• trunk/brian/monitor.py (modified) (2 diffs)

trunk/brian/monitor.py

@@ -1252 +1252 @@
         StateMonitor.__init__(self,kernel, 'v', record=True)
         self.contained_objects=[kernel,C]
-        self.distance_matrix=zeros((self.nbr_neurons,self.nbr_neurons))  
+        #self.distance_matrix=zeros((self.nbr_neurons,self.nbr_neurons))  
                
     def reinit(self):
@@ -1299 +1299 @@
             }
             '''
-            #tt=time() 
+            tt=time() 
             weave.inline(code, ['nbr_time_step','nbr_neurons','dt','tau','distance_matrix','traces'],
                          compiler=_cpp_compiler,
                          extra_compile_args=_extra_compile_args)
-           # print time()-tt
+            print time()-tt
             return tril(distance_matrix,k=0)+tril(distance_matrix,k=0).T
         else: