Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mod #145

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/IntervalArithmetic.jl
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import Base:
in, zero, one, eps, typemin, typemax, abs, abs2, real, min, max,
sqrt, exp, log, sin, cos, tan, inv,
exp2, exp10, log2, log10,
mod,
asin, acos, atan, atan2,
sinh, cosh, tanh, asinh, acosh, atanh,
union, intersect, isempty,
Expand Down Expand Up @@ -61,7 +62,7 @@ export
RoundTiesToEven, RoundTiesToAway,
cancelminus, cancelplus, isunbounded,
.., @I_str, ±,
pow, extended_div,
pow, extended_div, extended_mod,
setformat, @format

export
Expand Down
50 changes: 50 additions & 0 deletions src/intervals/functions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -266,3 +266,53 @@ for f in (:log, :log2, :log10, :log1p)

end
end

# mod
function mod(a::Interval, y::T) where {T<:Real}
yy = abs(y)
fld_lo = floor(a.lo/yy)
fld_hi = floor(a.hi/yy)
z = zero(fld_lo)

if fld_lo != fld_hi
# `a` includes a discontinuity of `mod`
if y > 0
return interval(z, y)
else
return interval(y, z)
end
else
# no discontinuity crossed within `a`
return interval(mod(a.lo, y), mod(a.hi, y))
end
end


function extended_mod(a::Interval, y::T) where {T<:Real}
yy = abs(y)
fld_lo = floor(a.lo/yy)
fld_hi = floor(a.hi/yy)
z = zero(fld_lo)
S = typeof( z )
ee = emptyinterval(S)

if fld_lo + 1 == fld_hi
# `a` includes one discontinuity
if y > 0
return interval(mod(a.lo, y), y), interval(z, mod(a.hi, y)), ee
else
return interval(mod(a.lo, y), z), interval(y, mod(a.hi, y)), ee
end
elseif fld_lo +1 < fld_hi
# `a` includes more discontinuities
if y > 0
return interval(mod(a.lo, y), y), interval(z, y), interval(z, mod(a.hi, y))
else
return interval(mod(a.lo, y), z), interval(y, z), interval(y, mod(a.hi, y))
end
else
# no discontinuity crossed within `a`
return interval(mod(a.lo, y), mod(a.hi, y)), ee, ee
end

end
67 changes: 67 additions & 0 deletions test/interval_tests/numeric.jl
Original file line number Diff line number Diff line change
Expand Up @@ -284,3 +284,70 @@ end
end
=#
end

@testset "`mod`" begin
r = 0.0625
a = r..(1+r)
@test mod(a, 1) == mod(a, 1.0) == 0..1
@test mod(a, 2) == mod(a, 2.0) == a
@test mod(a, 2.5) == a
@test mod(a, 0.5) == 0..0.5
@test mod(a, -1) == mod(a, -1.0) == -1..0
@test mod(a, -2) == mod(a, -2.0) == -2+a
@test mod(a, -2.5) == -2.5+a
@test mod(a, -0.5) == -0.5..0

a = (-1+r) .. -r
@test mod(a, 1) == mod(a, 1.0) == 1+a
@test mod(a, 2) == mod(a, 2.0) == 2+a
@test mod(a, 2.5) == 2.5+a
@test mod(a, 0.5) == 0..0.5
@test mod(a, -1) == mod(a, -1.0) == a
@test mod(a, -2) == mod(a, -2.0) == a
@test mod(a, -2.5) == a
@test mod(a, -0.5) == -0.5..0

a = -r .. 1-r
@test mod(a, 1) == mod(a, 1.0) == 0..1
@test mod(a, 2) == mod(a, 2.0) == 0..2
@test mod(a, 2.5) == 0..2.5
@test mod(a, 0.5) == 0..0.5
@test mod(a, -1) == mod(a, -1.0) == -1..0
@test mod(a, -2) == mod(a, -2.0) == -2..0
@test mod(a, -2.5) == -2.5..0
@test mod(a, -0.5) == -0.5..0
end

@testset "`extended_mod`" begin
r = 0.0625
a = r..(1+r)
ee = emptyinterval(Float64)
@test extended_mod(a, 1) == (r..1, 0..r, ee)
@test extended_mod(a, 2) == (a, ee, ee)
@test extended_mod(a, 2.5) == (a, ee, ee)
@test extended_mod(a, 0.5) == (r..0.5, 0..0.5, 0..r)
@test extended_mod(a, -1) == ((-1+r)..0, -1..(-1+r), ee)
@test extended_mod(a, -2) == ((-2+r)..(-1+r), ee, ee)
@test extended_mod(a, -2.5) == ((-2.5+r)..(-1.5+r), ee, ee)
@test extended_mod(a, -0.5) == ((-0.5+r)..0, -0.5..0, -0.5..(-0.5+r))

a = (-1+r) .. -r
@test extended_mod(a, 1) == (1+a, ee, ee)
@test extended_mod(a, 2) == (2+a, ee, ee)
@test extended_mod(a, 2.5) == (2.5+a, ee, ee)
@test extended_mod(a, 0.5) == (r..0.5, 0..(0.5-r), ee)
@test extended_mod(a, -1) == ((-1+r) .. -r, ee, ee)
@test extended_mod(a, -2) == ((-1+r) .. -r, ee, ee)
@test extended_mod(a, -2.5) == ((-1+r) .. -r, ee, ee)
@test extended_mod(a, -0.5) == ((-0.5+r)..0, -0.5 .. -r, ee)

a = -r .. 1-r
@test extended_mod(a, 1) == ((1-r)..1, 0..(1-r), ee)
@test extended_mod(a, 2) == ((2-r)..2, 0..(1-r), ee)
@test extended_mod(a, 2.5) == ((2.5-r)..2.5, 0..(1-r), ee)
@test extended_mod(a, 0.5) == ((0.5-r)..0.5, 0..0.5, 0..(0.5-r))
@test extended_mod(a, -1) == (-r..0, -1..(-r), ee)
@test extended_mod(a, -2) == (-r..0, -2..(-1-r), ee)
@test extended_mod(a, -2.5) == (-r..0, (-2.5)..(-1.5-r), ee)
@test extended_mod(a, -0.5) == (-r..0, -0.5..0, -0.5..(-r))
end