Skip to content

Commit 462586e

Browse files
authored
Namespacing Gain block to avoid conflict
1 parent eeabe8e commit 462586e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

test/analysis_points.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ end
9292

9393
@testset "AnalysisPoint is lowered to `connect`" begin
9494
@named P = FirstOrder(k = 1, T = 1)
95-
@named C = Gain(; k = -1)
95+
@named C = ModelingToolkitStandardLibrary.Blocks.Gain(; k = -1)
9696

9797
ap = AnalysisPoint(:plant_input)
9898
eqs = [connect(P.output, C.input)
@@ -112,7 +112,7 @@ end
112112

113113
@testset "Inverse causality throws a warning" begin
114114
@named P = FirstOrder(k = 1, T = 1)
115-
@named C = Gain(; k = -1)
115+
@named C = ModelingToolkitStandardLibrary.Blocks.Gain(; k = -1)
116116

117117
ap = AnalysisPoint(:plant_input)
118118
@test_warn ["1-th argument", "plant_input", "not a output"] connect(
@@ -123,7 +123,7 @@ end
123123
# also tests `connect(input, name::Symbol, outputs...)` syntax
124124
@testset "AnalysisPoint is accessible via `getproperty`" begin
125125
@named P = FirstOrder(k = 1, T = 1)
126-
@named C = Gain(; k = -1)
126+
@named C = ModelingToolkitStandardLibrary.Blocks.Gain(; k = -1)
127127

128128
eqs = [connect(P.output, C.input), connect(C.output, :plant_input, P.input)]
129129
sys_ap = System(eqs, t, systems = [P, C], name = :hej)
@@ -143,7 +143,7 @@ end
143143
### Ported from MTKStdlib
144144

145145
@named P = FirstOrder(k = 1, T = 1)
146-
@named C = Gain(; k = -1)
146+
@named C = ModelingToolkitStandardLibrary.Blocks.Gain(; k = -1)
147147

148148
ap = AnalysisPoint(:plant_input)
149149
eqs = [connect(P.output, C.input), connect(C.output, ap, P.input)]
@@ -348,7 +348,7 @@ end
348348

349349
@testset "Duplicate `connect` statements across subsystems with AP transforms - standard `connect`" begin
350350
@named P = FirstOrder(k = 1, T = 1)
351-
@named C = Gain(; k = 1)
351+
@named C = ModelingToolkitStandardLibrary.Blocks.Gain(; k = 1)
352352
@named add = Blocks.Add(k2 = -1)
353353

354354
eqs = [connect(P.output, :plant_output, add.input2)
@@ -384,7 +384,7 @@ end
384384

385385
@testset "Duplicate `connect` statements across subsystems with AP transforms - causal variable `connect`" begin
386386
@named P = FirstOrder(k = 1, T = 1)
387-
@named C = Gain(; k = 1)
387+
@named C = ModelingToolkitStandardLibrary.Blocks.Gain(; k = 1)
388388
@named add = Blocks.Add(k2 = -1)
389389

390390
eqs = [connect(P.output.u, :plant_output, add.input2.u)
@@ -420,7 +420,7 @@ end
420420

421421
@testset "Duplicate `connect` statements across subsystems with AP transforms - mixed `connect`" begin
422422
@named P = FirstOrder(k = 1, T = 1)
423-
@named C = Gain(; k = 1)
423+
@named C = ModelingToolkitStandardLibrary.Blocks.Gain(; k = 1)
424424
@named add = Blocks.Add(k2 = -1)
425425

426426
eqs = [connect(P.output.u, :plant_output, add.input2.u)
@@ -542,7 +542,7 @@ end
542542

543543
@testset "multiple analysis points" begin
544544
@named P = FirstOrder(k = 1, T = 1)
545-
@named C = Gain(; k = 1)
545+
@named C = ModelingToolkitStandardLibrary.Blocks.Gain(; k = 1)
546546
@named add = Blocks.Add(k2 = -1)
547547

548548
eqs = [connect(P.output, :plant_output, add.input2)

0 commit comments

Comments
 (0)