🤖 Format .jl files

Author: ocots

ext/CTModelsJSON.jl

@@ -14,29 +14,33 @@ Export OCP solution in JSON format
 function CTModels.export_ocp_solution(
     ::CTModels.JSON3Tag, sol::CTModels.Solution; filename_prefix="solution"
 )
-
     T = CTModels.time_grid(sol)
 
     blob = Dict(
-        "time_grid"             => CTModels.time_grid(sol),
-        "state"                 => CTModels.state_discretized(sol),
-        "control"               => CTModels.control_discretized(sol),
-        "variable"              => CTModels.variable(sol),
-        "costate"               => CTModels.costate_discretized(sol)[1:(end - 1), :],
-        "objective"             => CTModels.objective(sol),
-        "iterations"            => CTModels.iterations(sol),
+        "time_grid" => CTModels.time_grid(sol),
+        "state" => CTModels.state_discretized(sol),
+        "control" => CTModels.control_discretized(sol),
+        "variable" => CTModels.variable(sol),
+        "costate" => CTModels.costate_discretized(sol)[1:(end - 1), :],
+        "objective" => CTModels.objective(sol),
+        "iterations" => CTModels.iterations(sol),
         "constraints_violation" => CTModels.constraints_violation(sol),
-        "message"               => CTModels.message(sol),
-        "stopping"              => CTModels.stopping(sol),
-        "success"               => CTModels.success(sol),
-        "path_constraints"             => CTModels.discretize(CTModels.path_constraints(sol), T),
-        "path_constraints_dual"        => CTModels.discretize(CTModels.path_constraints_dual(sol), T),
-        "state_constraints_lb_dual"    => CTModels.discretize(CTModels.state_constraints_lb_dual(sol), T),
-        "state_constraints_ub_dual"    => CTModels.discretize(CTModels.state_constraints_ub_dual(sol), T),
-        "control_constraints_lb_dual"  => CTModels.discretize(CTModels.control_constraints_lb_dual(sol), T),
-        "control_constraints_ub_dual"  => CTModels.discretize(CTModels.control_constraints_ub_dual(sol), T),
-        "boundary_constraints"         => CTModels.boundary_constraints(sol),            # ctVector or Nothing
-        "boundary_constraints_dual"    => CTModels.boundary_constraints_dual(sol),       # ctVector or Nothing
+        "message" => CTModels.message(sol),
+        "stopping" => CTModels.stopping(sol),
+        "success" => CTModels.success(sol),
+        "path_constraints" => CTModels.discretize(CTModels.path_constraints(sol), T),
+        "path_constraints_dual" =>
+            CTModels.discretize(CTModels.path_constraints_dual(sol), T),
+        "state_constraints_lb_dual" =>
+            CTModels.discretize(CTModels.state_constraints_lb_dual(sol), T),
+        "state_constraints_ub_dual" =>
+            CTModels.discretize(CTModels.state_constraints_ub_dual(sol), T),
+        "control_constraints_lb_dual" =>
+            CTModels.discretize(CTModels.control_constraints_lb_dual(sol), T),
+        "control_constraints_ub_dual" =>
+            CTModels.discretize(CTModels.control_constraints_ub_dual(sol), T),
+        "boundary_constraints" => CTModels.boundary_constraints(sol),            # ctVector or Nothing
+        "boundary_constraints_dual" => CTModels.boundary_constraints_dual(sol),       # ctVector or Nothing
         "variable_constraints_lb_dual" => CTModels.variable_constraints_lb_dual(sol),    # ctVector or Nothing
         "variable_constraints_ub_dual" => CTModels.variable_constraints_ub_dual(sol),    # ctVector or Nothing
     )
@@ -56,7 +60,6 @@ Read OCP solution in JSON format
 function CTModels.import_ocp_solution(
     ::CTModels.JSON3Tag, ocp::CTModels.Model; filename_prefix="solution"
 )
-    
     json_string = read(filename_prefix * ".json", String)
     blob = JSON3.read(json_string)
 
