Merge pull request SciML#3361 from AayushSabharwal/as/fmt

refactor: format

Author: AayushSabharwal

src/systems/diffeqs/odesystem.jl

@@ -341,7 +341,7 @@ function Base.:(==)(sys1::ODESystem, sys2::ODESystem)
         _eq_unordered(get_unknowns(sys1), get_unknowns(sys2)) &&
         _eq_unordered(get_ps(sys1), get_ps(sys2)) &&
         _eq_unordered(continuous_events(sys1), continuous_events(sys2)) &&
-        _eq_unordered(discrete_events(sys1), discrete_events(sys2)) && 
+        _eq_unordered(discrete_events(sys1), discrete_events(sys2)) &&
         all(s1 == s2 for (s1, s2) in zip(get_systems(sys1), get_systems(sys2)))
 end
 
@@ -598,7 +598,8 @@ function build_explicit_observed_function(sys, ts;
     oop_fn = Func(args, [],
                  pre(Let(obsexprs,
                      return_value,
-                     false)), [Expr(:meta, :propagate_inbounds)]) |> array_wrapper[1] |> oop_mtkp_wrapper |> toexpr
+                     false)), [Expr(:meta, :propagate_inbounds)]) |> array_wrapper[1] |>
+             oop_mtkp_wrapper |> toexpr
 
     if !checkbounds
         oop_fn.args[end] = quote

src/systems/diffeqs/sdesystem.jl

@@ -331,7 +331,7 @@ function Base.:(==)(sys1::SDESystem, sys2::SDESystem)
         _eq_unordered(get_unknowns(sys1), get_unknowns(sys2)) &&
         _eq_unordered(get_ps(sys1), get_ps(sys2)) &&
         _eq_unordered(continuous_events(sys1), continuous_events(sys2)) &&
-        _eq_unordered(discrete_events(sys1), discrete_events(sys2)) && 
+        _eq_unordered(discrete_events(sys1), discrete_events(sys2)) &&
         all(s1 == s2 for (s1, s2) in zip(get_systems(sys1), get_systems(sys2)))
 end
 
@@ -817,7 +817,6 @@ function DiffEqBase.SDEProblem{iip, specialize}(
 end
 
 function DiffEqBase.SDEProblem(sys::ODESystem, args...; kwargs...)
-
     if any(ModelingToolkit.isbrownian, unknowns(sys))
         error("SDESystem constructed by defining Brownian variables with @brownian must be simplified by calling `structural_simplify` before a SDEProblem can be constructed.")
     else

src/systems/nonlinear/nonlinearsystem.jl

@@ -710,7 +710,8 @@ function SciMLBase.SCCNonlinearProblem{iip}(sys::NonlinearSystem, u0map,
         # precomputed subexpressions should not contain `banned_vars`
         banned_vars = Set{Any}(vcat(_dvs, getproperty.(_obs, (:lhs,))))
         filter!(banned_vars) do var
-            symbolic_type(var) != ArraySymbolic() || all(j -> var[j] in banned_vars, eachindex(var))
+            symbolic_type(var) != ArraySymbolic() ||
+                all(j -> var[j] in banned_vars, eachindex(var))
         end
         state = Dict()
         for i in eachindex(_obs)
@@ -772,7 +773,8 @@ function SciMLBase.SCCNonlinearProblem{iip}(sys::NonlinearSystem, u0map,
         _obs = scc_obs[i]
         cachevars = scc_cachevars[i]
         cacheexprs = scc_cacheexprs[i]
-        _prevobsidxs = vcat(_prevobsidxs, observed_equations_used_by(sys, reduce(vcat, values(cacheexprs); init = [])))
+        _prevobsidxs = vcat(_prevobsidxs,
+            observed_equations_used_by(sys, reduce(vcat, values(cacheexprs); init = [])))
 
         if isempty(cachevars)
             push!(explicitfuns, Returns(nothing))

test/fmi/fmi.jl

@@ -262,7 +262,10 @@ end
         @named adder2 = MTK.FMIComponent(
             Val(2); fmu, type = :CS, communication_step_size = 1e-3)
         sys, prob = build_looped_adders(adder1, adder2)
-        sol = solve(prob, Tsit5(); reltol = 1e-8, initializealg = SciMLBase.OverrideInit(nlsolve = FastShortcutNLLSPolyalg(autodiff = AutoFiniteDiff())))
+        sol = solve(prob,
+            Tsit5();
+            reltol = 1e-8,
+            initializealg = SciMLBase.OverrideInit(nlsolve = FastShortcutNLLSPolyalg(autodiff = AutoFiniteDiff())))
         @test truesol(sol.t;
             idxs = [truesys.adder1.c, truesys.adder2.c]).u≈sol(
             sol.t; idxs = [sys.adder1.c, sys.adder2.c]).u rtol=1e-3

test/initial_values.jl

@@ -180,5 +180,6 @@ end
     @parameters p[1:2, 1:2]
     @mtkbuild sys = ODESystem(D(x) ~ p * x, t)
     # used to throw a `MethodError` complaining about `getindex(::Nothing, ::CartesianIndex{2})`
-    @test_throws ModelingToolkit.MissingParametersError ODEProblem(sys, [x => ones(2)], (0.0, 1.0))
+    @test_throws ModelingToolkit.MissingParametersError ODEProblem(
+        sys, [x => ones(2)], (0.0, 1.0))
 end

test/odesystem.jl

@@ -1558,7 +1558,7 @@ end
 @testset "`isequal`" begin
     @variables X(t)
     @parameters p d
-    eq = D(X) ~ p - d*X
+    eq = D(X) ~ p - d * X
 
     osys1 = complete(ODESystem([eq], t; name = :osys))
     osys2 = complete(ODESystem([eq], t; name = :osys))
@@ -1569,36 +1569,36 @@ end
 
     osys1 = complete(ODESystem([eq], t; name = :osys, continuous_events))
     osys2 = complete(ODESystem([eq], t; name = :osys))
-    @test osys1 !== osys2 
+    @test osys1 !== osys2
 
     osys1 = complete(ODESystem([eq], t; name = :osys, discrete_events))
     osys2 = complete(ODESystem([eq], t; name = :osys))
     @test osys1 !== osys2
 
     osys1 = complete(ODESystem([eq], t; name = :osys, continuous_events))
     osys2 = complete(ODESystem([eq], t; name = :osys, discrete_events))
-    @test osys1 !== osys2 
+    @test osys1 !== osys2
 end
 
 @testset "dae_order_lowering basic test" begin
     @parameters a
     @variables x(t) y(t) z(t)
     @named dae_sys = ODESystem([
-        D(x) ~ y,
-        0 ~ x + z,
-        0 ~ x - y + z
-    ], t, [z, y, x], [])
+            D(x) ~ y,
+            0 ~ x + z,
+            0 ~ x - y + z
+        ], t, [z, y, x], [])
 
     lowered_dae_sys = dae_order_lowering(dae_sys)
-    @variables x1(t) y1(t) z1(t) 
+    @variables x1(t) y1(t) z1(t)
     expected_eqs = [
         0 ~ x + z,
         0 ~ x - y + z,
         Differential(t)(x) ~ y
     ]
     lowered_eqs = equations(lowered_dae_sys)
-    sorted_lowered_eqs = sort(lowered_eqs, by=string)
-    sorted_expected_eqs = sort(expected_eqs, by=string)
+    sorted_lowered_eqs = sort(lowered_eqs, by = string)
+    sorted_expected_eqs = sort(expected_eqs, by = string)
     @test sorted_lowered_eqs == sorted_expected_eqs
 
     expected_vars = Set([z, y, x])

test/sdesystem.jl

@@ -893,10 +893,10 @@ end
         0.1 * z]
 
     @named sys = ODESystem(eqs, tt, [x, y, z], [σ, ρ, β])
