Skip to content

Commit aec5820

Browse files
reformat
[skip ci]
1 parent 4e93e19 commit aec5820

File tree

5 files changed

+44
-26
lines changed

5 files changed

+44
-26
lines changed

src/interface/plots.jl

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,26 @@ function plot_df(df::DataFrames.DataFrame, t_ix = 1)
66
data_ = @view data[:, setdiff(1:size(data, 2), (t_ix,))]
77
colnames = reshape(DataFrames.names(df)[setdiff(1:size(data, 2), (t_ix,))], 1, :)
88

9-
Plots.plot(t, data_, labels = colnames, xlabel = "t")
9+
return Plots.plot(t, data_; labels = colnames, xlabel = "t")
1010
end
1111

1212
# plot reduction
13-
function AlgebraicAgents._draw(prob::ReactionNetworkProblem, vars = string.(prob.acs[:, :specName]); kwargs...)
13+
function AlgebraicAgents._draw(
14+
prob::ReactionNetworkProblem,
15+
vars = string.(prob.acs[:, :specName]);
16+
kwargs...,
17+
)
1418
p = plot()
1519
for var in vars
16-
p = plot!(p, prob.sol[!, "t"], prob.sol[!, var]; label="$var", xlabel="time", ylabel="quantity", kwargs...)
20+
p = plot!(
21+
p,
22+
prob.sol[!, "t"],
23+
prob.sol[!, var];
24+
label = "$var",
25+
xlabel = "time",
26+
ylabel = "quantity",
27+
kwargs...,
28+
)
1729
end
18-
p
30+
return p
1931
end

src/interface/solve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,4 @@ function plot_from_log(state, record_type, ixs; kwargs...)
198198
label = reshape(label, 1, :),
199199
kwargs...,
200200
)
201-
end
201+
end

src/solvers.jl

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ function evolve!(state)
148148

149149
reqs = get_reqs_init!(reqs, qs, state)
150150

151-
allocs =
152-
get_allocs!(reqs, state.u, state, state[:, :transPriority], state.p[:strategy])
151+
allocs = get_allocs!(reqs, state.u, state, state[:, :transPriority], state.p[:strategy])
153152

154153
qs .= get_init_satisfied(allocs, qs, state)
155154

@@ -168,7 +167,13 @@ function evolve!(state)
168167
for i = 1:nparts(state, :T)
169168
qs[i] != 0 && push!(
170169
state.ongoing_transitions,
171-
Transition(string(state[i, :transName]) * "_@$(state.t)", get_sampled_transition(state, i), state.t, qs[i], 0.0),
170+
Transition(
171+
string(state[i, :transName]) * "_@$(state.t)",
172+
get_sampled_transition(state, i),
173+
state.t,
174+
qs[i],
175+
0.0,
176+
),
172177
)
173178
end
174179

@@ -332,7 +337,7 @@ function ReactionNetworkProblem(
332337
transition_recipes = transitions
333338
u0_init = zeros(nparts(acs, :S))
334339

335-
for i in 1:nparts(acs, :S)
340+
for i = 1:nparts(acs, :S)
336341
if !isnothing(acs[i, :specName]) && haskey(u0, acs[i, :specName])
337342
u0_init[i] = u0[acs[i, :specName]]
338343
else
@@ -350,19 +355,17 @@ function ReactionNetworkProblem(
350355
) [:transLHS, :transRHS, :transToSpawn, :transHash]
351356
transitions = Dict{Symbol,Vector}(a => [] for a in transitions_attrs)
352357

353-
sol = DataFrame("t" => Float64[], (string(name) => Float64[] for name in acs[:, :specName])...)
358+
sol = DataFrame(
359+
"t" => Float64[],
360+
(string(name) => Float64[] for name in acs[:, :specName])...,
361+
)
354362
network = ReactionNetworkProblem(
355363
name,
356364
acs,
357365
attrs,
358366
transition_recipes,
359-
u0_init,
360-
merge(
361-
p,
362-
Dict(
363-
:strategy => get(keywords, :alloc_strategy, :weighted),
364-
),
365-
),
367+
u0_init,
368+
merge(p, Dict(:strategy => get(keywords, :alloc_strategy, :weighted))),
366369
keywords[:tspan][1],
367370
keywords[:tspan],
368371
get(keywords, :tstep, 1),
@@ -371,7 +374,7 @@ function ReactionNetworkProblem(
371374
log,
372375
observables,
373376
wrap_fun,
374-
sol
377+
sol,
375378
)
376379

377380
save!(network)
@@ -387,7 +390,7 @@ function AlgebraicAgents._reinit!(state::ReactionNetworkProblem)
387390
state.observables = compile_observables(state.acs)
388391
empty!(state.sol)
389392

390-
state
393+
return state
391394
end
392395

393396
function AlgebraicAgents._step!(state::ReactionNetworkProblem)
@@ -400,20 +403,24 @@ function AlgebraicAgents._step!(state::ReactionNetworkProblem)
400403

401404
push!(
402405
state.log,
403-
(:valuation, state.t, state.u' * [state[i, :specValuation] for i = 1:nparts(state, :S)]),
406+
(
407+
:valuation,
408+
state.t,
409+
state.u' * [state[i, :specValuation] for i = 1:nparts(state, :S)],
410+
),
404411
)
405412

406413
save!(state)
407414
return state.t += state.dt
408415
end
409416

410417
function AlgebraicAgents._projected_to(state::ReactionNetworkProblem)
411-
state.t > state.tspan[2] ? true : state.t
418+
return state.t > state.tspan[2] ? true : state.t
412419
end
413420

414421
function fetch_params(acs::ReactionNetworkSchema)
415422
return Dict{Symbol,Any}((
416423
acs[i, :prmName] => acs[i, :prmVal] for
417424
i in Iterators.filter(i -> !isnothing(acs[i, :prmVal]), 1:nparts(acs, :P))
418425
))
419-
end
426+
end

src/state.jl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ function init_u!(state::ReactionNetworkProblem)
7373
foreach(i -> u[i] = state[i, :specInitVal], 1:nparts(state, :S));
7474
state.u = u)
7575
end
76-
function save!(state::ReactionNetworkProblem)
77-
return push!(state.sol, (state.t, state.u[:]...))
78-
end
76+
save!(state::ReactionNetworkProblem) = push!(state.sol, (state.t, state.u[:]...))
7977

8078
function compile_observables(acs::ReactionNetworkSchema)
8179
observables = Dict{Symbol,Observable}()
@@ -224,4 +222,4 @@ set_params(state::ReactionNetworkProblem, vals...) =
224222
function add_to_spawn!(state::ReactionNetworkProblem, hash, n)
225223
ix = findfirst(ix -> state.transition_recipes[:transHash][ix] == hash)
226224
return !isnothing(ix) && (state.transition_recipes[:transHash][ix] += n)
227-
end
225+
end

tutorial/basics.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ simulate(prob)
1818
# access solution
1919
prob.sol
2020

21+
# plot solution
2122
draw(prob)

0 commit comments

Comments
 (0)