improve handling of NEST synaptic delay parameter

nest · Sep 13, 2023 · 4ed4225 · 4ed4225
1 parent 46670cb
commit 4ed4225
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 8 deletions.
diff --git a/models/neurons/wb_cond_multisyn.nestml b/models/neurons/wb_cond_multisyn.nestml
@@ -29,7 +29,6 @@ wb_cond_multisyn
 neuron wb_cond_multisyn:
     state:
         r integer = 0 # number of steps in the current refractory phase
-
         V_m mV = -65. mV # Membrane potential
         Inact_h real = alpha_h_init / ( alpha_h_init + beta_h_init )    # Inactivation variable h for Na
         Act_n real = alpha_n_init / (alpha_n_init + beta_n_init)  # Activation variable n for K

diff --git a/tests/invalid/CoCoPrioritiesCorrectlySpecified.nestml b/tests/invalid/CoCoPrioritiesCorrectlySpecified.nestml
@@ -39,3 +39,7 @@ synapse CoCoPrioritiesCorrectlySpecified:
 
     onReceive(post_spikes, priority=1):
         print("onReceive post_spikes")
+
+    parameters:
+        w real = 1.  @nest::weight
+        d ms = 1 ms  @nest::delay
diff --git a/tests/invalid/CoCoResolutionLegallyUsed.nestml b/tests/invalid/CoCoResolutionLegallyUsed.nestml
@@ -41,4 +41,6 @@ synapse CoCoResolutionLegallyUsed:
         return w
 
     parameters:
+        w real = 1.  @nest::weight
+        d ms = 1 ms  @nest::delay
         tau ms = 10 ms
diff --git a/tests/nest_tests/resources/TimeVariableSynapse.nestml b/tests/nest_tests/resources/TimeVariableSynapse.nestml
@@ -1,4 +1,4 @@
-""" 
+"""
 TimeVariableSynapse.nestml
 ##########################
 
@@ -32,7 +32,8 @@ synapse time_variable_synapse:
     y = t
 
   parameters:
-    d ms = 1 ms @nest::delay
+    w real = 1.   @nest::weight
+    d ms = 1 ms   @nest::delay
 
   input:
     pre_spikes <- spike

diff --git a/tests/nest_tests/resources/dopa_synapse_second_order.nestml b/tests/nest_tests/resources/dopa_synapse_second_order.nestml
@@ -36,13 +36,14 @@ synapse dopa_synapse_second_order:
         dopa_rate_d real = 0.
 
     parameters:
+        w real = 1.  @nest::weight
+        d ms = 1 ms  @nest::delay
         tau_dopa ms = 100 ms
-        d ms = 1 ms    @nest::delay
 
     equations:
         dopa_rate' = dopa_rate_d / ms
         dopa_rate_d' = -dopa_rate / tau_dopa**2 * ms - 2 * dopa_rate_d / tau_dopa
-     
+
     input:
         pre_spikes <- spike
         dopa_spikes <- spike
@@ -52,6 +53,6 @@ synapse dopa_synapse_second_order:
 
     onReceive(dopa_spikes):
         dopa_rate_d += 1. / tau_dopa
-        
+
     onReceive(pre_spikes):
         deliver_spike(1., 1 ms)
diff --git a/tests/resources/SynapseEventSequenceTest.nestml b/tests/resources/SynapseEventSequenceTest.nestml
@@ -30,6 +30,10 @@ You should have received a copy of the GNU General Public License
 along with NEST.  If not, see <http://www.gnu.org/licenses/>.
 """
 synapse SynapseEventSequenceTest:
+    parameters:
+        w real = 1.  @nest::weight
+        d ms = 1 ms  @nest::delay
+
     state:
         tr real = 1.
 

diff --git a/tests/resources/synapse_event_inv_priority_test.nestml b/tests/resources/synapse_event_inv_priority_test.nestml
@@ -34,7 +34,8 @@ synapse synapse_event_inv_priority_test:
         tr real = 1.
 
     parameters:
-        d ms = 1. ms  @nest::delay
+        w real = 1.  @nest::weight
+        d ms = 1 ms  @nest::delay
 
     input:
         pre_spikes <- spike

diff --git a/tests/resources/synapse_event_priority_test.nestml b/tests/resources/synapse_event_priority_test.nestml
@@ -34,7 +34,8 @@ synapse synapse_event_priority_test:
         tr real = 1.
 
     parameters:
-        d ms = 1. ms  @nest::delay
+        w real = 1.  @nest::weight
+        d ms = 1 ms  @nest::delay
 
     input:
         pre_spikes <- spike

diff --git a/tests/valid/CoCoPrioritiesCorrectlySpecified.nestml b/tests/valid/CoCoPrioritiesCorrectlySpecified.nestml
@@ -30,6 +30,10 @@ You should have received a copy of the GNU General Public License
 along with NEST.  If not, see <http://www.gnu.org/licenses/>.
 """
 synapse CoCoPrioritiesCorrectlySpecified:
+    parameters:
+        w real = 1.  @nest::weight
+        d ms = 1 ms  @nest::delay
+
     input:
         pre_spikes <- spike
         post_spikes <- spike

diff --git a/tests/valid/CoCoResolutionLegallyUsed.nestml b/tests/valid/CoCoResolutionLegallyUsed.nestml
@@ -31,6 +31,7 @@ along with NEST.  If not, see <http://www.gnu.org/licenses/>.
 """
 synapse CoCoResolutionLegallyUsed:
     parameters:
+        w real = 1.  @nest::weight
         d ms = 1 ms  @nest::delay
         a ms = resolution()