-    
+
     @named de = SDESystem(eqs, noiseeqs, tt, [x, y, z], [σ, ρ, β], tspan = (0.0, 10.0))
     de = complete(de)
-    
+
     f = SDEFunctionExpr(de)
     @test f isa Expr
 
@@ -926,7 +926,7 @@ end
     @variables X(t)
     @parameters p d
     @brownian a
-    seq = D(X) ~ p - d*X + a
+    seq = D(X) ~ p - d * X + a
     @mtkbuild ssys1 = System([seq], t; name = :ssys)
     @mtkbuild ssys2 = System([seq], t; name = :ssys)
     @test ssys1 == ssys2 # true
@@ -936,15 +936,15 @@ end
 
     @mtkbuild ssys1 = System([seq], t; name = :ssys, continuous_events)
     @mtkbuild ssys2 = System([seq], t; name = :ssys)
-    @test ssys1 !== ssys2 
+    @test ssys1 !== ssys2
 
     @mtkbuild ssys1 = System([seq], t; name = :ssys, discrete_events)
     @mtkbuild ssys2 = System([seq], t; name = :ssys)
     @test ssys1 !== ssys2
 
     @mtkbuild ssys1 = System([seq], t; name = :ssys, continuous_events)
     @mtkbuild ssys2 = System([seq], t; name = :ssys, discrete_events)
-    @test ssys1 !== ssys2 
+    @test ssys1 !== ssys2
 end
 
 @testset "Error when constructing SDESystem without `structural_simplify`" begin
@@ -961,7 +961,8 @@ end
     u0map = [x => 1.0, y => 0.0, z => 0.0]
     parammap = [σ => 10.0, β => 26.0, ρ => 2.33]
 
-    @test_throws ErrorException("SDESystem constructed by defining Brownian variables with @brownian must be simplified by calling `structural_simplify` before a SDEProblem can be constructed.") SDEProblem(de, u0map, (0.0, 100.0), parammap)
+    @test_throws ErrorException("SDESystem constructed by defining Brownian variables with @brownian must be simplified by calling `structural_simplify` before a SDEProblem can be constructed.") SDEProblem(
+        de, u0map, (0.0, 100.0), parammap)
     de = structural_simplify(de)
     @test SDEProblem(de, u0map, (0.0, 100.0), parammap) isa SDEProblem
 end