Merge pull request #68 from control-toolbox/auto-juliaformatter-pr

[AUTO] JuliaFormatter.jl run

Author: ocots

src/solution.jl

@@ -56,11 +56,11 @@ function build_solution(
     control_constraints_ub_dual::Matrix{Float64}=zeros(0, 0),
     variable_constraints_lb_dual::Vector{Float64}=zeros(0),
     variable_constraints_ub_dual::Vector{Float64}=zeros(0),
-) where { 
-    TX <: Union{Matrix{Float64}, Function},
-    TU <: Union{Matrix{Float64}, Function},
-    TP <: Union{Matrix{Float64}, Function},
-    }
+) where {
+    TX<:Union{Matrix{Float64},Function},
+    TU<:Union{Matrix{Float64},Function},
+    TP<:Union{Matrix{Float64},Function},
+}
 
     # get dimensions
     dim_x = state_dimension(ocp)
@@ -80,8 +80,13 @@ function build_solution(
 
     # variables: remove additional state for lagrange objective
     x = TX <: Function ? X : ctinterpolate(T, matrix2vec(X[:, 1:dim_x], 1))
-    p = TU <: Function ? P : 
-        length(T) == 2 ? t -> P[1, 1:dim_x] : ctinterpolate(T[1:(end - 1)], matrix2vec(P[:, 1:dim_x], 1))
+    p = if TU <: Function
+        P
+    elseif length(T) == 2
+        t -> P[1, 1:dim_x]
+    else
+        ctinterpolate(T[1:(end - 1)], matrix2vec(P[:, 1:dim_x], 1))
+    end
     u = TP <: Function ? U : ctinterpolate(T, matrix2vec(U[:, 1:dim_u], 1))
 
     # force scalar output when dimension is 1

test/extras/plot_manual.jl

@@ -1,7 +1,7 @@
 using CTModels
 using Plots
 
-FUN=true
+FUN = true
 
 # create a pre-model
 pre_ocp = CTModels.PreModel()

test/solution_example.jl

@@ -1,4 +1,4 @@
-function solution_example(;fun=false)
+function solution_example(; fun=false)
 
     # create a pre-model
     pre_ocp = CTModels.PreModel()

test/test_export_import.jl

@@ -18,7 +18,7 @@ function test_export_import()
     @test sol.objective == sol_reloaded.objective
 
     #
-    ocp, sol = solution_example(fun=true)
+    ocp, sol = solution_example(; fun=true)
 
     # JSON
     CTModels.export_ocp_solution(sol; filename_prefix="solution_test", format=:JSON)
@@ -33,5 +33,4 @@ function test_export_import()
         ocp; filename_prefix="solution_test", format=:JLD
     )
     @test sol.objective == sol_reloaded.objective
-
 end