Changeset 410

Timestamp:

07/14/08 16:08:37 (1 month ago)

Author:

apdavison

Message:

The attempted optimisation of setting parameter values in r408 broke the translation mechanism for those parameters whose values are computed from the values of more than one native parameter. It is for these "computed parameters" that we got all the native parameters.

I have fixed the bug while attempting to keep the optimisation by checking whether the list of parameters to be set contains any computed parameters, and only getting/translating all parameters in this case.

If the list contains only simple or scaled parameters, setting should be much faster.

Pierre, could you use your code profiling to check that this is the case?

Files:

• trunk/src/common.py (modified) (6 diffs)
• trunk/test/unittests/nest2tests.py (modified) (2 diffs)

trunk/src/common.py

@@ -125 +125 @@
-    def set_parameters(self, **parameters):
-        """Set cell parameters, given as a sequence of parameter=value arguments."""
-all_parameters = self.get_parameters()
-all_parameters.update(parameters)
+ if some of the parameters are computed from the values of other
+ parameters, need to get and translate all parameters
-        if self.is_standard_cell():
+            computed_parameters = self.cellclass.computed_parameters()
+            have_computed_parameters = any([p_name in computed_parameters for p_name in parameters])
+            if have_computed_parameters:     
+                all_parameters = self.get_parameters()
+                all_parameters.update(parameters)
+                parameters = all_parameters
-            parameters = self.cellclass.translate(parameters)
-        self.set_native_parameters(parameters)
@@ -315 +321 @@
-        parameters = cls.checkParameters(parameters, with_defaults=False)
-        native_parameters = {}
-
-
-
+
+
-            pname = D['translated_name']
-            try:
-                pval = eval(D['forward_transform'], globals(), parameters)
-
-%s in %s. Transform: %s. Parameters: %s.
-
+, errmsg
+Problem translating %s in %s. Transform: %s. Parameters: %s. %s
+, errmsg
-            except ZeroDivisionError:
-                pval = 1e30 # this is about the highest value hoc can deal with
@@ -1293 +1298 @@
-class FromListConnector(Connector):
-    """
-
-
+
-    """
-    
@@ -1304 +1308 @@
-class FromFileConnector(Connector):
-    """
-
-
+
-    """
-    
@@ -1316 +1319 @@
-class FixedNumberPostConnector(Connector):
-    """
-ostsynaptic cell receives a fixed number of connections, chosen
-randomly from the presynaptic cells
+re-synaptic neuron is connected to exactly n post-synaptic neurons
+chosen at random
-    """
-    
@@ -1337 +1340 @@
-class FixedNumberPreConnector(Connector):
-    """
-Connects all cells in the postsynaptic population to fixed number of
-ells in the presynaptic population, randomly choosen
+Each post-synaptic neuron is connected to exactly n pre-synaptic neurons
+hosen at random
-    """
-    def __init__(self, n, allow_self_connections=True, weights=0.0, delays=None):

trunk/test/unittests/nest2tests.py

@@ -610 +610 @@
-        self.pop1 = nest.Population((5,),nest.IF_curr_alpha,{'tau_m':10.0})
-        self.pop2 = nest.Population((5,4),nest.IF_curr_exp,{'v_reset':-60.0})
+        self.pop3 = nest.Population((10,), nest.IF_cond_alpha)
-    
-    def testIDSetAndGet(self):
-        self.pop1[3].tau_m = 20.0
-        self.pop2[3,2].v_reset = -70.0
+        self.pop3[5].tau_m = -55.0
-        ifcell_params = nest.nest.GetStatus([self.pop1[3]])[0]
-        self.assertEqual(20.0, ifcell_params['tau_m'])
@@ -620 +622 @@
-        self.assertEqual(-70.0, self.pop2[3,2].v_reset)
-        self.assertEqual(-60.0, self.pop2[0,0].v_reset)
+        self.assertAlmostEqual(-55.0, self.pop3[5].tau_m, 9)
-
-    def testGetCellClass(self):