Changeset 713 for trunk/src/brian/cells.py

Timestamp:

02/17/10 22:45:18 (2 years ago)

Author:

apdavison

Message:

Moved standard model (cells and synapses) machinery out of the common module into its own module

Files:

• trunk/src/brian/cells.py (modified) (10 diffs)

trunk/src/brian/cells.py

@@ -5 +5 @@
 """
 
-from pyNN import common, cells, errors
+from pyNN import standardmodels, cells, errors
 #import brian_no_units_no_warnings
 from brian.library.synapses import *
@@ -16 +16 @@
     """Leaky integrate and fire model with fixed threshold and alpha-function-
     shaped post-synaptic current."""
-    translations = common.build_translations(
+    translations = standardmodels.build_translations(
         ('v_rest',     'v_rest',     mV),
         ('v_reset',    'v_reset'),
@@ -51 +51 @@
     excitatory and inhibitory synapses."""
     
-    translations = common.build_translations(
+    translations = standardmodels.build_translations(
         ('v_rest',     'v_rest',     mV),
         ('v_reset',    'v_reset'),
@@ -81 +81 @@
 
 class IF_cond_alpha(cells.IF_cond_alpha):
-    translations = common.build_translations(
+    translations = standardmodels.build_translations(
         ('v_rest',     'v_rest',     mV),
         ('v_reset',    'v_reset'),
@@ -117 +117 @@
     """Leaky integrate and fire model with fixed threshold and 
     exponentially-decaying post-synaptic conductance."""
-    translations = common.build_translations(
+    translations = standardmodels.build_translations(
         ('v_rest',     'v_rest',     mV),
         ('v_reset',    'v_reset'),
@@ -149 +149 @@
 
 
-class IF_facets_hardware1(common.ModelNotAvailable):
+class IF_facets_hardware1(standardmodels.ModelNotAvailable):
     """Leaky integrate and fire model with conductance-based synapses and fixed
     threshold as it is resembled by the FACETS Hardware Stage 1. For further
@@ -160 +160 @@
 class SpikeSourcePoisson(cells.SpikeSourcePoisson):
     """Spike source, generating spikes according to a Poisson process."""
-    translations = common.build_translations(
+    translations = standardmodels.build_translations(
         ('rate',     'rate'),
         ('start',    'start'),
@@ -189 +189 @@
 class SpikeSourceArray(cells.SpikeSourceArray):
     """Spike source generating spikes at the times given in the spike_times array."""
-    translations = common.build_translations(
+    translations = standardmodels.build_translations(
         ('spike_times', 'spiketimes', ms),
     )
@@ -202 +202 @@
         return super(SpikeSourceArray, cls).translate(parameters)
 
-class EIF_cond_alpha_isfa_ista(common.ModelNotAvailable):
-    pass
-
-
-class HH_cond_exp(common.ModelNotAvailable):
+class EIF_cond_alpha_isfa_ista(standardmodels.ModelNotAvailable):
+    pass
+
+
+class HH_cond_exp(standardmodels.ModelNotAvailable):
     pass
     
 #class HH_cond_exp(cells.HH_cond_exp):
 #    
-#    translations = common.build_translations(
+#    translations = standardmodels.build_translations(
 #        ('gbar_Na',    'gbar_Na'),   
 #        ('gbar_K',     'gbar_K'),    
@@ -259 +259 @@
 
 
-class SpikeSourceInhGamma(common.ModelNotAvailable):
-    pass
-
-
-class IF_cond_exp_gsfa_grr(common.ModelNotAvailable):
-    pass
+class SpikeSourceInhGamma(standardmodels.ModelNotAvailable):
+    pass
+
+
+class IF_cond_exp_gsfa_grr(standardmodels.ModelNotAvailable):
+    pass