Additional accessor and convert functions by sprockmonty · Pull Request #108 · invenia/Intervals.jl

sprockmonty · 2020-06-19T01:46:02Z

Added some functions simple containsfirst() and constainslast() functions and a convert function to allow Intervals to be added to Interval arrays with different types e.g.

x = Interval{Int,Closed, Open}(1,2)
containsfirst(x) # == true
containslast(x) # == false
y = Interval{Float64,Closed,Open}(1.0,2.0)
a = [x,x]
push!(a,y)

codecov · 2020-06-19T02:17:32Z

Codecov Report

Merging #108 into master will decrease coverage by 0.05%.
The diff coverage is 66.66%.

@@            Coverage Diff             @@
##           master     #108      +/-   ##
==========================================
- Coverage   73.50%   73.44%   -0.06%     
==========================================
  Files           8        8              
  Lines         400      403       +3     
==========================================
+ Hits          294      296       +2     
- Misses        106      107       +1

Impacted Files	Coverage Δ
src/interval.jl	`95.23% <66.66%> (-0.70%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 401db43...a270c77. Read the comment docs.

omus

The new convert method looks good to me. I'm in favour of that change and I think it's best if the containsfirst/containslast change was put into a separate PR so that the convert can proceed.

omus · 2020-06-23T19:50:04Z

 end

+function Base.convert(::Type{Interval{T,L,R}}, interval::Interval{N,L,R}) where {T,N,L,R}
+    return Interval{L,R}(convert(T, first(interval)), convert(T, last(interval)))


Suggested change

return Interval{L,R}(convert(T, first(interval)), convert(T, last(interval)))

return Interval{T,L,R}(first(interval), last(interval))

omus · 2020-06-23T19:51:25Z

 isclosed(interval::AbstractInterval{T,L,R}) where {T,L,R} = L === Closed && R === Closed
 Base.isopen(interval::AbstractInterval{T,L,R}) where {T,L,R} = L === Open && R === Open
+containsfirst(interval::AbstractInterval{T,L,R}) where {T,L,R} = L === Closed 
+containslast(interval::AbstractInterval{T,L,R}) where {T,L,R} = R === Closed 


I think this functionality is useful but the name needs more consideration. There may be a rename of first/last in the near future: #90

sprockmonty · 2020-06-26T02:31:01Z

I've made the change and added an additional promote_rule function for promoting intervals.

omus · 2020-07-14T17:43:51Z

    end
 end

+function Base.convert(::Type{<:Interval{T}}, interval::Interval{S,L,R}) where {T,S,L,R}


Suggested change

function Base.convert(::Type{<:Interval{T}}, interval::Interval{S,L,R}) where {T,S,L,R}

function Base.convert(::Type{Interval{T}}, interval::Interval{S,L,R}) where {T,S,L,R}

omus · 2020-07-14T17:44:06Z

        @test_throws DomainError convert(Int, Interval{Closed, Open}(10, 10))
        @test convert(Int, Interval{Closed, Closed}(10, 10)) == 10
        @test_throws DomainError convert(Int, Interval{Closed, Closed}(10, 11))
+        @test convert(Interval{Float64, Closed, Closed}, Interval(1,2)) == Interval{Float64, Closed, Closed}(1.0,2.0)


Hmmm, convert(Interval{Float64, Open, Open}, Interval(1,2)) isn't lossless conversion. This means that the convert method should probably be defined as: Base.convert(::Type{Interval{T}}, interval::Interval{S,L,R}) where {T,S,L,R}

Would it also be useful to include Base.convert(::Type{Interval{T,L,R}}, interval::Interval{S}) where {T,S,L,R} such that if you need to convert from Closed Closed to e.g. Open Open you can? Should this type of conversion include Closed -> Open but not Open -> Closed

I think this would make more sense as a constructor: https://docs.julialang.org/en/v1/manual/conversion-and-promotion/#Conversion-vs.-Construction-1.

I'd probably leave this out unless you have a use case.

omus · 2020-07-14T17:47:45Z

+                        interval1 = Interval{L1, R1}(a1, b1)
+                        interval2 = Interval{L2, R2}(a2, b2)
+                        @test promote(interval1, interval2) == (Interval{L1,R1}(promote(a1, b1)...), Interval{L2,R2}(promote(a2, b2)...))


Suggested change

interval1 = Interval{L1, R1}(a1, b1)

interval2 = Interval{L2, R2}(a2, b2)

@test promote(interval1, interval2) == (Interval{L1,R1}(promote(a1, b1)...), Interval{L2,R2}(promote(a2, b2)...))

interval1 = Interval{L1, R1}(a1, b1)

interval2 = Interval{L2, R2}(a2, b2)

promoted1 = Interval{L1,R1}(promote(a1, b1)...)

promoted2 = Interval{L2,R2}(promote(a2, b2)...)

@test promote(interval1, interval2) == (promoted1, promoted2)

omus · 2020-07-14T17:50:08Z

+Base.promote_rule(::Type{Interval{T,L1,R1}}, ::Type{Interval{S,L2,R2}}) where {T,S,L1,R1,L2,R2} = Interval{promote_type(T,S), <:Union{L1,L2}, <:Union{R1,R2}}
+# hacky way to fix situations where T and S are the same but L and R are different
+Base.not_sametype(x::Tuple{Interval{T,L1,R1}, Interval{T,L2,R2}}, y::Tuple{Interval{T,L1,R1}, Interval{T,L2,R2}}) where {T,L1,R1,L2,R2} = nothing


Probably we should just define:

Base.promote_rule(::Type{Interval{T,L,R}}, ::Type{Interval{S,L,R}}) where {T,S,L,R} = Interval{promote_type(T,S), L, R}

I suspect this would eliminate the need for the hack

sprockmonty added 3 commits June 19, 2020 01:39

added some useful convert and accessors functions

e39e57f

added tests for convert, containsfirst and containslast

b159390

fixed test format

852227f

sprockmonty requested a review from omus as a code owner June 19, 2020 01:46

omus reviewed Jun 23, 2020

View reviewed changes

sprockmonty added 4 commits June 26, 2020 00:46

added promote rule for intervals

130d689

merging upstream

7266148

added promote_rule and not_sametype hack

6cf3009

cleaned up old code

a270c77

omus reviewed Jul 14, 2020

View reviewed changes

Navigation Menu

Uh oh!

Additional accessor and convert functions - #108

Additional accessor and convert functions#108
sprockmonty wants to merge 7 commits into
invenia:masterfrom
sprockmonty:master

sprockmonty commented Jun 19, 2020

Uh oh!

codecov Bot commented Jun 19, 2020 •

edited

Loading

Uh oh!

omus left a comment

Uh oh!

omus Jun 23, 2020

Uh oh!

omus Jun 23, 2020

Uh oh!

sprockmonty commented Jun 26, 2020 •

edited

Loading

Uh oh!

omus Jul 14, 2020

Uh oh!

omus Jul 14, 2020 •

edited

Loading

Uh oh!

sprockmonty Jul 17, 2020

Uh oh!

omus Jul 17, 2020 •

edited

Loading

Uh oh!

omus Jul 14, 2020

Uh oh!

omus Jul 14, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	return Interval{L,R}(convert(T, first(interval)), convert(T, last(interval)))
	return Interval{T,L,R}(first(interval), last(interval))

	function Base.convert(::Type{<:Interval{T}}, interval::Interval{S,L,R}) where {T,S,L,R}
	function Base.convert(::Type{Interval{T}}, interval::Interval{S,L,R}) where {T,S,L,R}

Uh oh!

Conversation

sprockmonty commented Jun 19, 2020

Uh oh!

codecov Bot commented Jun 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

omus left a comment

Choose a reason for hiding this comment

Uh oh!

omus Jun 23, 2020

Choose a reason for hiding this comment

Uh oh!

omus Jun 23, 2020

Choose a reason for hiding this comment

Uh oh!

sprockmonty commented Jun 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

omus Jul 14, 2020

Choose a reason for hiding this comment

Uh oh!

omus Jul 14, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sprockmonty Jul 17, 2020

Choose a reason for hiding this comment

Uh oh!

omus Jul 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

omus Jul 14, 2020

Choose a reason for hiding this comment

Uh oh!

omus Jul 14, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov Bot commented Jun 19, 2020 •

edited

Loading

sprockmonty commented Jun 26, 2020 •

edited

Loading

omus Jul 14, 2020 •

edited

Loading

omus Jul 17, 2020 •

edited

Loading