Skip to content

Adding operations on intervals #16

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 25, 2021
Merged

Adding operations on intervals #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ba815c
Add methods for Float64/Int diff in CBLS
Azzaare Mar 25, 2021
2d6c1f3
Bump version
Azzaare Mar 25, 2021
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PatternFolds"
uuid = "c18a7f1d-76ad-4ce4-950d-5419b888513b"
authors = ["Jean-Francois Baffier"]
version = "0.1.3"
version = "0.1.4"

[deps]
Lazy = "50d2b5c4-7a5e-59d5-8109-a42b560f39c0"
Expand Down
3 changes: 2 additions & 1 deletion src/PatternFolds.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export Interval, IntervalsFold
export pattern, gap, folds, check_pattern
export length
export fold, unfold
export value
export value, closed, opened
export a_isless, b_isless, a_ismore, b_ismore

# includes
include("common.jl")
Expand Down
16 changes: 16 additions & 0 deletions src/intervals.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,22 @@ closed(i, ::Val{:b}) = i.b[2]
closed(i, bound) = closed(i, Val(bound))
opened(i, bound) = !closed(i, bound)

function a_isless(i₁, i₂)
a₁ = value(i₁, :a)
a₂ = value(i₂, :a)
return a₁ == a₂ ? closed(i₁, :a) || opened(i₂, :a) : a₁ < a₂
end

a_ismore(i₁, i₂) = a_isless(i₂, i₁)

function b_ismore(i₁, i₂)
b₁ = value(i₁, :b)
b₂ = value(i₂, :b)
return b₁ == b₂ ? closed(i₁, :b) || opened(i₂, :b) : b₁ > b₂
end

b_isless(i₁, i₂) = b_ismore(i₂, i₁)

function Base.in(val, i::Interval)
(x, y) = (value(i, :a), value(i, :b))
lesser = closed(i, :a) ? x ≤ val : x < val
Expand Down