Skip to content

Commit 5fedf7f

Browse files
Merge pull request #1178 from ChrisRackauckas/fix-formatting
Apply JuliaFormatter to fix code formatting
2 parents 90aacf2 + b4097c4 commit 5fedf7f

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

src/callbacks.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ has_continuous_callback(cb::DiscreteCallback) = false
5050
has_continuous_callback(cb::ContinuousCallback) = true
5151
has_continuous_callback(cb::VectorContinuousCallback) = true
5252
has_continuous_callback(cb::CallbackSet) = !isempty(cb.continuous_callbacks)
53-
has_continuous_callback(cb::Nothing) = false#======================================================##======================================================#
53+
has_continuous_callback(cb::Nothing) = false #======================================================#
5454

5555
# Callback handling
5656

src/solve.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ function build_null_solution(prob::AbstractDEProblem, args...;
719719
save_everystep = true,
720720
save_on = true,
721721
save_start = save_everystep || isempty(saveat) ||
722-
saveat isa Number || prob.tspan[1] in saveat,
722+
saveat isa Number || prob.tspan[1] in saveat,
723723
save_end = true,
724724
kwargs...)
725725
ts = if saveat === ()
@@ -752,7 +752,7 @@ function build_null_solution(
752752
save_everystep = true,
753753
save_on = true,
754754
save_start = save_everystep || isempty(saveat) ||
755-
saveat isa Number || prob.tspan[1] in saveat,
755+
saveat isa Number || prob.tspan[1] in saveat,
756756
save_end = true,
757757
kwargs...)
758758
prob, success = hack_null_solution_init(prob)

test/downstream/complex_number_ad.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function assert_fun()
6060
p0 = rand(3)
6161
isapprox(loss(p0), loss_via_real(p0); rtol = 1e-4)
6262
end
63-
@assert all([assert_fun() for _ in 1:(2 ^ 6)])
63+
@assert all([assert_fun() for _ in 1:(2^6)])
6464

6565
# test ad with ForwardDiff
6666
function test_ad()
@@ -74,4 +74,4 @@ function test_ad()
7474
isapprox(grad_complex, grad_real; rtol = 1e-6) ? true : (@show rel_err; false)
7575
end
7676

77-
@time @test all([test_ad() for _ in 1:(2 ^ 6)])
77+
@time @test all([test_ad() for _ in 1:(2^6)])

test/downstream/ensemble_ad.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ep = rand(N, 4)
6666

6767
ensemble_prob = EnsembleProblem(prob,
6868
prob_func = (
69-
prob, i, repeat) -> remake(prob,
69+
prob, i, repeat) -> remake(prob,
7070
u0 = eu0[i, :],
7171
p = ep[i, :],
7272
saveat = 0.1))
@@ -77,7 +77,7 @@ cache = Ref{Any}()
7777
function sum_of_e_solution(p)
7878
ensemble_prob = EnsembleProblem(prob,
7979
prob_func = (
80-
prob, i, repeat) -> remake(prob,
80+
prob, i, repeat) -> remake(prob,
8181
u0 = eu0[i, :],
8282
p = p[i, :],
8383
saveat = 0.1))

test/downstream/ensemble_analysis.jl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ m3, m4, c = timepoint_meancov(sim, 0.5, 0.5)
4949
@test v c
5050
m3, m4, c = timepoint_meancor(sim, 0.5, 0.5)
5151
@test c one(c)
52-
m_series = timeseries_point_mean(sim, 0:(1 // 2 ^ (3)):1)
53-
m_series = timeseries_point_median(sim, 0:(1 // 2 ^ (3)):1)
54-
m_series = timeseries_point_quantile(sim, 0.5, 0:(1 // 2 ^ (3)):1)
55-
m_series, v_series = timeseries_point_meanvar(sim, 0:(1 // 2 ^ (3)):1)
56-
summ = EnsembleSummary(sim, 0:(1 // 2 ^ (3)):1)
52+
m_series = timeseries_point_mean(sim, 0:(1 // 2^(3)):1)
53+
m_series = timeseries_point_median(sim, 0:(1 // 2^(3)):1)
54+
m_series = timeseries_point_quantile(sim, 0.5, 0:(1 // 2^(3)):1)
55+
m_series, v_series = timeseries_point_meanvar(sim, 0:(1 // 2^(3)):1)
56+
summ = EnsembleSummary(sim, 0:(1 // 2^(3)):1)
5757
m5, v5 = m_series.u[5], v_series.u[5]
5858
@test m m5
5959
@test v v5
60-
m6, m7, v6 = timeseries_point_meancov(sim, 0:(1 // 2 ^ (3)):1, 0:(1 // 2 ^ (3)):1)[5, 5]
60+
m6, m7, v6 = timeseries_point_meancov(sim, 0:(1 // 2^(3)):1, 0:(1 // 2^(3)):1)[5, 5]
6161
@test m m6
6262
@test m m7
6363
@test v v6
@@ -107,15 +107,15 @@ m3, m4, c = timepoint_meancov(sim, 0.5, 0.5)
107107
@test v c
108108
m3, m4, c = timepoint_meancor(sim, 0.5, 0.5)
109109
@test c ones(size(c)...)
110-
m_series = timeseries_point_mean(sim, 0:(1 // 2 ^ (3)):1)
111-
m_series = timeseries_point_median(sim, 0:(1 // 2 ^ (3)):1)
112-
m_series = timeseries_point_quantile(sim, 0.5, 0:(1 // 2 ^ (3)):1)
113-
m_series, v_series = timeseries_point_meanvar(sim, 0:(1 // 2 ^ (3)):1)
114-
summ = EnsembleSummary(sim, 0:(1 // 2 ^ (3)):1)
110+
m_series = timeseries_point_mean(sim, 0:(1 // 2^(3)):1)
111+
m_series = timeseries_point_median(sim, 0:(1 // 2^(3)):1)
112+
m_series = timeseries_point_quantile(sim, 0.5, 0:(1 // 2^(3)):1)
113+
m_series, v_series = timeseries_point_meanvar(sim, 0:(1 // 2^(3)):1)
114+
summ = EnsembleSummary(sim, 0:(1 // 2^(3)):1)
115115
m5, v5 = m_series.u[5], v_series.u[5]
116116
@test m m5
117117
@test v v5
118-
m6, m7, v6 = timeseries_point_meancov(sim, 0:(1 // 2 ^ (3)):1, 0:(1 // 2 ^ (3)):1)[5, 5]
118+
m6, m7, v6 = timeseries_point_meancov(sim, 0:(1 // 2^(3)):1, 0:(1 // 2^(3)):1)[5, 5]
119119
@test m m6
120120
@test m m7
121121
@test v v6

0 commit comments

Comments
 (0)