Fixed missing noise variant of add_RK

miscco · Sep 13, 2016 · 314de67 · 314de67
1 parent e0e9377
commit 314de67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Cortical_Column.cpp b/Cortical_Column.cpp
@@ -152,8 +152,8 @@ void Cortical_Column::add_RK(void) {
     add_RK(s_ei);
     add_RK(s_gp);
     add_RK(s_gi);
-    add_RK(x_ep);
-    add_RK(x_ei);
+    add_RK_noise(x_ep, 0);
+    add_RK_noise(x_ei, 1);
     add_RK(x_gp);
     add_RK(x_gi);
 
@@ -172,6 +172,3 @@ void Cortical_Column::iterate_ODE(void) {
     }
     add_RK();
 }
-/******************************************************************************/
-/*                                  end                                       */
-/******************************************************************************/
diff --git a/Cortical_Column.h b/Cortical_Column.h
@@ -43,7 +43,6 @@ class Cortical_Column {
     void	set_input	(double I) {input = I;}
     void	iterate_ODE	(void);
 private:
-    /* Initialize the RNGs */
     void 	set_RNG		(void);
 
     /* Firing rates */
@@ -73,11 +72,15 @@ class Cortical_Column {
     /* Helper functions */
     inline std::vector<double> init (double value)
     {return {value, 0.0, 0.0, 0.0, 0.0};}
+
     inline void add_RK (std::vector<double>& var)
     {var[0] = (-3*var[0] + 2*var[1] + 4*var[2] + 2*var[3] + var[4])/6;}
 
+    inline void add_RK_noise (std::vector<double>& var, unsigned noise)
+    {var[0] = (-3*var[0] + 2*var[1] + 4*var[2] + 2*var[3] + var[4])/6 + noise_aRK(noise);}
+
     /* Random number generators */
-    std::vector<random_stream_normal>        MTRands;
+    std::vector<random_stream_normal> MTRands;
 
     /* Container for noise */
     std::vector<double>	Rand_vars;