Remove code that was moved to AbstractPPL

Author: penelopeysm

Project.toml

@@ -75,3 +75,6 @@ Requires = "1"
 Statistics = "1"
 Test = "1.6"
 julia = "1.10.8"
+
+[sources]
+AbstractPPL = {url = "https://github.com/TuringLang/AbstractPPL.jl", rev = "py/hasgetvalue"}

src/utils.jl

@@ -751,199 +751,6 @@ function unflatten(original::AbstractDict, x::AbstractVector)
     return D(zip(keys(original), unflatten(collect(values(original)), x)))
 end
 
-# TODO: Move `getvalue` and `hasvalue` to AbstractPPL.jl.
-"""
-    getvalue(vals, vn::VarName)
-
-Return the value(s) in `vals` represented by `vn`.
-
-Note that this method is different from `getindex`. See examples below.
-
-# Examples
-
-For `NamedTuple`:
-
-```jldoctest
-julia> vals = (x = [1.0],);
-
-julia> DynamicPPL.getvalue(vals, @varname(x)) # same as `getindex`
-1-element Vector{Float64}:
- 1.0
-
-julia> DynamicPPL.getvalue(vals, @varname(x[1])) # different from `getindex`
-1.0
-
-julia> DynamicPPL.getvalue(vals, @varname(x[2]))
-ERROR: BoundsError: attempt to access 1-element Vector{Float64} at index [2]
-[...]
-```
-
-For `AbstractDict`:
-
-```jldoctest
-julia> vals = Dict(@varname(x) => [1.0]);
-
-julia> DynamicPPL.getvalue(vals, @varname(x)) # same as `getindex`
-1-element Vector{Float64}:
- 1.0
-
-julia> DynamicPPL.getvalue(vals, @varname(x[1])) # different from `getindex`
-1.0
-
-julia> DynamicPPL.getvalue(vals, @varname(x[2]))
-ERROR: BoundsError: attempt to access 1-element Vector{Float64} at index [2]
-[...]
-```
-
-In the `AbstractDict` case we can also have keys such as `v[1]`:
-
-```jldoctest
-julia> vals = Dict(@varname(x[1]) => [1.0,]);
-
-julia> DynamicPPL.getvalue(vals, @varname(x[1])) # same as `getindex`
-1-element Vector{Float64}:
- 1.0
-
-julia> DynamicPPL.getvalue(vals, @varname(x[1][1])) # different from `getindex`
-1.0
-
-julia> DynamicPPL.getvalue(vals, @varname(x[1][2]))
-ERROR: BoundsError: attempt to access 1-element Vector{Float64} at index [2]
-[...]
-
-julia> DynamicPPL.getvalue(vals, @varname(x[2][1]))
-ERROR: KeyError: key x[2][1] not found
-[...]
-```
-"""
-getvalue(vals::NamedTuple, vn::VarName) = get(vals, vn)
-getvalue(vals::AbstractDict, vn::VarName) = nested_getindex(vals, vn)
-
-"""
-    hasvalue(vals, vn::VarName)
-
-Determine whether `vals` has a mapping for a given `vn`, as compatible with [`getvalue`](@ref).
-
-# Examples
-With `x` as a `NamedTuple`:
-
-```jldoctest
-julia> DynamicPPL.hasvalue((x = 1.0, ), @varname(x))
-true
-
-julia> DynamicPPL.hasvalue((x = 1.0, ), @varname(x[1]))
-false
-
-julia> DynamicPPL.hasvalue((x = [1.0],), @varname(x))
-true
-
-julia> DynamicPPL.hasvalue((x = [1.0],), @varname(x[1]))
-true
-
-julia> DynamicPPL.hasvalue((x = [1.0],), @varname(x[2]))
-false
-```
-
-With `x` as a `AbstractDict`:
-
-```jldoctest
-julia> DynamicPPL.hasvalue(Dict(@varname(x) => 1.0, ), @varname(x))
-true
-
-julia> DynamicPPL.hasvalue(Dict(@varname(x) => 1.0, ), @varname(x[1]))
-false
-
-julia> DynamicPPL.hasvalue(Dict(@varname(x) => [1.0]), @varname(x))
-true
-
-julia> DynamicPPL.hasvalue(Dict(@varname(x) => [1.0]), @varname(x[1]))
-true
-
-julia> DynamicPPL.hasvalue(Dict(@varname(x) => [1.0]), @varname(x[2]))
-false
-```
-
-In the `AbstractDict` case we can also have keys such as `v[1]`:
-
-```jldoctest
-julia> vals = Dict(@varname(x[1]) => [1.0,]);
-
-julia> DynamicPPL.hasvalue(vals, @varname(x[1])) # same as `haskey`
-true
-
-julia> DynamicPPL.hasvalue(vals, @varname(x[1][1])) # different from `haskey`
-true
-
-julia> DynamicPPL.hasvalue(vals, @varname(x[1][2]))
-false
-
-julia> DynamicPPL.hasvalue(vals, @varname(x[2][1]))
-false
-```
-"""
-function hasvalue(vals::NamedTuple, vn::VarName{sym}) where {sym}
-    # LHS: Ensure that `nt` indeed has the property we want.
-    # RHS: Ensure that the optic can view into `nt`.
-    return haskey(vals, sym) && canview(getoptic(vn), getproperty(vals, sym))
-end
-
-# For `dictlike` we need to check wether `vn` is "immediately" present, or
-# if some ancestor of `vn` is present in `dictlike`.
-function hasvalue(vals::AbstractDict, vn::VarName)
-    # First we check if `vn` is present as is.
-    haskey(vals, vn) && return true
-
-    # If `vn` is not present, we check any parent-varnames by attempting
-    # to split the optic into the key / `parent` and the extraction optic / `child`.
-    # If `issuccess` is `true`, we found such a split, and hence `vn` is present.
-    parent, child, issuccess = splitoptic(getoptic(vn)) do optic
-        o = optic === nothing ? identity : optic
-        haskey(vals, VarName{getsym(vn)}(o))
-    end
-    # When combined with `VarInfo`, `nothing` is equivalent to `identity`.
-    keyoptic = parent === nothing ? identity : parent
-
-    # Return early if no such split could be found.
-    issuccess || return false
-
-    # At this point we just need to check that we `canview` the value.
-    value = vals[VarName{getsym(vn)}(keyoptic)]
-
-    return canview(child, value)
-end
-
-"""
-    nested_getindex(values::AbstractDict, vn::VarName)
-
-Return value corresponding to `vn` in `values` by also looking
-in the the actual values of the dict.
-"""
-function nested_getindex(values::AbstractDict, vn::VarName)
-    maybeval = get(values, vn, nothing)
-    if maybeval !== nothing
-        return maybeval
-    end
-
-    # Split the optic into the key / `parent` and the extraction optic / `child`.
-    parent, child, issuccess = splitoptic(getoptic(vn)) do optic
-        o = optic === nothing ? identity : optic
-        haskey(values, VarName{getsym(vn)}(o))
-    end
-    # When combined with `VarInfo`, `nothing` is equivalent to `identity`.
-    keyoptic = parent === nothing ? identity : parent
-
-    # If we found a valid split, then we can extract the value.
-    if !issuccess
-        # At this point we just throw an error since the key could not be found.
-        throw(KeyError(vn))
-    end
-
-    # TODO: Should we also check that we `canview` the extracted `value`
-    # rather than just let it fail upon `get` call?
-    value = values[VarName{getsym(vn)}(keyoptic)]
-    return child(value)
-end
-
 """
     update_values!!(vi::AbstractVarInfo, vals::NamedTuple, vns)