@@ -252,11 +252,11 @@ end
252
252
vi2 = VarInfo (f2 ())
253
253
vi3 = VarInfo (f3 ())
254
254
@test haskey (vi1. metadata, :y )
255
- @test vi1. metadata. y. vns[1 ] == VarName {:y} ( )
255
+ @test vi1. metadata. y. vns[1 ] == @varname (y )
256
256
@test haskey (vi2. metadata, :y )
257
- @test vi2. metadata. y. vns[1 ] == VarName {:y} ((( 2 ,), ( Colon (), 1 )) )
257
+ @test vi2. metadata. y. vns[1 ] == @varname (y[ 2 ][:, 1 ] )
258
258
@test haskey (vi3. metadata, :y )
259
- @test vi3. metadata. y. vns[1 ] == VarName {:y} ((( 1 ,),) )
259
+ @test vi3. metadata. y. vns[1 ] == @varname (y[ 1 ] )
260
260
end
261
261
@testset " custom tilde" begin
262
262
@model demo () = begin
@@ -326,22 +326,22 @@ end
326
326
m = demo2 (missing , missing )
327
327
vi = VarInfo (m)
328
328
ks = keys (vi)
329
- @test VarName ( : x ) ∈ ks
330
- @test VarName ( : y ) ∈ ks
329
+ @test @varname ( x) ∈ ks
330
+ @test @varname ( y) ∈ ks
331
331
332
332
# Observation in top-level.
333
333
m = demo2 (missing , 1.0 )
334
334
vi = VarInfo (m)
335
335
ks = keys (vi)
336
- @test VarName ( : x ) ∈ ks
337
- @test VarName ( : y ) ∉ ks
336
+ @test @varname ( x) ∈ ks
337
+ @test @varname ( y) ∉ ks
338
338
339
339
# Observation in nested model.
340
340
m = demo2 (1000.0 , missing )
341
341
vi = VarInfo (m)
342
342
ks = keys (vi)
343
- @test VarName ( : x ) ∉ ks
344
- @test VarName ( : y ) ∈ ks
343
+ @test @varname ( x) ∉ ks
344
+ @test @varname ( y) ∈ ks
345
345
346
346
# Observe all.
347
347
m = demo2 (1000.0 , 0.5 )
@@ -350,13 +350,13 @@ end
350
350
@test isempty (ks)
351
351
352
352
# Check values makes sense.
353
- @model function demo2 (x, y)
353
+ @model function demo3 (x, y)
354
354
@submodel demo1 (x)
355
355
return y ~ Normal (x)
356
356
end
357
- m = demo2 (1000.0 , missing )
357
+ m = demo3 (1000.0 , missing )
358
358
# Mean of `y` should be close to 1000.
359
- @test abs (mean ([VarInfo (m)[VarName ( : y )] for i in 1 : 10 ]) - 1000 ) ≤ 10
359
+ @test abs (mean ([VarInfo (m)[@varname ( y)] for i in 1 : 10 ]) - 1000 ) ≤ 10
360
360
361
361
# Prefixed submodels and usage of submodel return values.
362
362
@model function demo_return (x)
@@ -373,10 +373,10 @@ end
373
373
m = demo_useval (missing , missing )
374
374
vi = VarInfo (m)
375
375
ks = keys (vi)
376
- @test VarName ( Symbol (" sub1.x" )) ∈ ks
377
- @test VarName ( Symbol (" sub2.x" )) ∈ ks
378
- @test VarName ( : z ) ∈ ks
379
- @test abs (mean ([VarInfo (m)[VarName ( : z )] for i in 1 : 10 ]) - 100 ) ≤ 10
376
+ @test VarName { Symbol("sub1.x")} ( ) ∈ ks
377
+ @test VarName { Symbol("sub2.x")} ( ) ∈ ks
378
+ @test @varname ( z) ∈ ks
379
+ @test abs (mean ([VarInfo (m)[@varname ( z)] for i in 1 : 10 ]) - 100 ) ≤ 10
380
380
381
381
# AR1 model. Dynamic prefixing.
382
382
@model function AR1 (num_steps, α, μ, σ, :: Type{TV} = Vector{Float64}) where {TV}
410
410
vi = VarInfo (m)
411
411
412
412
for k in [:α , :μ , :σ , Symbol (" ar1_1.η" ), Symbol (" ar1_2.η" )]
413
- @test VarName (k ) ∈ keys (vi)
413
+ @test VarName {k} ( ) ∈ keys (vi)
414
414
end
415
415
end
416
416
0 commit comments