8181 @test @varname (A[1 ]. b[i]) == @varname (A[1 ]. b[1 : 10 ])
8282 @test @varname (A[j]) == @varname (A[2 : 2 : 5 ])
8383
84- @test @varname (A[:, 1 ][1 + 1 ]) == @varname (A[:, 1 ][2 ])
84+ @test @varname (A[:, 1 ][1 + 1 ]) == @varname (A[:, 1 ][2 ])
8585 @test (@varname (A[:, 1 ][2 ]) == VarName {:A} (@o (_[:, 1 ]) ⨟ @o (_[2 ])))
8686
8787 # concretization
9292 @test test_equal (@varname (y[:], true ), @varname (y[1 : 100 ]))
9393 @test test_equal (@varname (y[:, begin ], true ), @varname (y[1 : 10 , 1 ]))
9494 @test getoptic (AbstractPPL. concretize (@varname (y[:]), y)). indices[1 ] ===
95- AbstractPPL. ConcretizedSlice (to_indices (y, (:,))[1 ])
95+ AbstractPPL. ConcretizedSlice (to_indices (y, (:,))[1 ])
9696 @test test_equal (@varname (x. a[1 : end , end ][:], true ), @varname (x. a[1 : 3 , 2 ][1 : 3 ]))
9797 end
9898
@@ -349,24 +349,24 @@ end
349349 x = 1.0
350350 @test Set (varname_leaves (@varname (x), x)) == Set ([@varname (x)])
351351 @test Set (collect (varname_and_value_leaves (@varname (x), x))) ==
352- Set ([(@varname (x), x)])
352+ Set ([(@varname (x), x)])
353353 x = 2
354354 @test Set (varname_leaves (@varname (x), x)) == Set ([@varname (x)])
355355 @test Set (collect (varname_and_value_leaves (@varname (x), x))) ==
356- Set ([(@varname (x), x)])
356+ Set ([(@varname (x), x)])
357357 end
358358
359359 @testset " Vector" begin
360360 x = randn (2 )
361361 @test Set (varname_leaves (@varname (x), x)) ==
362- Set ([@varname (x[1 ]), @varname (x[2 ])])
362+ Set ([@varname (x[1 ]), @varname (x[2 ])])
363363 @test Set (collect (varname_and_value_leaves (@varname (x), x))) ==
364- Set ([(@varname (x[1 ]), x[1 ]), (@varname (x[2 ]), x[2 ])])
364+ Set ([(@varname (x[1 ]), x[1 ]), (@varname (x[2 ]), x[2 ])])
365365 x = [(; a= 1 ), (; b= 2 )]
366366 @test Set (varname_leaves (@varname (x), x)) ==
367- Set ([@varname (x[1 ]. a), @varname (x[2 ]. b)])
367+ Set ([@varname (x[1 ]. a), @varname (x[2 ]. b)])
368368 @test Set (collect (varname_and_value_leaves (@varname (x), x))) ==
369- Set ([(@varname (x[1 ]. a), x[1 ]. a), (@varname (x[2 ]. b), x[2 ]. b)])
369+ Set ([(@varname (x[1 ]. a), x[1 ]. a), (@varname (x[2 ]. b), x[2 ]. b)])
370370 end
371371
372372 @testset " Matrix" begin
@@ -386,15 +386,15 @@ end
386386 x = randn (2 , 2 )
387387 xl = LowerTriangular (x)
388388 @test Set (varname_leaves (@varname (x), xl)) ==
389- Set ([@varname (x[1 , 1 ]), @varname (x[2 , 1 ]), @varname (x[2 , 2 ])])
389+ Set ([@varname (x[1 , 1 ]), @varname (x[2 , 1 ]), @varname (x[2 , 2 ])])
390390 @test Set (collect (varname_and_value_leaves (@varname (x), xl))) == Set ([
391391 (@varname (x[1 , 1 ]), x[1 , 1 ]),
392392 (@varname (x[2 , 1 ]), x[2 , 1 ]),
393393 (@varname (x[2 , 2 ]), x[2 , 2 ]),
394394 ])
395395 xu = UpperTriangular (x)
396396 @test Set (varname_leaves (@varname (x), xu)) ==
397- Set ([@varname (x[1 , 1 ]), @varname (x[1 , 2 ]), @varname (x[2 , 2 ])])
397+ Set ([@varname (x[1 , 1 ]), @varname (x[1 , 2 ]), @varname (x[2 , 2 ])])
398398 @test Set (collect (varname_and_value_leaves (@varname (x), xu))) == Set ([
399399 (@varname (x[1 , 1 ]), x[1 , 1 ]),
400400 (@varname (x[1 , 2 ]), x[1 , 2 ]),
@@ -404,15 +404,17 @@ end
404404
405405 @testset " NamedTuple" begin
406406 x = (a= 1.0 , b= [2.0 , 3.0 ])
407- @test Set (varname_leaves (@varname (x), x)) == Set ([@varname (x. a), @varname (x. b[1 ]), @varname (x. b[2 ])])
408- @test Set (collect (varname_and_value_leaves (@varname (x), x))) ==
409- Set ([(@varname (x. a), x. a), (@varname (x. b[1 ]), x. b[1 ]), (@varname (x. b[2 ]), x. b[2 ])])
407+ @test Set (varname_leaves (@varname (x), x)) ==
408+ Set ([@varname (x. a), @varname (x. b[1 ]), @varname (x. b[2 ])])
409+ @test Set (collect (varname_and_value_leaves (@varname (x), x))) == Set ([
410+ (@varname (x. a), x. a), (@varname (x. b[1 ]), x. b[1 ]), (@varname (x. b[2 ]), x. b[2 ])
411+ ])
410412 end
411413
412414 @testset " Cholesky" begin
413415 x = cholesky ([1.0 0.5 ; 0.5 1.0 ])
414416 @test Set (varname_leaves (@varname (x), x)) ==
415- Set ([@varname (x. U[1 , 1 ]), @varname (x. U[1 , 2 ]), @varname (x. U[2 , 2 ])])
417+ Set ([@varname (x. U[1 , 1 ]), @varname (x. U[1 , 2 ]), @varname (x. U[2 , 2 ])])
416418 @test Set (collect (varname_and_value_leaves (@varname (x), x))) == Set ([
417419 (@varname (x. U[1 , 1 ]), x. U[1 , 1 ]),
418420 (@varname (x. U[1 , 2 ]), x. U[1 , 2 ]),
0 commit comments