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

[AUTO] JuliaFormatter.jl run

Author: ocots

ext/plot.jl

@@ -255,7 +255,9 @@ function __initial_plot(
                 pp = Plots.plot() # costate
                 pu = Plots.plot() # control
                 pn = Plots.plot() # control norm
-                return Plots.plot(px, pp, pu, pn; layout=(2, 2), bottommargin=5mm, kwargs...)
+                return Plots.plot(
+                    px, pp, pu, pn; layout=(2, 2), bottommargin=5mm, kwargs...
+                )
             end
             _ => throw(
                 CTBase.IncorrectArgument(

profiling/interpolate.jl

@@ -7,7 +7,6 @@ begin
     using Profile
 
     function make_interpolation()
-
         T = [0, 1]
 
         A = [

src/default.jl

@@ -101,4 +101,4 @@ $(TYPEDSIGNATURES)
 Used to set the default value of the storage of elements in a matrix.
 The default value is `1`.
 """
-__matrix_dimension_storage() = 1
+__matrix_dimension_storage() = 1

src/solution.jl

@@ -79,8 +79,8 @@ function build_solution(
     end
 
     # variables: remove additional state for lagrange objective
-    x = if TX <: Function 
-        X 
+    x = if TX <: Function
+        X
     else
         V = matrix2vec(X[:, 1:dim_x], 1)
         ctinterpolate(T, V)
@@ -93,7 +93,7 @@ function build_solution(
         V = matrix2vec(P[:, 1:dim_x], 1)
         ctinterpolate(T[1:(end - 1)], V)
     end
-    u = if TU <: Function 
+    u = if TU <: Function
         U
     else
         V = matrix2vec(U[:, 1:dim_u], 1)
@@ -145,7 +145,7 @@ function build_solution(
         V = matrix2vec(control_constraints_lb_dual[:, 1:dim_u], 1)
         t -> ctinterpolate(T, V)(t)
     end
-    
+
     control_constraints_ub_dual_fun = if isnothing(control_constraints_ub_dual)
         nothing
     else

src/utils.jl

@@ -17,5 +17,5 @@ Transforms `A` to a Vector{<:Vector{<:ctNumber}}.
 function matrix2vec(
     A::Matrix{<:ctNumber}, dim::Int=__matrix_dimension_storage()
 )::Vector{<:Vector{<:ctNumber}}
-    return dim==1 ?  [A[i,:] for i in 1:size(A,1)] : [A[:,i] for i in 1:size(A,2)]
+    return dim==1 ? [A[i, :] for i in 1:size(A, 1)] : [A[:, i] for i in 1:size(A, 2)]
 end

test/test_utils.jl

@@ -1,20 +1,18 @@
 function test_utils()
+    A = [
+        0 1
+        2 3
+    ]
 
-A = [
-    0 1
-    2 3
-]
+    V = CTModels.matrix2vec(A)
+    @test V[1] == [0, 1]
+    @test V[2] == [2, 3]
 
-V = CTModels.matrix2vec(A)
-@test V[1] == [0, 1]
-@test V[2] == [2, 3]
+    V = CTModels.matrix2vec(A, 1)
+    @test V[1] == [0, 1]
+    @test V[2] == [2, 3]
 
-V = CTModels.matrix2vec(A, 1)
-@test V[1] == [0, 1]
-@test V[2] == [2, 3]
-
-W = CTModels.matrix2vec(A, 2)
-@test W[1] == [0, 2]
-@test W[2] == [1, 3]
-
-end
+    W = CTModels.matrix2vec(A, 2)
+    @test W[1] == [0, 2]
+    @test W[2] == [1, 3]
+end