From f9707d7cc0532b9acd2ee53d45b9c117f885c98a Mon Sep 17 00:00:00 2001 From: Aayush Sabharwal Date: Wed, 7 May 2025 13:02:04 +0530 Subject: [PATCH 1/2] test: move jump control tests to `Extensions` test group --- test/downstream/Project.toml | 4 ---- test/extensions/Project.toml | 8 ++++++++ test/{downstream => extensions}/jump_control.jl | 0 test/runtests.jl | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) rename test/{downstream => extensions}/jump_control.jl (100%) diff --git a/test/downstream/Project.toml b/test/downstream/Project.toml index 1192dda074..f64ed17de6 100644 --- a/test/downstream/Project.toml +++ b/test/downstream/Project.toml @@ -1,10 +1,6 @@ [deps] ControlSystemsMTK = "687d7614-c7e5-45fc-bfc3-9ee385575c88" DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0" -DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d" -InfiniteOpt = "20393b10-9daf-11e9-18c9-8db751c92c57" -Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9" -JuMP = "4076af6c-e467-56ae-b986-b466b2749572" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739" diff --git a/test/extensions/Project.toml b/test/extensions/Project.toml index f5cedf49fe..0e018b4a22 100644 --- a/test/extensions/Project.toml +++ b/test/extensions/Project.toml @@ -2,18 +2,26 @@ BifurcationKit = "0f109fa4-8a5d-4b75-95aa-f515264e7665" ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a" +DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0" +DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" +DiffEqDevTools = "f3b72e0c-5b89-59e1-b016-84e28bfd966d" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" HomotopyContinuation = "f213a82b-91d6-5c5d-acf7-10f1c761b327" InfiniteOpt = "20393b10-9daf-11e9-18c9-8db751c92c57" +Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9" JuMP = "4076af6c-e467-56ae-b986-b466b2749572" LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800" ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" Nemo = "2edaba10-b0f1-5616-af89-8c11ac63239a" NonlinearSolveHomotopyContinuation = "2ac3b008-d579-4536-8c91-a1a5998c2f8b" +OrdinaryDiffEqFIRK = "5960d6e9-dd7a-4743-88e7-cf307b64f125" OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8" +OrdinaryDiffEqSDIRK = "2d112036-d095-4a1e-ab9a-08536f3ecdbf" OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a" +OrdinaryDiffEqVerner = "79d7bb75-1356-48c1-b8c0-6832512096c2" SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1" SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226" +SimpleDiffEq = "05bca326-078c-5bf0-a5bf-ce7c7982d7fd" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" diff --git a/test/downstream/jump_control.jl b/test/extensions/jump_control.jl similarity index 100% rename from test/downstream/jump_control.jl rename to test/extensions/jump_control.jl diff --git a/test/runtests.jl b/test/runtests.jl index c4fee4110d..80339c6606 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -122,7 +122,6 @@ end if GROUP == "All" || GROUP == "Downstream" activate_downstream_env() - @safetestset "JuMP Collocation Solvers" include("downstream/jump_control.jl") @safetestset "Linearization Tests" include("downstream/linearize.jl") @safetestset "Linearization Dummy Derivative Tests" include("downstream/linearization_dd.jl") @safetestset "Inverse Models Test" include("downstream/inversemodel.jl") @@ -137,6 +136,7 @@ end if GROUP == "All" || GROUP == "Extensions" activate_extensions_env() + @safetestset "JuMP Collocation Solvers" include("extensions/jump_control.jl") @safetestset "HomotopyContinuation Extension Test" include("extensions/homotopy_continuation.jl") @safetestset "Auto Differentiation Test" include("extensions/ad.jl") @safetestset "LabelledArrays Test" include("labelledarrays.jl") From 1836e373c7ec59107fd1b559fb2353ee0b1dfbb1 Mon Sep 17 00:00:00 2001 From: Aayush Sabharwal Date: Thu, 8 May 2025 12:32:50 +0530 Subject: [PATCH 2/2] test: fix inversemodel test --- test/downstream/inversemodel.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/test/downstream/inversemodel.jl b/test/downstream/inversemodel.jl index 7bed0bc1e8..dc2ee380a2 100644 --- a/test/downstream/inversemodel.jl +++ b/test/downstream/inversemodel.jl @@ -2,6 +2,7 @@ using ModelingToolkit using ModelingToolkitStandardLibrary using ModelingToolkitStandardLibrary.Blocks using OrdinaryDiffEqRosenbrock +using OrdinaryDiffEqNonlinearSolve using SymbolicIndexingInterface using Test using ControlSystemsMTK: tf, ss, get_named_sensitivity, get_named_comp_sensitivity