Merge pull request #987 from SciML/fix-formatter-line-splits

Initialize line split fixes following Catalyst.jl PR #1306

Author: ChrisRackauckas

lib/OptimizationMOI/test/runtests.jl

@@ -232,8 +232,7 @@ end
     @parameters b = 4.0
     @parameters d = 2.0
     @named sys = OptimizationSystem(
-        a * x[1]^2 + b * x[2]^2 + d * x[1] * x[2] + 5 * x[1] +
-        x[2], [x...], [a, b, c, d];
+        a * x[1]^2 + b * x[2]^2 + d * x[1] * x[2] + 5 * x[1] + x[2], [x...], [a, b, c, d];
         constraints = [
             x[1] + 2 * x[2] ~ 1.0
         ])

lib/OptimizationMetaheuristics/src/OptimizationMetaheuristics.jl

@@ -15,8 +15,7 @@ function initial_population!(opt, cache, bounds, f)
     Metaheuristics.optimize(f, bounds, opt_init)
 
     pop_size = opt_init.parameters.N
-    population_rand = [bounds[1, :] +
-                       rand(length(cache.u0)) .* (bounds[2, :] - bounds[1, :])
+    population_rand = [bounds[1, :] + rand(length(cache.u0)) .* (bounds[2, :] - bounds[1, :])
                        for i in 1:(pop_size - 1)]
     push!(population_rand, cache.u0)
     population_init = [Metaheuristics.create_child(x, f(x)) for x in population_rand]

lib/OptimizationMetaheuristics/test/runtests.jl

@@ -70,10 +70,8 @@ Random.seed!(42)
     end
 
     function rosenbrock(x)
-        f1 = sum(100 .* (x[2:end] .- x[1:(end - 1)] .^ 2) .^ 2 .+
-                 (x[1:(end - 1)] .- 1) .^ 2)
-        f2 = sum(100 .* ((x[2:end] .- 2.0) .- (x[1:(end - 1)] .^ 2)) .^ 2 .+
-                 ((x[1:(end - 1)] .- 1.0) .^ 2))
+        f1 = sum(100 .* (x[2:end] .- x[1:(end - 1)] .^ 2) .^ 2 .+ (x[1:(end - 1)] .- 1) .^ 2)
+        f2 = sum(100 .* ((x[2:end] .- 2.0) .- (x[1:(end - 1)] .^ 2)) .^ 2 .+ ((x[1:(end - 1)] .- 1.0) .^ 2))
         gx = [0.0]
         hx = [0.0]
         return [f1, f2], gx, hx

lib/OptimizationNLPModels/test/runtests.jl

@@ -28,8 +28,7 @@ using Test
     # https://jso.dev/NLPModelsTest.jl/dev/reference/#NLPModelsTest.BROWNDEN
     # Problem without bounds
     function brown_dennis(u, p)
-        return sum([((u[1] + (i / 5) * u[2] - exp(i / 5))^2 +
-                     (u[3] + sin(i / 5) * u[4] - cos(i / 5))^2)^2 for i in 1:20])
+        return sum([((u[1] + (i / 5) * u[2] - exp(i / 5))^2 + (u[3] + sin(i / 5) * u[4] - cos(i / 5))^2)^2 for i in 1:20])
     end
     f = Optimization.OptimizationFunction(brown_dennis, Optimization.AutoZygote())
     u0 = [25.0; 5.0; -5.0; -1.0]

src/auglag.jl

@@ -109,8 +109,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
             if cache.callback(opt_state, x...)
                 error("Optimization halted by callback.")
             end
-            return x[1] + sum(@. λ * cons_tmp[eq_inds] + ρ / 2 * (cons_tmp[eq_inds] .^ 2)) +
-                   1 / (2 * ρ) * sum((max.(Ref(0.0), μ .+ (ρ .* cons_tmp[ineq_inds]))) .^ 2)
+            return x[1] + sum(@. λ * cons_tmp[eq_inds] + ρ / 2 * (cons_tmp[eq_inds] .^ 2)) + 1 / (2 * ρ) * sum((max.(Ref(0.0), μ .+ (ρ .* cons_tmp[ineq_inds]))) .^ 2)
         end
 
         prev_eqcons = zero(λ)

src/lbfgsb.jl

@@ -129,8 +129,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
             if cache.callback(opt_state, x...)
                 error("Optimization halted by callback.")
             end
-            return x[1] + sum(@. λ * cons_tmp[eq_inds] + ρ / 2 * (cons_tmp[eq_inds] .^ 2)) +
-                   1 / (2 * ρ) * sum((max.(Ref(0.0), μ .+ (ρ .* cons_tmp[ineq_inds]))) .^ 2)
+            return x[1] + sum(@. λ * cons_tmp[eq_inds] + ρ / 2 * (cons_tmp[eq_inds] .^ 2)) + 1 / (2 * ρ) * sum((max.(Ref(0.0), μ .+ (ρ .* cons_tmp[ineq_inds]))) .^ 2)
         end
 
         prev_eqcons = zero(λ)