add clamp option to movingwindow

Author: meggart

src/userfuncs.jl

@@ -37,13 +37,13 @@ struct CapturedArgsFunc{F,A,KW}
     args::A
     kwargs::KW
 end
-(c::CapturedArgsFunc)(x) = c.f(x,c.args...;c.kwargs...)
-(c::CapturedArgsFunc)(x1,x2) = c.f(x1,x2,c.args...;c.kwargs...)
-(c::CapturedArgsFunc)(x1,x2,x3) = c.f(x1,x2,x3,c.args...;c.kwargs...)
-(c::CapturedArgsFunc)(x1,x2,x3,x4) = c.f(x1,x2,x3,x4,c.args...;c.kwargs...)
-(c::CapturedArgsFunc)(x1,x2,x3,x4,x5) = c.f(x1,x2,x3,x4,x5,c.args...;c.kwargs...)
-(c::CapturedArgsFunc)(x1,x2,x3,x4,x5,x6) = c.f(x1,x2,x3,x4,x5,x6,c.args...;c.kwargs...)
-(c::CapturedArgsFunc)(x...) = c.f(x...,c.args...;c.kwargs...)
+(c::CapturedArgsFunc)(x;rkwargs...) = c.f(x,c.args...;rkwargs...,c.kwargs...)
+(c::CapturedArgsFunc)(x1,x2;rkwargs...) = c.f(x1,x2,c.args...;rkwargs...,c.kwargs...)
+(c::CapturedArgsFunc)(x1,x2,x3;rkwargs...) = c.f(x1,x2,x3,c.args...;rkwargs...,c.kwargs...)
+(c::CapturedArgsFunc)(x1,x2,x3,x4;rkwargs...) = c.f(x1,x2,x3,x4,c.args...;rkwargs...,c.kwargs...)
+(c::CapturedArgsFunc)(x1,x2,x3,x4,x5;rkwargs...) = c.f(x1,x2,x3,x4,x5,c.args...;rkwargs...,c.kwargs...)
+(c::CapturedArgsFunc)(x1,x2,x3,x4,x5,x6;rkwargs...) = c.f(x1,x2,x3,x4,x5,x6,c.args...;rkwargs...,c.kwargs...)
+(c::CapturedArgsFunc)(x...;rkwargs...) = c.f(x...,c.args...;rkwargs...,c.kwargs...)
 Base.show(io::IO,f::CapturedArgsFunc) = show(io,f.f)
 
 function create_userfunction(

src/windows.jl

@@ -138,19 +138,25 @@ function to_window(r)
     Window(r,ordering,overlap,sparsity)
 end
 
-struct MovingWindow <: AbstractVector{UnitRange{Int}}
+struct MovingWindow{C} <: AbstractVector{UnitRange{Int}}
     first::Int
     steps::Int
     width::Int
     n::Int
+    clamp::C
 end
+MovingWindow(first, steps, width, n) = MovingWindow(first, steps, width, n, nothing)
+
 Base.size(m::MovingWindow) = (m.n,)
-Base.getindex(m::MovingWindow,i::Int) = (m.first+(i-1)*m.steps):(m.first+(i-1)*m.steps+m.width-1)
+Base.getindex(m::MovingWindow{Nothing}, i::Int) = (m.first+(i-1)*m.steps):(m.first+(i-1)*m.steps+m.width-1)
+Base.getindex(m::MovingWindow, i::Int) = max(first(m.clamp), m.first + (i - 1) * m.steps):min(last(m.clamp), m.first + (i - 1) * m.steps + m.width - 1)
 get_ordering(w::MovingWindow) = w.steps > 0 ? Increasing() : Decreasing()
 get_overlap(w::MovingWindow) = w.width > abs(w.steps) ? Overlapping() : NonOverlapping()
 get_sparsity(w::MovingWindow) = abs(w.steps) > 2*w.width ? Sparse(w.width/abs(w.steps)) : Dense()
 to_window(r::MovingWindow) = r
 
+
+
 get_ordering(r::AbstractRange{Int}) = step(r)>0 ? Increasing() : Decreasing()
 get_overlap(r::AbstractRange{Int}) = NonOverlapping()
 get_sparsity(r::AbstractRange{Int}) = abs(step(r)) > 2 ? Sparse(1/abs(step(r))) : Dense()