Updating the getindex.jl to address the issue xKDR#194 and xKDR#190

Author: siddjain444

src/apply.jl

@@ -132,6 +132,10 @@ julia> show(ts_weekly[1:10])
 ```
 """
 function apply(ts::TSFrame, period::T, fun::V, index_at::Function=first; renamecols::Bool=true) where {T<:Dates.Period, V<:Function}
+    if !issorted(ts[:, :Index]) 
+        throw(ArgumentError("The `Index` column in the TSFrame object is not sorted."))
+    end
+
     ep = endpoints(ts, period)
 
     j = 1

src/diff.jl

@@ -73,12 +73,15 @@ julia> diff(ts, 3)[1:10]     # difference over the third row
 ```
 """
 
-# Diff
+# Diff, Here we have used ArgumentError and not DomainError
+
 function diff(ts::TSFrame, periods::Int = 1)
     if periods <= 0
-        error("periods must be a postive int")
+        #error("periods must be a postive int")
+        throw(ArgumentError("`periods` must be a postive integer."))
     end
+
     ddf = ts.coredata[:, Not(:Index)] .- TSFrames.lag(ts, periods).coredata[:, Not(:Index)]
     insertcols!(ddf, 1, "Index" => ts.coredata[:, :Index])
     TSFrame(ddf, :Index)
-end
+end

src/endpoints.jl

@@ -280,7 +280,8 @@ julia> datetimesecondsrandom[endpoints(datetimesecondsrandom, Hour(1))]
 """
 function endpoints(values::AbstractVector, on::Function, k::Int=1)
     if (k <= 0)
-        throw(DomainError("`k` needs to be greater than 0"))
+        # throw(DomainError("`k` needs to be greater than 0"))
+        throw(ArgumentError("`k` must be a postive integer."))
     end
 
     ex = Expr(:call, on, values)
@@ -304,7 +305,20 @@ function endpoints(ts::TSFrame, on::Function, k::Int=1)
     endpoints(index(ts), on, k)
 end
 
-function endpoints(timestamps::AbstractVector{T}, on::V)::Vector{Int} where {T<:Union{Date, DateTime, Time}, V<:Dates.Period}
+function endpoints(timestamps::AbstractVector{T}, on::V)::Vector{Int} where {T<:Union{Date, DateTime, Time},
+                                                                V<:Union{
+                                                                    Year,
+                                                                    Quarter,
+                                                                    Month,
+                                                                    Week,
+                                                                    Day,
+                                                                    Hour,
+                                                                    Minute,
+                                                                    Second,
+                                                                    Millisecond,
+                                                                    Microsecond,
+                                                                    Nanosecond
+                                                                }}
     if (on.value <= 0)
         throw(DomainError("`on.value` needs to be greater than 0"))
     end

src/getindex.jl

@@ -252,7 +252,6 @@ julia> ts[1, "x1"]; # same as above
 ###
 
 ### Inputs: row scalar, column scalar; Output: scalar
-
 function Base.getindex(ts::TSFrame, i::Int, j::Int)
     return ts.coredata[i,j+1]
 end
@@ -274,7 +273,7 @@ end
 
 ### Inputs: row scalar, column vector; Output: TSFrame
 function Base.getindex(ts::TSFrame, i::Int, j::AbstractVector{Int})
-    TSFrame(ts.coredata[[i], Cols(:Index, j.+1)])  # increment: account for Index
+    TSFrame(ts.coredata[[i], Cols(:Index, j.+1)]) # increment: account for Index
 end
 
 
