Skip to content

Commit d7ff513

Browse files
authored
Merge pull request #92 from JuliaMath/teh/oneunit
one->oneunit where appropriate
2 parents 1023bc7 + 2979780 commit d7ff513

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/FixedPointNumbers.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ using Base: reducedim_initarray
77
import Base: ==, <, <=, -, +, *, /, ~, isapprox,
88
convert, promote_rule, show, showcompact, isinteger, abs, decompose,
99
isnan, isinf, isfinite,
10-
zero, one, typemin, typemax, realmin, realmax, eps, sizeof, reinterpret,
10+
zero, oneunit, one, typemin, typemax, realmin, realmax, eps, sizeof, reinterpret,
1111
float, trunc, round, floor, ceil, bswap,
1212
div, fld, rem, mod, mod1, fld1, min, max, minmax,
1313
start, next, done, r_promote, reducedim_init, rand
@@ -118,7 +118,7 @@ include("fixed.jl")
118118
include("normed.jl")
119119
include("deprecations.jl")
120120

121-
eps(::Type{T}) where {T <: FixedPoint} = T(one(rawtype(T)),0)
121+
eps(::Type{T}) where {T <: FixedPoint} = T(oneunit(rawtype(T)),0)
122122
eps(::T) where {T <: FixedPoint} = eps(T)
123123
sizeof(::Type{T}) where {T <: FixedPoint} = sizeof(rawtype(T))
124124

@@ -134,7 +134,7 @@ reducedim_init(f::typeof(identity),
134134
reducedim_init(f::typeof(identity),
135135
op::typeof(*),
136136
A::AbstractArray{T}, region) where {T <: FixedPoint} =
137-
reducedim_initarray(A, region, one(Treduce))
137+
reducedim_initarray(A, region, oneunit(Treduce))
138138

139139
for f in (:div, :fld, :fld1)
140140
@eval begin
@@ -152,12 +152,12 @@ end
152152

153153
# When multiplying by a float, reduce two multiplies to one.
154154
# Particularly useful for arrays.
155-
scaledual(Tdual::Type, x) = one(Tdual), x
155+
scaledual(Tdual::Type, x) = oneunit(Tdual), x
156156
scaledual(b::Tdual, x) where {Tdual <: Number} = b, x
157157
scaledual(Tdual::Type, x::Union{T,AbstractArray{T}}) where {T <: FixedPoint} =
158-
convert(Tdual, 1/one(T)), reinterpret(rawtype(T), x)
158+
convert(Tdual, 1/oneunit(T)), reinterpret(rawtype(T), x)
159159
scaledual(b::Tdual, x::Union{T,AbstractArray{T}}) where {Tdual <: Number,T <: FixedPoint} =
160-
convert(Tdual, b/one(T)), reinterpret(rawtype(T), x)
160+
convert(Tdual, b/oneunit(T)), reinterpret(rawtype(T), x)
161161

162162
@noinline function throw_converterror(::Type{T}, x) where {T <: FixedPoint}
163163
n = 2^(8*sizeof(T))

src/normed.jl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ end
2424
reinterpret(::Type{Normed{T,f}}, x::T) where {T <: Unsigned,f} = Normed{T,f}(x, 0)
2525

2626
zero(::Type{Normed{T,f}}) where {T,f} = Normed{T,f}(zero(T),0)
27-
function one(::Type{T}) where {T <: Normed}
27+
function oneunit(::Type{T}) where {T <: Normed}
2828
T(typemax(rawtype(T)) >> (8*sizeof(T)-nbitsfrac(T)), 0)
2929
end
30+
one(::Type{T}) where {T <: Normed} = oneunit(T)
3031
zero(x::Normed) = zero(typeof(x))
31-
one(x::Normed) = one(typeof(x))
32+
oneunit(x::Normed) = one(typeof(x))
33+
one(x::Normed) = oneunit(x)
3234
rawone(v) = reinterpret(one(v))
3335

3436
# Conversions
@@ -68,7 +70,7 @@ function convert(::Type{T}, x::Normed) where {T <: AbstractFloat}
6870
end
6971
convert(::Type{Bool}, x::Normed) = x == zero(x) ? false : true
7072
convert(::Type{Integer}, x::Normed) = convert(Integer, x*1.0)
71-
convert(::Type{T}, x::Normed) where {T <: Integer} = convert(T, x*(1/one(T)))
73+
convert(::Type{T}, x::Normed) where {T <: Integer} = convert(T, x*(1/oneunit(T)))
7274
convert(::Type{Rational{Ti}}, x::Normed) where {Ti <: Integer} = convert(Ti, reinterpret(x))//convert(Ti, rawone(x))
7375
convert(::Type{Rational}, x::Normed) = reinterpret(x)//rawone(x)
7476

@@ -94,14 +96,14 @@ function round(x::Normed{T,f}) where {T,f}
9496
mask = convert(T, 1<<(f-1))
9597
y = trunc(x)
9698
return convert(T, reinterpret(x)-reinterpret(y)) & mask>0 ?
97-
Normed{T,f}(y+one(Normed{T,f})) : y
99+
Normed{T,f}(y+oneunit(Normed{T,f})) : y
98100
end
99101
function ceil(x::Normed{T,f}) where {T,f}
100102
k = 8*sizeof(T)-f
101103
mask = (typemax(T)<<k)>>k
102104
y = trunc(x)
103105
return convert(T, reinterpret(x)-reinterpret(y)) & (mask)>0 ?
104-
Normed{T,f}(y+one(Normed{T,f})) : y
106+
Normed{T,f}(y+oneunit(Normed{T,f})) : y
105107
end
106108

107109
trunc(::Type{T}, x::Normed) where {T <: Integer} = convert(T, div(reinterpret(x), rawone(x)))

0 commit comments

Comments
 (0)