Merge pull request #132 from control-toolbox/131-dev-error-extensions

Extension error fixed

Author: ocots

ext/CTModelsJLD.jl

@@ -25,9 +25,7 @@ julia> export_ocp_solution(JLD2Tag(), sol; filename="mysolution")
 # → creates "mysolution.jld2"
 ```
 """
-function CTModels.export_ocp_solution(
-    ::CTModels.JLD2Tag, sol::CTModels.Solution; filename::String="solution"
-)
+function CTModels.export_ocp_solution(::CTModels.JLD2Tag, sol::CTModels.Solution; filename::String)
     save_object(filename * ".jld2", sol)
     return nothing
 end
@@ -54,9 +52,7 @@ This function loads a previously saved `CTModels.Solution` from disk.
 julia> sol = import_ocp_solution(JLD2Tag(), model; filename="mysolution")
 ```
 """
-function CTModels.import_ocp_solution(
-    ::CTModels.JLD2Tag, ocp::CTModels.Model; filename::String="solution"
-)
+function CTModels.import_ocp_solution(::CTModels.JLD2Tag, ocp::CTModels.Model; filename::String)
     return load_object(filename * ".jld2")
 end
 

ext/CTModelsJSON.jl

@@ -29,9 +29,7 @@ julia> export_ocp_solution(JSON3Tag(), sol; filename="mysolution")
 # → creates "mysolution.json"
 ```
 """
