Merge pull request #126 from control-toolbox/flow

ocots · web-flow · commit ea4a3e98b251 · 2023-03-13T12:10:49.000+01:00
Flow
diff --git a/Project.toml b/Project.toml
@@ -7,13 +7,12 @@ version = "0.3.0"
 CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
 CTDirect = "790bbbee-bee9-49ee-8912-a9de031322d5"
 CTDirectShooting = "e0e6c04b-5022-4cd2-bea2-4a09fff39444"
-HamiltonianFlows = "5fb78580-10a0-4606-82bc-07a60f425ab3"
+CTFlows = "1c39547c-7794-42f7-af83-d98194f657c2"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 CTBase = "0.4"
 CTDirect = "0.1"
 CTDirectShooting = "0.1"
-HamiltonianFlows = "1.0"
 Reexport = "1.2"
 julia = "1.8"
diff --git a/examples/goddard_f.ipynb b/examples/goddard_f.ipynb
diff --git a/src/OptimalControl.jl b/src/OptimalControl.jl
@@ -9,14 +9,12 @@ using CTDirect
 using CTDirectShooting
 
 # flows
-@reexport using HamiltonianFlows
-import HamiltonianFlows: Flow
+@reexport using CTFlows
 
 # Other declarations
 const __display = CTBase.__display
 
 # resources
-include("flows.jl")
 include("solve.jl")
 
 # ----------------------------------------
@@ -26,6 +24,5 @@ include("CTBase.jl")
 
 # export functions only for user
 export solve
-export Flow
 
 end
diff --git a/src/flows.jl b/src/flows.jl
diff --git a/test/Project.toml b/test/Project.toml
@@ -1,8 +1,7 @@
 [deps]
-CTProblemLibrary = "0649932a-8c77-4f67-b1e4-c19ddd080280"
+CTProblems = "45d9ea3f-a92f-411f-833f-222dd4fb9cd8"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MINPACK = "4854310b-de5a-5eb6-a2a5-c1dee2bd17f9"
-Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,9 +1,8 @@
 using OptimalControl
 using Test
-using Plots
 using LinearAlgebra
 using MINPACK
-using CTProblemLibrary
+using CTProblems
 
 # functions and types that are not exported
 
diff --git a/test/test_goddard_direct.jl b/test/test_goddard_direct.jl
@@ -5,5 +5,5 @@ ocp = prob.model
 init = [1.01, 0.25, 0.5, 0.4]
 sol = solve(ocp, grid_size=10, print_level=0, init=init)
 
-@test objective(sol) ≈ -1.0 atol=1e-1
+@test sol.objective ≈ -1.0 atol=1e-1
 #@test constraints_violation(sol) < 1e-6
