@@ -1640,7 +1640,7 @@ function J_synapse(p_synapse::SynapseParams, nu)
16401640
16411641 # we order the jumps in their order they appear in the dependency graph
16421642 jumps = JumpSet(;
1643- constant_jumps = [
1643+ constant_jumps = (
16441644 # AMPA
16451645 #2line-GO
16461646 @j_jump(1, p_synapse, nu, 4 * AMPA_k1 * p.Glu * p.xd[1]), # 1
@@ -1740,8 +1740,8 @@ function J_synapse(p_synapse::SynapseParams, nu)
17401740 @j_jump(97, p_synapse, nu, GABA_r_c1 * p.xd[49]), # 97
17411741 @j_jump(98, p_synapse, nu, GABA_r_ro2 * p.xd[48]), # 98
17421742 @j_jump(99, p_synapse, nu, GABA_r_c2 * p.xd[50]), # 99
1743- ] ,
1744- variable_jumps = [
1743+ ) ,
1744+ variable_jumps = (
17451745 # R-type VGCC
17461746 @j_jump(
17471747 56,
@@ -1913,7 +1913,7 @@ function J_synapse(p_synapse::SynapseParams, nu)
19131913 @j_jump(77, p_synapse, nu, p.xd[37] * P_rate, 1, typemax(Float64)), # 77
19141914 @j_jump(78, p_synapse, nu, p.xd[36] * P_rate, 1, typemax(Float64)), # 78
19151915 @j_jump(79, p_synapse, nu, p.xd[38] * D_rate, 1, typemax(Float64)), # 79
1916- ] ,
1916+ ) ,
19171917 )
19181918
19191919 return jumps
@@ -2428,22 +2428,29 @@ const algorithms = (
24282428 saveat = [],
24292429 ),
24302430 (
2431- label = "Coevolve(VR_FRM) ",
2431+ label = "Coevolve",
24322432 agg = Coevolve(),
24332433 vr_agg = VR_FRM(),
24342434 solver = (solver, solver),
24352435 saveat = 1 / p_synapse.sampling_rate,
24362436 ),
24372437 (
2438- label = "Coevolve(VR_Direct)",
2439- agg = Coevolve(),
2438+ label = "Direct(VR_FRM)",
2439+ agg = Direct(),
2440+ vr_agg = VR_FRM(),
2441+ solver = (solver, solver),
2442+ saveat = 1 / p_synapse.sampling_rate,
2443+ ),
2444+ (
2445+ label = "Direct(VR_Direct)",
2446+ agg = Direct(),
24402447 vr_agg = VR_Direct(),
24412448 solver = (solver, solver),
24422449 saveat = 1 / p_synapse.sampling_rate,
24432450 ),
24442451 (
2445- label = "Coevolve (VR_DirectFW)",
2446- agg = Coevolve (),
2452+ label = "Direct (VR_DirectFW)",
2453+ agg = Direct (),
24472454 vr_agg = VR_DirectFW(),
24482455 solver = (solver, solver),
24492456 saveat = 1 / p_synapse.sampling_rate,
0 commit comments