Merge branch 'dev'

UCD4IDS · Dec 1, 2021 · 80938a6 · 80938a6
2 parents 0b87b2e + 465b888
commit 80938a6
Show file tree

Hide file tree

Showing 7 changed files with 1,092 additions and 921 deletions.
diff --git a/Project.toml b/Project.toml
@@ -5,6 +5,7 @@ version = "0.1.12"
 
 [deps]
 AverageShiftedHistograms = "77b51b56-6f8f-5c3a-9cb4-d71f9594ea6e"
+Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 ImageQualityIndexes = "2996bd0c-7a13-11e9-2da2-2f5ce47296a9"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

diff --git a/src/mod/DWT.jl b/src/mod/DWT.jl
@@ -508,6 +508,7 @@ function Wavelets.Transforms.wpt!(y::AbstractArray{T,2},
     # ----- Allocation and setup to match Wavelets.jl's function requirements -----
     m, n = size(x)
     g, h = WT.makereverseqmfpair(wt, true)      # low & high pass filters
+    y[:] = copy(x)
     yₜ = copy(x)                                 # Placeholder of y
     temp = Array{T,2}(undef, (m,n))             # Temp array
     # ----- Compute transforms based on tree -----
@@ -669,6 +670,7 @@ function Wavelets.Transforms.iwpt!(x̂::AbstractArray{T,2},
     # ----- Setup -----
     m, n = size(xw)
     g, h = WT.makereverseqmfpair(wt, true)      # low & high pass filters
+    x̂[:] = copy(xw)
     xwₜ = copy(xw)                               # Placeholder for xw
     temp = Array{T,2}(undef, (m,n))             # temp array
     # ----- Compute transforms based on tree -----