Changeset 1020 for trunk

Timestamp:

12/01/11 09:07:44 (6 months ago)

Author:

pierre

Message:

Nemo, neuron, nest, brian are now giving similar results for VABenchmark, and for the individual cell tests. Note that Brunel network leads to different results, I think because of the very high frequencies of the input neuron, with more than one spike per dt. Will finish the STDP in Nemo/Brian? soon, to have everything coherent

Location:

trunk/src

Files:

• common/procedural_api.py (modified) (1 diff)
• nemo/standardmodels/synapses.py (modified) (2 diffs)

trunk/src/common/procedural_api.py

@@ -63 +63 @@
         # recorder_list is used by end()
         if isinstance(source, BasePopulation):
-            simulator.recorder_list.append(source.recorders[variable])  # this is a bit hackish - better to add to Population.__del__?
+            if source.recorders[variable] not in simulator.recorder_list:
+                simulator.recorder_list.append(source.recorders[variable])  # this is a bit hackish - better to add to Population.__del__?
         if isinstance(source, Assembly):
             for population in source.populations:
-                simulator.recorder_list.append(population.recorders[variable])
+                if population.recorders[variable] not in simulator.recorder_list:
+                    simulator.recorder_list.append(population.recorders[variable])
     if variable == 'v':
         record.__name__ = "record_v"

trunk/src/nemo/standardmodels/synapses.py

@@ -23 +23 @@
                                                  for the purpose of STDP calculations all delays
                                                  are assumed to be axonal."""
-        standardmodels.STDPMechanism.__init__(self, timing_dependence, weight_dependence,
-                                      voltage_dependence, dendritic_delay_fraction)
+        super(STDPMechanism, self).__init__(timing_dependence, weight_dependence,
+                                            voltage_dependence, dendritic_delay_fraction)
 
 
@@ -70 +70 @@
         return numpy.exp(-numpy.arange(0., 30, precision)/self.parameters['tau_plus'])
 
-    def post_fire(self, precision=1):
+    def post_fire(self, precision=1.):
         return numpy.exp(-numpy.arange(0., 30, precision)/self.parameters['tau_minus'])