Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
16 changes: 8 additions & 8 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "WaveletsExt"
uuid = "8f464e1e-25db-479f-b0a5-b7680379e03f"
authors = ["Zeng Fung Liew <lzfliew@ucdavis.edu>", "Shozen Dan <shodan@ucdavis.edu>"]
version = "0.2.1"
version = "0.2.2"

[deps]
AverageShiftedHistograms = "77b51b56-6f8f-5c3a-9cb4-d71f9594ea6e"
Expand All @@ -19,13 +19,13 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Wavelets = "29a6e085-ba6d-5f35-a997-948ac2efa89a"

[compat]
AverageShiftedHistograms = "0.8.6"
AverageShiftedHistograms = "0.8.9"
Combinatorics = "1"
Distributions = "0.24, 0.25"
ImageQualityIndexes = "0.2, 0.3"
Parameters = "0.12.2"
Distributions = "0.25"
ImageQualityIndexes = "0.3"
Parameters = "0.12"
Plots = "1.20"
Reexport = "1.1"
StatsBase = "0.33.9"
Wavelets = "0.9.3"
julia = "1.6, 1.7"
StatsBase = "0.34"
Wavelets = "0.10"
julia = "1.6"
10 changes: 5 additions & 5 deletions src/mod/SWT.jl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function sdwt(x::AbstractArray{T},
L::Integer = maxtransformlevels(x)) where T<:Number
# Sanity check
@assert 1 ≤ ndims(x) ≤ 2
@assert L ≤ maxtransformlevels(x) || throw(ArgumentError("Too many transform levels (length(x) < 2^L"))
@assert L ≤ maxtransformlevels(x) || throw(ArgumentError("Too many transform levels (length(x) < 2^L)"))
@assert L ≥ 1 || throw(ArgumentError("L must be ≥ 1"))
# Setup
sz = size(x)
Expand Down Expand Up @@ -112,7 +112,7 @@ function sdwt!(xw::AbstractArray{T,2},
L::Integer = maxtransformlevels(x)) where T<:Number
# Sanity check
@assert L ≤ maxtransformlevels(x) ||
throw(ArgumentError("Too many transform levels (length(x) < 2^L"))
throw(ArgumentError("Too many transform levels (length(x) < 2^L)"))
@assert L ≥ 1 || throw(ArgumentError("L must be ≥ 1"))

# Setup
Expand Down Expand Up @@ -793,7 +793,7 @@ function swpd(x::AbstractArray{T},
# Sanity check
@assert 1 ≤ ndims(x) ≤ 2
@assert L ≤ maxtransformlevels(x) ||
throw(ArgumentError("Too many transform levels (length(x) < 2^L"))
throw(ArgumentError("Too many transform levels (length(x) < 2^L)"))
@assert L ≥ 1 || throw(ArgumentError("L must be ≥ 1"))
# Setup
sz = size(x) # Signal size
Expand Down Expand Up @@ -843,7 +843,7 @@ function swpd!(xw::AbstractArray{T,2},
L::Integer = maxtransformlevels(x)) where T<:Number
# Sanity check
@assert L <= maxtransformlevels(x) ||
throw(ArgumentError("Too many transform levels (length(x) < 2^L"))
throw(ArgumentError("Too many transform levels (length(x) < 2^L)"))
@assert L >= 1 || throw(ArgumentError("L must be >= 1"))

# Setup
Expand Down Expand Up @@ -1201,4 +1201,4 @@ end
include("swt/swt_one_level.jl")
include("swt/swt_all.jl")

end # end module
end # end module
4 changes: 2 additions & 2 deletions src/mod/acwt/acwt_one_level.jl
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ function acdwt_step!(w₁::AbstractVector{T},
w₂::AbstractVector{T},
v::AbstractVector{T},
d::Integer,
h::Array{T,1},
g::Array{T,1}) where {T<:Number, S<:Number}
h::Vector{S},
g::Vector{S}) where {T<:Number, S<:Number}
# Sanity check
@assert length(w₁) == length(w₂) == length(v)
@assert length(h) == length(g)
Expand Down