Merge pull request #249 from control-toolbox/244-getters

refactoring + add getters and setters

Author: ocots

ext/plot.jl

@@ -470,7 +470,7 @@ Get the data for plotting.
 function __get_data_plot(sol::OptimalControlSolution, 
     xx::Union{Symbol,Tuple{Symbol,Integer}}; time::Symbol=:default)
 
-    T = sol.times
+    T = sol.time_grid
     X = sol.state.(T)
     U = sol.control.(T)
     P = sol.costate.(T)

src/CTBase.jl

@@ -196,24 +196,28 @@ const DCostate   = ctVector
 #
 include("exception.jl")
 include("description.jl")
-include("callback.jl")
 include("default.jl")
 include("types.jl")
+include("functions.jl")
 include("utils.jl")
+
+# Optimal Control Model
+include("optimal_control_model-type.jl")
+include("optimal_control_model-getters.jl")
+include("optimal_control_model-setters.jl")
+
+# Optimal Control Solution
+include("optimal_control_solution-type.jl")
+include("optimal_control_solution-getters.jl")
+include("optimal_control_solution-setters.jl")
+
 #
-include("checking.jl")
-#
-include("print.jl")
-#
-include("functions.jl")
-include("model.jl")
 include("differential_geometry.jl")
-#
 include("ctparser_utils.jl")
 include("onepass.jl")
 include("repl.jl")
-#
 include("init.jl")
+include("print.jl")
 
 # numeric types
 export ctNumber, ctVector, Time, Times, TimesDisc
@@ -223,10 +227,6 @@ export DState, DCostate
 export TimeDependence, Autonomous, NonAutonomous
 export VariableDependence, NonFixed, Fixed
 
-# callback
-export CTCallback, CTCallbacks, PrintCallback, StopCallback
-export get_priority_print_callbacks, get_priority_stop_callbacks
-
 # description
 export Description, add, getFullDescription, remove
 
@@ -248,10 +248,13 @@ export OptimalControlModel
 export Model
 export __OCPModel # redirection to Model to avoid confusion with other Model functions from other packages. Due to @def macro
 export variable!, time!, constraint!, dynamics!, objective!, state!, control!, remove_constraint!, constraint
-export is_autonomous, is_fixed, is_time_independent, is_time_dependent, is_min, is_max, is_variable_dependent, is_variable_independent
+export is_autonomous, is_fixed, is_time_independent, is_time_dependent, is_min, is_max
+export is_variable_dependent, is_variable_independent
 export nlp_constraints!, constraints_labels
 export has_free_final_time, has_free_initial_time, has_lagrange_cost, has_mayer_cost
-export dim_control_constraints, dim_state_constraints, dim_mixed_constraints, dim_path_constraints, dim_boundary_constraints, dim_variable_constraints, dim_control_range, dim_state_range, dim_variable_range
+export dim_control_constraints, dim_state_constraints, dim_mixed_constraints, dim_path_constraints
+export dim_boundary_constraints, dim_variable_constraints, dim_control_range
+export dim_state_range, dim_variable_range
 export model_expression, initial_time, initial_time_name, final_time, final_time_name, time_name
 export control_dimension, control_components_names, control_name
 export state_dimension, state_components_names, state_name
@@ -260,6 +263,8 @@ export lagrange, mayer, criterion, dynamics
 
 # solution
 export OptimalControlSolution
+export time_grid, control, state, variable, costate, objective
+export iterations, stopping, message, success, infos
 
 # initialization
 export OptimalControlInit

src/callback.jl

@@ -552,7 +552,7 @@ julia> @Lie {H0, H1}(1, [1, 2, 3], [1, 0, 7], 2)
 """
 macro Lie(expr::Expr)
 
-    fun(x) = @match (@capture(x, [a_, b_]),@capture(x, {c_, d_})) begin
+    fun(x) = @match (@capture(x, [a_, b_]), @capture(x, {c_, d_})) begin
         (true, false) => :(    Lie($a, $b))
         (false, true) => :(Poisson($c, $d))
         (false, false) => x
@@ -593,26 +593,26 @@ macro Lie(expr::Expr, arg1, arg2)
     local variable=false
 
     @match arg1 begin
-        :( Autonomous      ) => begin autonomous=true end
-        :( NonAutonomous   ) => begin autonomous=false end
-        :( autonomous = $a ) => begin autonomous=a end
-        :( NonFixed        ) => begin variable=true end
-        :( Fixed           ) => begin variable=false end
-        :( variable   = $a ) => begin variable=a end
+        :( Autonomous      ) => begin autonomous = true  end
+        :( NonAutonomous   ) => begin autonomous = false end
+        :( autonomous = $a ) => begin autonomous = a     end
+        :( NonFixed        ) => begin variable   = true  end
+        :( Fixed           ) => begin variable   = false end
+        :( variable   = $a ) => begin variable   = a     end
         _ => throw(IncorrectArgument("Invalid argument: " * string(arg1)))
     end
 
     @match arg2 begin
-        :( Autonomous      ) => begin autonomous=true end
-        :( NonAutonomous   ) => begin autonomous=false end
-        :( autonomous = $a ) => begin autonomous=a end
-        :( NonFixed        ) => begin variable=true end
-        :( Fixed           ) => begin variable=false end
-        :( variable   = $a ) => begin variable=a end
+        :( Autonomous      ) => begin autonomous = true  end
+        :( NonAutonomous   ) => begin autonomous = false end
+        :( autonomous = $a ) => begin autonomous = a     end
+        :( NonFixed        ) => begin variable   = true  end
+        :( Fixed           ) => begin variable   = false end
+        :( variable   = $a ) => begin variable   = a     end
         _ => throw(IncorrectArgument("Invalid argument: " * string(arg2)))
     end
 
-    fun(x) = @match (@capture(x, [a_, b_]),@capture(x, {c_, d_})) begin
+    fun(x) = @match (@capture(x, [a_, b_]), @capture(x, {c_, d_})) begin
         #(true, false) => :(    Lie($a, $b; autonomous=$autonomous, variable=$variable))
         (false, true) => quote 
             ($c isa Function && $d isa Function) ? 
@@ -649,12 +649,12 @@ macro Lie(expr::Expr, arg)
     local variable=false
 
     @match arg begin
-        :( Autonomous      ) => begin autonomous=true end
-        :( NonAutonomous   ) => begin autonomous=false end
-        :( autonomous = $a ) => begin autonomous=a end
-        :( NonFixed        ) => begin variable=true end
-        :( Fixed           ) => begin variable=false end
-        :( variable   = $a ) => begin variable=a end
+        :( Autonomous      ) => begin autonomous = true   end
+        :( NonAutonomous   ) => begin autonomous = false  end
+        :( autonomous = $a ) => begin autonomous = a      end
+        :( NonFixed        ) => begin variable   = true   end
+        :( Fixed           ) => begin variable   = false  end
+        :( variable   = $a ) => begin variable   = a      end
         _ => throw(IncorrectArgument("Invalid argument: " * string(arg)))
     end