Skip to content

Commit 0f80620

Browse files
committed
More suggestions from code review
1 parent 860a884 commit 0f80620

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/symbolic_dimensions.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ end
5959

6060
# Access:
6161
function Base.getproperty(d::SymbolicDimensions{R}, s::Symbol) where {R}
62-
_nzdims = nzdims(d)
62+
nzdims = DynamicQuantities.nzdims(d)
6363
i = get(ALL_MAPPING, s, INDEX_TYPE(0))
6464
iszero(i) && error("$s is not available as a symbol in `SymbolicDimensions`. Symbols available: $(ALL_SYMBOLS).")
65-
ii = searchsortedfirst(_nzdims, i)
66-
if ii <= length(_nzdims) && _nzdims[ii] == i
65+
ii = searchsortedfirst(nzdims, i)
66+
if ii <= length(nzdims) && nzdims[ii] == i
6767
return nzvals(d)[ii]
6868
else
6969
return zero(R)
@@ -105,18 +105,18 @@ constructorof(::Type{<:SymbolicDimensionsSingleton{R}}) where {R} = SymbolicDime
105105
with_type_parameters(::Type{<:SymbolicDimensions}, ::Type{R}) where {R} = SymbolicDimensions{R}
106106
with_type_parameters(::Type{<:SymbolicDimensionsSingleton}, ::Type{R}) where {R} = SymbolicDimensionsSingleton{R}
107107
nzdims(d::SymbolicDimensions) = getfield(d, :nzdims)
108-
nzdims(d::SymbolicDimensionsSingleton) = [getfield(d, :dim)]
108+
nzdims(d::SymbolicDimensionsSingleton) = (getfield(d, :dim),)
109109
nzvals(d::SymbolicDimensions) = getfield(d, :nzvals)
110-
nzvals(::SymbolicDimensionsSingleton{R}) where {R} = [one(R)]
110+
nzvals(::SymbolicDimensionsSingleton{R}) where {R} = (one(R),)
111111
Base.eltype(::AbstractSymbolicDimensions{R}) where {R} = R
112112
Base.eltype(::Type{<:AbstractSymbolicDimensions{R}}) where {R} = R
113113

114114
# Conversion:
115115
function SymbolicDimensions(d::SymbolicDimensionsSingleton{R}) where {R}
116-
return SymbolicDimensions{R}(nzdims(d), nzvals(d))
116+
return SymbolicDimensions{R}([nzdims(d)...], [nzvals(d)...])
117117
end
118118
function SymbolicDimensions{R}(d::SymbolicDimensionsSingleton) where {R}
119-
return SymbolicDimensions{R}(nzdims(d), nzvals(d))
119+
return SymbolicDimensions{R}([nzdims(d)...], [nzvals(d)...])
120120
end
121121
Base.convert(::Type{SymbolicDimensions}, d::SymbolicDimensionsSingleton) = SymbolicDimensions(d)
122122
Base.convert(::Type{SymbolicDimensions{R}}, d::SymbolicDimensionsSingleton) where {R} = SymbolicDimensions{R}(d)

0 commit comments

Comments
 (0)