Merge pull request #485 from PrincetonUniversity/fix/FHN-integrator/f…

…n-params-on-LC Fix/fhn integrator/fn params on lc
PrincetonUniversity · Sep 29, 2017 · 044293a · 044293a
2 parents ada0f63 + 1ea5333
commit 044293a
Showing 1 changed file with 55 additions and 1 deletion.
diff --git a/PsyNeuLink/Library/Subsystems/AGT/LCControlMechanism.py b/PsyNeuLink/Library/Subsystems/AGT/LCControlMechanism.py
@@ -508,6 +508,24 @@ def __init__(self,
                  # modulated_mechanisms:tc.optional(tc.any(list,str)) = None,
                  modulated_mechanisms=None,
                  modulation:tc.optional(_is_modulation_param)=ModulationParam.MULTIPLICATIVE,
+                 initial_w_FHN=0.0,
+                 initial_v_FHN=0.0,
+                 time_step_size_FHN=0.1,
+                 t_0_FHN=0.0,
+                 a_v_FHN=-1 / 3,
+                 b_v_FHN=0.0,
+                 c_v_FHN=1.0,
+                 d_v_FHN=0.0,
+                 e_v_FHN=-1.0,
+                 f_v_FHN=1.0,
+                 time_constant_v_FHN=1.0,
+                 a_w_FHN=1.0,
+                 b_w_FHN=-0.8,
+                 c_w_FHN=0.7,
+                 threshold_FHN=-1.0,
+                 time_constant_w_FHN=12.5,
+                 mode_FHN=1.0,
+                 uncorrelated_activity_FHN=0.0,
                  params=None,
                  name=None,
                  prefs:is_pref_set=None,
@@ -518,11 +536,47 @@ def __init__(self,
                                                   objective_mechanism=objective_mechanism,
                                                   modulated_mechanisms=modulated_mechanisms,
                                                   modulation=modulation,
+                                                  initial_v_FHN=initial_v_FHN,
+                                                  initial_w_FHN=initial_w_FHN,
+                                                  time_step_size_FHN=time_step_size_FHN,
+                                                  t_0_FHN=t_0_FHN,
+                                                  a_v_FHN=a_v_FHN,
+                                                  b_v_FHN=b_v_FHN,
+                                                  c_v_FHN=c_v_FHN,
+                                                  d_v_FHN=d_v_FHN,
+                                                  e_v_FHN=e_v_FHN,
+                                                  f_v_FHN=f_v_FHN,
+                                                  time_constant_v_FHN=time_constant_v_FHN,
+                                                  a_w_FHN=a_w_FHN,
+                                                  b_w_FHN=b_w_FHN,
+                                                  c_w_FHN=c_w_FHN,
+                                                  threshold_FHN=threshold_FHN,
+                                                  mode_FHN=mode_FHN,
+                                                  uncorrelated_activity_FHN=uncorrelated_activity_FHN,
+                                                  time_constant_w_FHN=time_constant_w_FHN,
                                                   params=params)
 
         super().__init__(system=system,
                          objective_mechanism=objective_mechanism,
-                         function=FHNIntegrator,
+                         function=FHNIntegrator(initial_v=initial_v_FHN,
+                                                  initial_w=initial_w_FHN,
+                                                  time_step_size=time_step_size_FHN,
+                                                  t_0=t_0_FHN,
+                                                  a_v=a_v_FHN,
+                                                  b_v=b_v_FHN,
+                                                  c_v=c_v_FHN,
+                                                  d_v=d_v_FHN,
+                                                  e_v=e_v_FHN,
+                                                  f_v=f_v_FHN,
+                                                  time_constant_v=time_constant_v_FHN,
+                                                  a_w=a_w_FHN,
+                                                  b_w=b_w_FHN,
+                                                  c_w=c_w_FHN,
+                                                  threshold=threshold_FHN,
+                                                  mode=mode_FHN,
+                                                  uncorrelated_activity=uncorrelated_activity_FHN,
+                                                  time_constant_w=time_constant_w_FHN,
+                         ),
                          modulation=modulation,
                          params=params,
                          name=name,