Changeset 394

Timestamp:

06/26/08 11:15:39 (5 months ago)

Author:

apdavison

Message:

Fixed a couple of bugs in neuron2: delays not getting set properly to default values if not set explicitly, tau_m incorrectly set if cm set at the same time.

Files:

• trunk/src/common.py (modified) (1 diff)
• trunk/src/neuron2/__init__.py (modified) (1 diff)
• trunk/src/neuron2/cells.py (modified) (1 diff)

trunk/src/common.py

@@ -634 +634 @@
-def get_min_delay():
-    """Return the minimum allowed synaptic delay."""
-eturn 1e12
+aise Exception("common.get_min_delay() must be overridden by a simulator-specific function")
-
-def get_max_delay():
-    """Return the maximum allowed synaptic delay."""
-eturn -1e12
+aise Exception("common.get_max_delay() must be overridden by a simulator-specific function")
-
-def num_processes():

trunk/src/neuron2/__init__.py

@@ -73 +73 @@
-def get_min_delay():
-    return simulator.state.min_delay
-#
+
-
-def num_processes():

trunk/src/neuron2/cells.py

@@ -78 +78 @@
-        
-        # process arguments
-tau_m', 'cm', 'v_rest', 'v_thresh', 't_refrac',
+cm', 'tau_m', 'v_rest', 'v_thresh', 't_refrac',   # 'cm' must come before 'tau_m'
-                                'i_offset', 'v_reset', 'v_init', 'tau_e', 'tau_i']
-        if syn_type == 'conductance':