Skip to content

Commit ddceb6b

Browse files
refactor: use version of Stdlib which disables old AnalysisPoint
1 parent 89ed0cf commit ddceb6b

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Latexify = "0.11, 0.12, 0.13, 0.14, 0.15, 0.16"
117117
Libdl = "1"
118118
LinearAlgebra = "1"
119119
MLStyle = "0.4.17"
120+
ModelingToolkitStandardLibrary = "2.19"
120121
NaNMath = "0.3, 1"
121122
NonlinearSolve = "4.3"
122123
OffsetArrays = "1"

test/analysis_points.jl

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using ModelingToolkit, ModelingToolkitStandardLibrary.Blocks
22
using OrdinaryDiffEq, LinearAlgebra
33
using Test
4-
using ModelingToolkit: t_nounits as t, D_nounits as D, AnalysisPoint, get_sensitivity,
5-
get_comp_sensitivity, get_looptransfer, open_loop, AbstractSystem
4+
using ModelingToolkit: t_nounits as t, D_nounits as D, AnalysisPoint, AbstractSystem
65
using Symbolics: NAMESPACE_SEPARATOR
76

87
@testset "AnalysisPoint is lowered to `connect`" begin
@@ -164,17 +163,7 @@ end
164163
(inputap, [nameof(outputap)]),
165164
(nameof(inputap), [nameof(outputap)])
166165
]
167-
if input isa Symbol
168-
# broken because MTKStdlib defines the method for
169-
# `input::Union{Symbol, Vector{Symbol}}` which we can't directly call
170-
@test_broken linearize(sys, input, output)
171-
linfun, ssys = @invoke linearization_function(sys::AbstractSystem,
172-
input::Union{Symbol, Vector{Symbol}, AnalysisPoint, Vector{AnalysisPoint}},
173-
output::Any)
174-
matrices = linearize(ssys, linfun)
175-
else
176-
matrices, _ = linearize(sys, input, output)
177-
end
166+
matrices, _ = linearize(sys, input, output)
178167
# Result should be the same as feedpack(P, 1), i.e., the closed-loop transfer function from plant input to plant output
179168
@test matrices.A[] == -2
180169
@test matrices.B[] * matrices.C[] == 1 # both positive

test/downstream/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
55
ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
66
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
77
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
8+
9+
[compat]
10+
ModelingToolkitStandardLibrary = "2.19"

test/downstream/analysis_points.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using ModelingToolkit, OrdinaryDiffEq, LinearAlgebra, ControlSystemsBase
22
using ModelingToolkitStandardLibrary.Mechanical.Rotational
33
using ModelingToolkitStandardLibrary.Blocks
4-
using ModelingToolkit: connect, AnalysisPoint, t_nounits as t, D_nounits as D,
5-
get_sensitivity, get_comp_sensitivity, get_looptransfer, open_loop
4+
using ModelingToolkit: connect, t_nounits as t, D_nounits as D
65
import ControlSystemsBase as CS
76

87
@testset "Complicated model" begin

0 commit comments

Comments
 (0)