-function CTModels.export_ocp_solution(
-    ::CTModels.JSON3Tag, sol::CTModels.Solution; filename::String="solution"
-)
+function CTModels.export_ocp_solution(::CTModels.JSON3Tag, sol::CTModels.Solution; filename::String)
     T = CTModels.time_grid(sol)
 
     blob = Dict(
@@ -94,9 +92,7 @@ Handles both vector and matrix encodings of signals. If dual fields are missing
 julia> sol = import_ocp_solution(JSON3Tag(), model; filename="mysolution")
 ```
 """
-function CTModels.import_ocp_solution(
-    ::CTModels.JSON3Tag, ocp::CTModels.Model; filename::String="solution"
-)
+function CTModels.import_ocp_solution(::CTModels.JSON3Tag, ocp::CTModels.Model; filename::String)
     json_string = read(filename * ".json", String)
     blob = JSON3.read(json_string)
 

src/CTModels.jl

@@ -104,6 +104,10 @@ const ConstraintsDictType = OrderedDict{
 #
 include("default.jl")
 
+#
+include("utils.jl")
+include("types.jl")
+
 # export / import
 """
 $(TYPEDEF)
@@ -132,28 +136,28 @@ $(TYPEDSIGNATURES)
 
 Export a solution in JLD format.
 """
-export_ocp_solution(::JLD2Tag, args...; kwargs...) = throw(CTBase.ExtensionError(:JLD2))
+export_ocp_solution(::JLD2Tag, ::AbstractSolution; filename::String) = throw(CTBase.ExtensionError(:JLD2))
 
 """
 $(TYPEDSIGNATURES)
 
 Import a solution from a JLD file.
 """
-import_ocp_solution(::JLD2Tag, args...; kwargs...) = throw(CTBase.ExtensionError(:JLD2))
+import_ocp_solution(::JLD2Tag, ::AbstractModel; filename::String) = throw(CTBase.ExtensionError(:JLD2))
 
 """
 $(TYPEDSIGNATURES)
 
 Export a solution in JSON format.
 """
-export_ocp_solution(::JSON3Tag, args...; kwargs...) = throw(CTBase.ExtensionError(:JSON3))
+export_ocp_solution(::JSON3Tag, ::AbstractSolution;  filename::String) = throw(CTBase.ExtensionError(:JSON3))
 
 """
 $(TYPEDSIGNATURES)
 
 Import a solution from a JLD file.
 """
-import_ocp_solution(::JSON3Tag, args...; kwargs...) = throw(CTBase.ExtensionError(:JSON3))
+import_ocp_solution(::JSON3Tag, ::AbstractModel; filename::String) = throw(CTBase.ExtensionError(:JSON3))
 
 """
 $(TYPEDSIGNATURES)
@@ -167,11 +171,11 @@ julia> CTModels.export_ocp_solution(sol; filename="solution", format=:JSON)
 julia> CTModels.export_ocp_solution(sol; filename="solution", format=:JLD)
 ```
 """
-function export_ocp_solution(args...; format::Symbol=__format(), kwargs...)
+function export_ocp_solution(sol::AbstractSolution; format::Symbol=__format(), filename::String=__filename_export_import())
     if format == :JLD
-        return export_ocp_solution(JLD2Tag(), args...; kwargs...)
+        return export_ocp_solution(JLD2Tag(), sol; filename=filename)
     elseif format == :JSON
-        return export_ocp_solution(JSON3Tag(), args...; kwargs...)
+        return export_ocp_solution(JSON3Tag(), sol; filename=filename)
     else
         throw(
             CTBase.IncorrectArgument(
@@ -193,11 +197,11 @@ julia> sol = CTModels.import_ocp_solution(ocp; filename="solution", format=:JSON
 julia> sol = CTModels.import_ocp_solution(ocp; filename="solution", format=:JLD)
 ```
 """
-function import_ocp_solution(args...; format::Symbol=__format(), kwargs...)
+function import_ocp_solution(ocp::AbstractModel; format::Symbol=__format(), filename::String=__filename_export_import())
     if format == :JLD
-        return import_ocp_solution(JLD2Tag(), args...; kwargs...)
+        return import_ocp_solution(JLD2Tag(), ocp; filename=filename)
     elseif format == :JSON
-        return import_ocp_solution(JSON3Tag(), args...; kwargs...)
+        return import_ocp_solution(JSON3Tag(), ocp; filename=filename)
     else
         throw(
             CTBase.IncorrectArgument(
@@ -207,10 +211,6 @@ function import_ocp_solution(args...; format::Symbol=__format(), kwargs...)
     end
 end
 
-#
-include("utils.jl")
-include("types.jl")
-
 # to be extended
 """
 $(TYPEDSIGNATURES)

src/default.jl

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

test/test_ext_exceptions.jl

@@ -1,14 +1,21 @@
 function test_ext_exceptions()
 
-    @test_throws CTBase.IncorrectArgument CTModels.export_ocp_solution(format=:dummy)
-    @test_throws CTBase.ExtensionError CTModels.export_ocp_solution(format=:JSON)
-    @test_throws CTBase.ExtensionError CTModels.export_ocp_solution(format=:JLD)
+    ocp, sol, pre_ocp = solution_example()
 
-    @test_throws CTBase.IncorrectArgument CTModels.import_ocp_solution(format=:dummy)
-    @test_throws CTBase.ExtensionError CTModels.import_ocp_solution(format=:JSON)
-    @test_throws CTBase.ExtensionError CTModels.import_ocp_solution(format=:JLD)
+    # export
+    @test_throws CTBase.IncorrectArgument CTModels.export_ocp_solution(sol; format=:dummy)
+    @test_throws CTBase.ExtensionError CTModels.export_ocp_solution(sol; format=:JSON)
+    @test_throws CTBase.ExtensionError CTModels.export_ocp_solution(sol; format=:JLD)
+    @test_throws MethodError CTModels.export_ocp_solution()
 
-    ocp, sol, pre_ocp = solution_example()
+    # import
+    @test_throws CTBase.IncorrectArgument CTModels.import_ocp_solution(ocp; format=:dummy)
+    @test_throws CTBase.ExtensionError CTModels.import_ocp_solution(ocp; format=:JSON)
+    @test_throws CTBase.ExtensionError CTModels.import_ocp_solution(ocp; format=:JLD)
+    @test_throws MethodError CTModels.import_ocp_solution()
+
+    # plot
     @test_throws CTBase.ExtensionError CTModels.plot(sol)
-    
+    @test_throws MethodError CTModels.plot(sol, 1)
+
 end