@@ -79,33 +82,65 @@ function CTModels.import_ocp_solution(
     end
 
     # get path constraints (and dual): convert to matrix
-    path_constraints = isnothing(blob["path_constraints"]) ? nothing : stack(blob["path_constraints"]; dims=1)
+    path_constraints = if isnothing(blob["path_constraints"])
+        nothing
+    else
+        stack(blob["path_constraints"]; dims=1)
+    end
     if path_constraints isa Vector # if path_constraints is a Vector, convert it to a Matrix
         path_constraints = Matrix{Float64}(reduce(hcat, path_constraints)')
     end
-    path_constraints_dual = isnothing(blob["path_constraints_dual"]) ? nothing : stack(blob["path_constraints_dual"]; dims=1)
+    path_constraints_dual = if isnothing(blob["path_constraints_dual"])
+        nothing
+    else
+        stack(blob["path_constraints_dual"]; dims=1)
+    end
     if path_constraints_dual isa Vector # if path_constraints_dual is a Vector, convert it to a Matrix
         path_constraints_dual = Matrix{Float64}(reduce(hcat, path_constraints_dual)')
     end
 
     # get state constraints (and dual): convert to matrix
-    state_constraints_lb_dual = isnothing(blob["state_constraints_lb_dual"]) ? nothing : stack(blob["state_constraints_lb_dual"]; dims=1)
+    state_constraints_lb_dual = if isnothing(blob["state_constraints_lb_dual"])
+        nothing
+    else
+        stack(blob["state_constraints_lb_dual"]; dims=1)
+    end
     if state_constraints_lb_dual isa Vector # if state_constraints_lb_dual is a Vector, convert it to a Matrix
-        state_constraints_lb_dual = Matrix{Float64}(reduce(hcat, state_constraints_lb_dual)')
+        state_constraints_lb_dual = Matrix{Float64}(
+            reduce(hcat, state_constraints_lb_dual)'
+        )
+    end
+    state_constraints_ub_dual = if isnothing(blob["state_constraints_ub_dual"])
+        nothing
+    else
+        stack(blob["state_constraints_ub_dual"]; dims=1)
     end
-    state_constraints_ub_dual = isnothing(blob["state_constraints_ub_dual"]) ? nothing : stack(blob["state_constraints_ub_dual"]; dims=1)
     if state_constraints_ub_dual isa Vector # if state_constraints_ub_dual is a Vector, convert it to a Matrix
-        state_constraints_ub_dual = Matrix{Float64}(reduce(hcat, state_constraints_ub_dual)')
+        state_constraints_ub_dual = Matrix{Float64}(
+            reduce(hcat, state_constraints_ub_dual)'
+        )
     end
 
     # get control constraints (and dual): convert to matrix
-    control_constraints_lb_dual = isnothing(blob["control_constraints_lb_dual"]) ? nothing : stack(blob["control_constraints_lb_dual"]; dims=1)
+    control_constraints_lb_dual = if isnothing(blob["control_constraints_lb_dual"])
+        nothing
+    else
+        stack(blob["control_constraints_lb_dual"]; dims=1)
+    end
     if control_constraints_lb_dual isa Vector # if control_constraints_lb_dual is a Vector, convert it to a Matrix
-        control_constraints_lb_dual = Matrix{Float64}(reduce(hcat, control_constraints_lb_dual)')
+        control_constraints_lb_dual = Matrix{Float64}(
+            reduce(hcat, control_constraints_lb_dual)'
+        )
+    end
+    control_constraints_ub_dual = if isnothing(blob["control_constraints_ub_dual"])
+        nothing
+    else
+        stack(blob["control_constraints_ub_dual"]; dims=1)
     end
-    control_constraints_ub_dual = isnothing(blob["control_constraints_ub_dual"]) ? nothing : stack(blob["control_constraints_ub_dual"]; dims=1)
     if control_constraints_ub_dual isa Vector # if control_constraints_ub_dual is a Vector, convert it to a Matrix
-        control_constraints_ub_dual = Matrix{Float64}(reduce(hcat, control_constraints_ub_dual)')
+        control_constraints_ub_dual = Matrix{Float64}(
+            reduce(hcat, control_constraints_ub_dual)'
+        )
     end
 
     # get boundary constraints (and dual): no conversion needed
@@ -141,7 +176,6 @@ function CTModels.import_ocp_solution(
         variable_constraints_lb_dual=variable_constraints_lb_dual,
         variable_constraints_ub_dual=variable_constraints_ub_dual,
     )
-
 end
 
 end

src/CTModels.jl

@@ -45,7 +45,7 @@ import_ocp_solution(::JSON3Tag, args...; kwargs...) = throw(CTBase.ExtensionErro
 
 function export_ocp_solution(args...; format=__format(), kwargs...)
     if format == :JLD
-        return export_ocp_solution(JLD2Tag(), args...; kwargs...)        
+        return export_ocp_solution(JLD2Tag(), args...; kwargs...)
     elseif format == :JSON
         return export_ocp_solution(JSON3Tag(), args...; kwargs...)
     else
@@ -59,7 +59,7 @@ end
 
 function import_ocp_solution(args...; format=__format(), kwargs...)
     if format == :JLD
-        return import_ocp_solution(JLD2Tag(), args...; kwargs...)        
+        return import_ocp_solution(JLD2Tag(), args...; kwargs...)
     elseif format == :JSON
         return import_ocp_solution(JSON3Tag(), args...; kwargs...)
     else