Update models which are used in the NESTML tutorial

src/test/resources/tutorial/21_rc_fire.nestml

@@ -7,7 +7,6 @@ neuron rc_fire:
   state:
     V_abs mV = 0mV
     alias V_m mV = V_abs + E_L
-
   end
 
   equations:
@@ -18,7 +17,7 @@ neuron rc_fire:
     E_L   mV = -70mV
     C_m   pF = 250pF
     tau_m ms = 10ms
-    I_syn pA = 0pA
+    I_syn pA = 10pA
     alias V_th mV =  -55mV - E_L
     alias V_reset mV =  -65mV - E_L
   end
@@ -31,7 +30,11 @@ neuron rc_fire:
 
   update:
     integrate(V_abs)
-
+    if V_abs > V_th:
+      V_abs = V_reset
+      emit_spike()
+    end
   end
 
+
 end

src/test/resources/tutorial/22_rc_refractory.nestml

@@ -1,6 +1,6 @@
 /*
   A straight forward implementation of the RC circuit approach.
-  Extends the integrate method with a threshold and fire behaviour.
+  Extends firing model with an additional refractory state. It is entered directly after a spike is fired.
 */
 neuron rc_refractory:
 
@@ -10,7 +10,7 @@ neuron rc_refractory:
   end
 
   equations:
-      V_abs' = -1/tau_m * V_abs + 1/C_m*I_syn
+    V_abs' = -1/tau_m * V_abs + 1/C_m*I_syn
   end
 
   parameter:
@@ -20,6 +20,8 @@ neuron rc_refractory:
     I_syn pA = 10pA
     alias V_th mV = -55mV - E_L
     alias V_reset mV = -65mV - E_L
+    refractory_timeout ms = 5ms
+    refractory_counts integer = 0
   end
 
   input:
@@ -29,10 +31,15 @@ neuron rc_refractory:
   output: spike
 
   update:
-    integrate(V_abs)
-    if V_abs > V_th:
-      V_abs = V_reset
-      emit_spike()
+    if refractory_counts == 0:
+      integrate(V_abs)
+      if V_abs > V_th:
+        V_abs = V_reset
+        emit_spike()
+        refractory_counts = steps(refractory_timeout)
+      end
+    else:
+      refractory_counts -= 1
     end
   end
 

src/test/resources/tutorial/23_rc_alpha.nestml

@@ -2,22 +2,27 @@
   A straight forward implementation of the RC circuit approach.
   Extends firing model with an additional refractory state. It is entered directly after a spike is fired.
 */
-neuron rc_refractory:
+neuron rc_alpha:
 
   state:
     V_abs mV = 0mV
     alias V_m mV = V_abs + E_L
+    g_in pA = 0pA    # inputs from the inh conductance
   end
 
   equations:
+    # alpha function for the g_in
+    g_in'' = -g_in'/tau_syn_in
+    g_in' = g_in' - g_in/tau_syn_in
+    I_syn pA = g_in
     V_abs' = -1/tau_m * V_abs + 1/C_m*I_syn
   end
 
   parameter:
     E_L   mV = -70mV
     C_m   pF = 250pF
     tau_m ms = 10ms
-    I_syn pA = 10pA
+
     alias V_th mV = -55mV - E_L
     alias V_reset mV = -65mV - E_L
     refractory_timeout ms = 5ms
@@ -28,6 +33,11 @@ neuron rc_refractory:
     spikes   <- spike
   end
 
+  internal:
+    tau_syn_in ms = 2ms
+    PSConInit_I real = 1.0 * e / tau_syn_in
+  end
+
   output: spike
 
   update:
@@ -41,6 +51,7 @@ neuron rc_refractory:
     else:
       refractory_counts -= 1
     end
+    g_in' += PSConInit_I*spikes.get_sum()
   end