@@ -1954,7 +1954,8 @@ function SynapseProblem(
19541954 p_synapse,
19551955 nu,
19561956 algo::T,
1957- agg = nothing;
1957+ agg = nothing
1958+ vr_agg = VR_FRM();
19581959 saveat = [],
19591960 save_everystep = isempty(saveat),
19601961 kwargs...,
@@ -2127,7 +2128,8 @@ function SynapseProblem(
21272128 p_synapse,
21282129 nu,
21292130 algo,
2130- agg;
2131+ agg
2132+ vr_agg;
21312133 jumps = nothing,
21322134 save_positions = (false, true),
21332135 saveat = [],
@@ -2158,6 +2160,7 @@ function SynapseProblem(
21582160 oprob,
21592161 agg,
21602162 jumps;
2163+ vr_aggregator = vr_agg,
21612164 dep_graph,
21622165 save_positions,
21632166 saveat,
@@ -2185,7 +2188,8 @@ function evolveSynapse(
21852188 is_glu_released,
21862189 nu,
21872190 algos,
2188- agg = nothing;
2191+ agg = nothing
2192+ vr_agg = VR_FRM();
21892193 progress = false,
21902194 abstol = 1e-8,
21912195 reltol = 1e-7,
@@ -2204,7 +2208,8 @@ function evolveSynapse(
22042208 is_glu_released,
22052209 nu,
22062210 algos,
2207- agg;
2211+ agg
2212+ vr_agg;
22082213 progress,
22092214 abstol,
22102215 reltol,
@@ -2227,7 +2232,8 @@ function evolveSynapse_noformat(
22272232 is_glu_released,
22282233 nu,
22292234 algos,
2230- agg = nothing;
2235+ agg = nothing
2236+ vr_agg = VR_FRM();
22312237 progress = false,
22322238 abstol = 1e-8,
22332239 reltol = 1e-7,
@@ -2273,7 +2279,8 @@ function evolveSynapse_noformat(
22732279 p_synapse,
22742280 nu,
22752281 algos[1],
2276- agg;
2282+ agg
2283+ vr_agg;
22772284 jumps,
22782285 reltol,
22792286 abstol,
@@ -2295,7 +2302,8 @@ function evolveSynapse_noformat(
22952302 p_synapse,
22962303 nu,
22972304 algos[2],
2298- agg;
2305+ agg
2306+ vr_agg;
22992307 jumps,
23002308 reltol,
23012309 abstol,
@@ -2415,12 +2423,35 @@ const algorithms = (
24152423 (
24162424 label = "PDMP",
24172425 agg = nothing,
2426+ vr_agg = VR_FRM(),
24182427 solver = (CHV(solver), CHV(solver)),
24192428 saveat = [],
24202429 ),
24212430 (
24222431 label = "Coevolve",
24232432 agg = Coevolve(),
2433+ vr_agg = VR_FRM(),
2434+ solver = (solver, solver),
2435+ saveat = 1 / p_synapse.sampling_rate,
2436+ ),
2437+ (
2438+ label = "VR_Direct",
2439+ agg = Coevolve(),
2440+ vr_agg = VR_Direct(),
2441+ solver = (solver, solver),
2442+ saveat = 1 / p_synapse.sampling_rate,
2443+ ),
2444+ (
2445+ label = "VR_DirectFW",
2446+ agg = Coevolve(),
2447+ vr_agg = VR_DirectFW(),
2448+ solver = (solver, solver),
2449+ saveat = 1 / p_synapse.sampling_rate,
2450+ ),
2451+ (
2452+ label = "VR_FRM",
2453+ agg = Coevolve(),
2454+ vr_agg = VR_FRM(),
24242455 solver = (solver, solver),
24252456 saveat = 1 / p_synapse.sampling_rate,
24262457 ),
@@ -2445,7 +2476,8 @@ for algo in algorithms
24452476 [true],
24462477 nu,
24472478 algo.solver,
2448- algo.agg;
2479+ algo.agg
2480+ alg.vr_agg;
24492481 save_positions = (false, true),
24502482 saveat = algo.saveat,
24512483 save_everystep = false,
@@ -2491,7 +2523,8 @@ for algo in algorithms
24912523 [true],
24922524 nu,
24932525 $(algo).solver,
2494- $(algo).agg;
2526+ $(algo).agg
2527+ $(algo).vr_agg;
24952528 save_positions = (false, true),
24962529 saveat = $(algo).saveat,
24972530 save_everystep = false,
0 commit comments