Merge pull request #140 from control-toolbox/103-dev-range-linear-constraint-dimension-check

Add is complete pre ocp

Author: ocots

src/print.jl

@@ -269,21 +269,21 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::Model)
 
     # print table of settings
     header = [
-        "times*", "state*", "control*", "variable", "dynamics*", "objective*", "constraints"
+        "variable", "times*", "state*", "control*", "constraints", "dynamics*", "objective*"
     ]
-    data = hcat(
+    begin
+        (data = hcat(is_variable_dependent ? "V" : "X"))
+    end
+    data = hcat(data,
         __is_times_set(ocp) ? "V" : "X",
         __is_state_set(ocp) ? "V" : "X",
         __is_control_set(ocp) ? "V" : "X",
     )
-    begin
-        (data = hcat(data, is_variable_dependent ? "V" : "X"))
-    end
     data = hcat(
         data,
+        isempty_constraints(ocp) ? "X" : "V",
         __is_dynamics_set(ocp) ? "V" : "X",
         __is_objective_set(ocp) ? "V" : "X",
-        isempty_constraints(ocp) ? "X" : "V",
     )
     println("")
     h1 = Highlighter((data, i, j) -> data[i, j] == "X"; bold=true, foreground=:red)
@@ -555,21 +555,21 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::PreModel)
 
     # print table of settings
     header = [
-        "times*", "state*", "control*", "variable", "dynamics*", "objective*", "constraints"
+        "variable", "times*", "state*", "control*", "constraints", "dynamics*", "objective*"
     ]
-    data = hcat(
+    begin
+        (data = hcat(is_variable_dependent ? "V" : "X"))
+    end
+    data = hcat(data,
         __is_times_set(ocp) ? "V" : "X",
         __is_state_set(ocp) ? "V" : "X",
         __is_control_set(ocp) ? "V" : "X",
     )
-    begin
-        (data = hcat(data, is_variable_dependent ? "V" : "X"))
-    end
     data = hcat(
         data,
+        Base.isempty(ocp.constraints) ? "X" : "V",
         __is_dynamics_set(ocp) ? "V" : "X",
         __is_objective_set(ocp) ? "V" : "X",
-        Base.isempty(ocp.constraints) ? "X" : "V",
     )
     println("")
     h1 = Highlighter((data, i, j) -> data[i, j] == "X"; bold=true, foreground=:red)

src/types.jl

@@ -469,6 +469,21 @@ end
 """
 $(TYPEDSIGNATURES)
 
+Return true if the PreModel can be built into a Model.
+"""
+function __is_complete(ocp::PreModel)::Bool
+    return __is_times_set(ocp) &&
+           __is_state_set(ocp) &&
+           __is_control_set(ocp) &&
+           __is_dynamics_complete(ocp) &&
+           __is_objective_set(ocp) &&
+           __is_definition_set(ocp) &&
+           __is_autonomous_set(ocp)
+end
+
+"""
+$(TYPEDSIGNATURES)
+
 Return true if nothing has been set.
 """
 function __is_empty(ocp::PreModel)::Bool

test/test_model.jl

@@ -176,6 +176,7 @@ function test_model()
     CTModels.dynamics!(pre_ocp, dynamics!)
     CTModels.objective!(pre_ocp, :min; mayer=mayer, lagrange=lagrange)
     CTModels.definition!(pre_ocp, quote end)
+    CTModels.time_dependence!(pre_ocp; autonomous=false)
     display(pre_ocp)
 
     #
@@ -187,5 +188,6 @@ function test_model()
     CTModels.dynamics!(pre_ocp, dynamics!)
     CTModels.objective!(pre_ocp, :min; mayer=mayer, lagrange=lagrange)
     CTModels.definition!(pre_ocp, quote end)
+    CTModels.time_dependence!(pre_ocp; autonomous=true)
     display(pre_ocp)
 end