Merge pull request #127 from LilithHafner/lh/format

Run JuliaFormatter.format()

Author: ChrisRackauckas

lib/DDEProblemLibrary/src/constant_delays.jl

@@ -83,27 +83,27 @@ function fanalytic_dde_constant_1delay(u₀,
         copy(u₀)
     else
         if z < 2
-            c = @evalpoly(z, 2,-1)
+            c = @evalpoly(z, 2, -1)
         elseif z < 3
-            c = @evalpoly(z, 4, -3,1//2)
+            c = @evalpoly(z, 4, -3, 1//2)
         elseif z < 4
-            c = @evalpoly(z, 17//2, -15//2, 2,-1//6)
+            c = @evalpoly(z, 17//2, -15//2, 2, -1//6)
         elseif z < 5
-            c = @evalpoly(z, 115//6, -109//6, 6, -5//6,1//24)
+            c = @evalpoly(z, 115//6, -109//6, 6, -5//6, 1//24)
         elseif z < 6
-            c = @evalpoly(z, 1085//24, -1061//24, 197//12, -35//12, 1//4,-1//120)
+            c = @evalpoly(z, 1085//24, -1061//24, 197//12, -35//12, 1//4, -1//120)
         elseif z < 7
-            c = @evalpoly(z, 13201//120, -13081//120, 521//12, -107//12, 1, -7//120,1//720)
+            c = @evalpoly(z, 13201//120, -13081//120, 521//12, -107//12, 1, -7//120, 1//720)
         elseif z < 8
             c = @evalpoly(z, 39371//144, -39227//144, 27227//240, -3685//144, 487//144,
-                -21//80, 1//90,-1//5040)
+                -21//80, 1//90, -1//5040)
         elseif z < 9
             c = @evalpoly(z, 1158379//1680, -1156699//1680, 212753//720, -51193//720,
-                1511//144, -701//720, 1//18, -1//560,1//40320)
+                1511//144, -701//720, 1//18, -1//560, 1//40320)
         else
             c = @evalpoly(z, 23615939//13440, -23602499//13440, 7761511//10080,
                 -279533//1440, 89269//2880, -1873//576, 323//1440, -11//1120,
-                1//4032,-1//362880)
+                1//4032, -1//362880)
         end
 
         c .* u₀
@@ -275,25 +275,25 @@ function fanalytic_dde_constant_2delays(u₀,
         copy(u₀)
     else
         if z < 1 / 3
-            c = @evalpoly(z, 6//5,-1)
+            c = @evalpoly(z, 6//5, -1)
         elseif z < 2 / 5
-            c = @evalpoly(z, 23//15,-2)
+            c = @evalpoly(z, 23//15, -2)
         elseif z < 8 / 15
-            c = @evalpoly(z, 121//75, -12//5,1//2)
+            c = @evalpoly(z, 121//75, -12//5, 1//2)
         elseif z < 3 / 5
-            c = @evalpoly(z, 427//225, -52//15,3//2)
+            c = @evalpoly(z, 427//225, -52//15, 3//2)
         elseif z < 2 / 3
-            c = @evalpoly(z, 4351//2250, -547//150, 9//5,-1//6)
+            c = @evalpoly(z, 4351//2250, -547//150, 9//5, -1//6)
         elseif z < 11 / 15
-            c = @evalpoly(z, 539//250, -647//150, 23//10,-1//6)
+            c = @evalpoly(z, 539//250, -647//150, 23//10, -1//6)
         elseif z < 4 / 5
-            c = @evalpoly(z, 7942//3375, -128//25, 17//5,-2//3)
+            c = @evalpoly(z, 7942//3375, -128//25, 17//5, -2//3)
         elseif z < 13 / 15
-            c = @evalpoly(z, 39998//16875, -1952//375, 89//25, -4//5,1//24)
+            c = @evalpoly(z, 39998//16875, -1952//375, 89//25, -4//5, 1//24)
         elseif z < 14 / 15
-            c = @evalpoly(z, 10109//3750, -1583//250, 243//50, -13//10,1//24)
+            c = @evalpoly(z, 10109//3750, -1583//250, 243//50, -13//10, 1//24)
         else
-            c = @evalpoly(z, 171449//60750, -139199//20250, 2579//450, -173//90,5//24)
+            c = @evalpoly(z, 171449//60750, -139199//20250, 2579//450, -173//90, 5//24)
         end
 
         c .* u₀

lib/ODEProblemLibrary/src/ode_simple_nonlinear_prob.jl

@@ -54,7 +54,7 @@ prob_ode_fitzhughnagumo = ODEProblem(fitz, [1.0; 1.0], (0.0, 1.0),
 
 eqs = [D(y) ~ μ * ((1 - x^2) * y - x),
     D(x) ~ y]
-de = ODESystem(eqs,t; name = :van_der_pol) |> structural_simplify |> complete
+de = ODESystem(eqs, t; name = :van_der_pol) |> structural_simplify |> complete
 van = ODEFunction(de, [y, x], [μ], jac = true, eval_module = @__MODULE__)
 
 """
@@ -96,7 +96,7 @@ prob_ode_vanderpol_stiff = ODEProblem(van, [0; sqrt(3)], (0.0, 1.0), 1e6)
 eqs = [D(y₁) ~ -k₁ * y₁ + k₃ * y₂ * y₃,
     D(y₂) ~ k₁ * y₁ - k₂ * y₂^2 - k₃ * y₂ * y₃,
     D(y₃) ~ k₂ * y₂^2]
-de = ODESystem(eqs,t; name = :rober) |> structural_simplify |> complete
+de = ODESystem(eqs, t; name = :rober) |> structural_simplify |> complete
 rober = ODEFunction(de, [y₁, y₂, y₃], [k₁, k₂, k₃], jac = true, eval_module = @__MODULE__)
 
 """
@@ -177,7 +177,7 @@ prob_ode_threebody = ODEProblem(threebody,
 eqs = [D(y₁) ~ I₁ * y₂ * y₃,
     D(y₂) ~ I₂ * y₁ * y₃,
     D(y₃) ~ I₃ * y₁ * y₂]
-de = ODESystem(eqs,t; name = :rigid_body) |> structural_simplify |> complete
+de = ODESystem(eqs, t; name = :rigid_body) |> structural_simplify |> complete
 rigid = ODEFunction(de, [y₁, y₂, y₃], [I₁, I₂, I₃], jac = true, eval_module = @__MODULE__)
 
 """
@@ -360,7 +360,7 @@ eqs = [D(y1) ~ -p1 * y1 + p2 * y2 + p3 * y3 + p4,
             p2 * y6 + p11 * y7,
     D(y7) ~ p10 * y6 * y8 - p12 * y7,
     D(y8) ~ -p10 * y6 * y8 + p12 * y7]
-de = ODESystem(eqs,t; name = :hires) |> structural_simplify |> complete
+de = ODESystem(eqs, t; name = :hires) |> structural_simplify |> complete
 hires = ODEFunction(de, [y1, y2, y3, y4, y5, y6, y7, y8],
     [p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12],
     jac = true)
@@ -402,7 +402,7 @@ prob_ode_hires = ODEProblem(hires, u0, (0.0, 321.8122),
 eqs = [D(y1) ~ p1 * (y2 + y1 * (1 - p2 * y1 - y2)),
     D(y2) ~ (y3 - (1 + y1) * y2) / p1,
     D(y3) ~ p3 * (y1 - y3)]
-de = ODESystem(eqs,t; name = :orego) |> structural_simplify |> complete
+de = ODESystem(eqs, t; name = :orego) |> structural_simplify |> complete
 jac = calculate_jacobian(de)
 orego = ODEFunction(de, [y1, y2, y3], [p1, p2, p3], jac = true, eval_module = @__MODULE__)
 

lib/ODEProblemLibrary/src/strange_attractors.jl

@@ -3,15 +3,14 @@
 # Opted for the equations as reported in papers
 
 # Thomas
-@parameters b=0.208186
+@parameters b = 0.208186
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ sin(y) - b * x,
     D(y) ~ sin(z) - b * y,
     D(z) ~ sin(x) - b * z]
 
-@mtkbuild thomas = ODESystem(eqs,t)
+@mtkbuild thomas = ODESystem(eqs, t)
 
 """
 Thomas' cyclically symmetric attractor equations
@@ -30,12 +29,11 @@ prob_ode_thomas = ODEProblem(thomas, [], (0.0, 1.0))
 @parameters σ=10 ρ=28 β=8 / 3
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ σ * (y - x),
     D(y) ~ x * (ρ - z) - y,
     D(z) ~ x * y - β * z]
 
-@mtkbuild lorenz = ODESystem(eqs,t)
+@mtkbuild lorenz = ODESystem(eqs, t)
 
 """
 Lorenz equations
@@ -54,12 +52,11 @@ prob_ode_lorenz = ODEProblem(lorenz, [], (0.0, 1.0))
 @parameters a=0.95 b=0.7 c=0.6 d=3.5 e=0.25 f=0.1
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ (z - b) * x - d * y,
     D(y) ~ d * x + (z - b) * y,
     D(z) ~ c + a * z - z^3 / 3 - (x^2 + y^2) * (1 + e * z) + f * z * x^3]
 
-@mtkbuild aizawa = ODESystem(eqs,t)
+@mtkbuild aizawa = ODESystem(eqs, t)
 
 """
 Aizawa equations
@@ -77,12 +74,11 @@ prob_ode_aizawa = ODEProblem(aizawa, [], (0.0, 1.0))
 @parameters a=3 b=2.7 c=1.7 d=2 e=9
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ y - a * x + b * y * z,
     D(y) ~ c * y - x * z + z,
     D(z) ~ d * x * y - e * z]
 
-@mtkbuild dadras = ODESystem(eqs,t)
+@mtkbuild dadras = ODESystem(eqs, t)
 
 """
 Dadras equations
@@ -100,12 +96,11 @@ prob_ode_dadras = ODEProblem(dadras, [], (0.0, 1.0))
 @parameters a=35 b=3 c=28
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ a * (y - x),
     D(y) ~ (c - a) * x - x * z + c * y,
     D(z) ~ x * y - b * z]
 
-@mtkbuild chen = ODESystem(eqs,t)
+@mtkbuild chen = ODESystem(eqs, t)
 
 """
 chen equations
@@ -123,12 +118,11 @@ prob_ode_chen = ODEProblem(chen, [], (0.0, 1.0))
 @parameters a=0.2 b=0.2 c=5.7
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ -(y + z),
     D(y) ~ x + a * y,
     D(z) ~ b + z * (x - c)]
 
-@mtkbuild rossler = ODESystem(eqs,t)
+@mtkbuild rossler = ODESystem(eqs, t)
 
 """
 rossler equations
@@ -147,12 +141,11 @@ prob_ode_rossler = ODEProblem(rossler, [], (0.0, 1.0))
 @parameters a=0.14 b=0.10
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ y * (z - 1 + x^2) + b * x,
     D(y) ~ x * (3 * z + 1 - x^2) + b * y,
     D(z) ~ -2 * z * (a + x * y)]
 
-@mtkbuild rabinovich_fabrikant = ODESystem(eqs,t)
+@mtkbuild rabinovich_fabrikant = ODESystem(eqs, t)
 
 """
 rabinovich_fabrikant equations
@@ -170,12 +163,11 @@ prob_ode_rabinovich_fabrikant = ODEProblem(rabinovich_fabrikant, [], (0.0, 1.0))
 @parameters a=2.07 b=1.79
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ y + a * x * y + x * z,
     D(y) ~ 1 - b * x^2 + y * z,
     D(z) ~ x - x^2 - y^2]
 
-@mtkbuild sprott = ODESystem(eqs,t)
+@mtkbuild sprott = ODESystem(eqs, t)
 
 """
 sprott equations
@@ -193,12 +185,11 @@ prob_ode_sprott = ODEProblem(sprott, [], (0.0, 1.0))
 @parameters a=1 b=3 c=1 d=5 r=1e-2 s=4 xr=-8 / 5 i=5
 @variables x(t)=1 y(t)=0 z(t)=0
 
-
 eqs = [D(x) ~ y - a * x^3 + b * x^2 - z + i,
     D(y) ~ c - d * x^2 - y,
     D(z) ~ r * (s * (x - xr) - z)]
 
-@mtkbuild hindmarsh_rose = ODESystem(eqs,t)
+@mtkbuild hindmarsh_rose = ODESystem(eqs, t)
 
 """
 hindmarsh_rose equations