@@ -286,7 +285,6 @@ function Base.getindex(ts::TSFrame, i::Int, j::AbstractVector{T}) where {T<:Unio
     end
 end
 
-
 function Base.getindex(ts::TSFrame, dt::T, j::AbstractVector{Int}) where {T<:TimeType}
     idx = findfirst(x -> x == dt, index(ts))
     ts[idx, j]
@@ -314,7 +312,6 @@ function Base.getindex(ts::TSFrame, i::AbstractVector{Int}, j::Int)
     ts.coredata[i, j+1] # increment: account for Index
 end
 
-
 function Base.getindex(ts::TSFrame, i::AbstractVector{Int}, j::Union{AbstractString, Symbol})
     ts.coredata[i, j]
 end
@@ -327,7 +324,6 @@ function Base.getindex(ts::TSFrame, dt::AbstractVector{T}, j::Int) where {T<:Tim
     ts[idx, j]
 end
 
-
 function Base.getindex(ts::TSFrame, dt::AbstractVector{T}, j::Union{AbstractString, Symbol}) where {T<:TimeType}
     idx = map(d -> findfirst(x -> x == d, index(ts)), dt)
     if length(idx) == 0
@@ -347,7 +343,6 @@ function Base.getindex(ts::TSFrame, i::AbstractVector{Int}, j::AbstractVector{In
     TSFrame(ts.coredata[i, Cols(:Index, j.+1)]) # increment: account for Index
 end
 
-
 function Base.getindex(ts::TSFrame, i::AbstractVector{Int}, j::AbstractVector{T}) where {T<:Union{AbstractString, Symbol}}
     if length(unique(map(x -> typeof(x), j))) == 1
         TSFrame(ts.coredata[i, Cols(:Index, j)])
@@ -356,7 +351,6 @@ function Base.getindex(ts::TSFrame, i::AbstractVector{Int}, j::AbstractVector{T}
     end
 end
 
-
 function Base.getindex(ts::TSFrame, dt::AbstractVector{T}, j::AbstractVector{Int}) where {T<:TimeType}
     idx = map(d -> findfirst(x -> x == d, index(ts)), dt)
     if length(idx) == 0
@@ -365,15 +359,13 @@ function Base.getindex(ts::TSFrame, dt::AbstractVector{T}, j::AbstractVector{Int
     ts[idx, j]
 end
 
-
 function Base.getindex(ts::TSFrame, dt::AbstractVector{D}, j::AbstractVector{T}) where {D<:TimeType, T<:Union{AbstractString, Symbol}}
-    idx = map(d -> findfirst(x -> x == d, index(ts)), dt)
     if length(unique(map(x -> typeof(x), j))) == 1
+    idx = map(d -> findfirst(x -> x == d, index(ts)), dt)
         ts[idx, j]
     else
         throw(ArgumentError("The column vector cannot contain both AbstractString and Symbol types."))
-    end
-    
+    end   
 end
 ###
 
@@ -393,7 +385,6 @@ function Base.getindex(ts::TSFrame, i::UnitRange, j::Int)
     ts[collect(i), j]
 end
 
-
 function Base.getindex(ts::TSFrame, i::UnitRange, j::Union{AbstractString, Symbol})
     ts[collect(i), j]
 end
@@ -404,7 +395,6 @@ function Base.getindex(ts::TSFrame, i::UnitRange, j::AbstractVector{Int})
     ts[collect(i), j]
 end
 
-
 function Base.getindex(ts::TSFrame, i::UnitRange, j::AbstractVector{T}) where {T<:Union{AbstractString, Symbol}}
     if length(unique(map(x -> typeof(x), j))) == 1
         ts[collect(i), j]
@@ -514,7 +504,6 @@ function Base.getindex(ts::TSFrame, ::Colon, j::Int)
     ts[1:TSFrames.nrow(ts), j]
 end
 
-
 function Base.getindex(ts::TSFrame, ::Colon, j::Union{AbstractString, Symbol})
     ts[1:TSFrames.nrow(ts), j]
 end

src/subset.jl

@@ -5,7 +5,7 @@
 subset(ts::TSFrame, from::T, to::T) where {T<:Union{Int, TimeType}}
 ```
 
-Create a subset of `ts` based on the `Index` starting `from`
+Create a subset of `ts` based on the [`Index`](@ref) starting `from`
 (inclusive) till `to` (inclusive).
 
 # Examples
@@ -139,6 +139,7 @@ julia> subset(ts,Date("2022-9-27"),:)
 
 """
 function subset(ts::TSFrame, from::T, to::T) where {T<:Union{Int, TimeType}}
+    #TSFrame(DataFrames.subset(ts.coredata, :Index => x -> from .<= x .<= to))
     TSFrame(DataFrames.subset(ts.coredata, :Index => x -> from .<= x .<= to))
 end
 

src/utils.jl

@@ -537,6 +537,7 @@ function _check_consistency(ts::TSFrame)::Bool
     issorted(index(ts))
 end
 
+
 """
 
 ```julia