Merge pull request #7 from haotian127/master

update HL's dissertation figures and a couple of small fixes

Author: BoundaryValueProblems

Project.toml

@@ -1,7 +1,7 @@
 name = "MultiscaleGraphSignalTransforms"
 uuid = "cc44fc10-d0fb-5545-af72-ba1cb661a341"
 authors = ["Naoki Saito <saito@math.ucdavis.edu>", "Yiqun Shao <shaoyiqun1992@gmail.com>", "Haotian Li <htsli@ucdavis.edu>"]
-version = "1.5.1"
+version = "1.5.2"
 
 [deps]
 Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"

src/LP-NGWP.jl

@@ -247,3 +247,49 @@ function const_meyer_wavelets(𝚽, Uf; idx = 1:size(Uf, 1))
     Wavelets = varimax(B)
     return Wavelets
 end
+
+"""
+    lp_ngwp_analysis(G::GraphSig, 𝚽::Matrix{Float64}, W_dual::SparseMatrixCSC{Float64, Int64},
+            GP_dual::GraphPart; ϵ::Float64 = 0.3)
+
+perform the LP-NGWP transform of the graph signal(s) `G.f`.
+
+# Input Arguments
+- `G::GraphSig`: a GraphSig object
+- `𝚽::Matrix{Float64}`: graph Laplacian eigenvectors
+- `W_dual::SparseMatrixCSC{Float64, Int64}`: weight matrix of the dual graph
+- `GP_dual::GraphPart`: GraphPart object of the dual graph
+
+# Output Argument
+- `wavelet_packet::Array{Float64,3}`: the lapped NGWP dictionary. The first
+    index is for selecting wavelets at a fixed level; the second index is for
+    selecting the level `j`; the third index is for selecting elements in the
+    wavelet vector.
+
+"""
+function lp_ngwp_analysis(G::GraphSig, 𝚽::Matrix{Float64}, W_dual::SparseMatrixCSC{Float64, Int64},
+                 GP_dual::GraphPart; ϵ::Float64 = 0.3)
+    rs = GP_dual.rs
+    inds = GP_dual.inds
+    (N, jmax) = Base.size(inds)
+    fcols = size(G.f, 2)
+
+    GP_dual.tag = zeros(Int, N, jmax)
+    GP_dual.tag[:, 1] = Vector{Int}(0:(N - 1))
+
+    Uf = Matrix{Float64}(I, N, N)
+    used_node = Set()
+
+    dmatrix = zeros(N, jmax, fcols)
+    dmatrix[:, 1, :] = G.f
+    for j = 2:jmax
+        regioncount = count(!iszero, rs[:, j]) - 1
+        keep_folding!(Uf, used_node, W_dual, GP_dual; ϵ = ϵ, j = j - 1)
+        for r = 1:regioncount
+            indr = rs[r, j]:(rs[r + 1, j] - 1)
+            GP_dual.tag[indr, j] = Vector{Int}(0:(length(indr) - 1))
+            dmatrix[indr, j, :] = const_meyer_wavelets(𝚽, Uf; idx = inds[indr, j])' * G.f
+        end
+    end
+    return dmatrix
+end

src/MultiscaleGraphSignalTransforms.jl

@@ -52,7 +52,7 @@ export natural_eigdist
 export SunFlowerGraph, dualgraph
 export pc_ngwp, pairclustering
 export vm_ngwp, varimax
-export lp_ngwp, rising_cutoff, find_pairinds, pair_inds_shadding
+export lp_ngwp, rising_cutoff, find_pairinds, pair_inds_shadding, lp_ngwp_analysis
 export LPHGLET_Synthesis, LPHGLET_Analysis_All, HGLET_dictionary, LPHGLET_dictionary
 export unitary_folding_operator, keep_folding!
 export ngwp_analysis, ngwp_bestbasis, NGWP_jkl

src/helpers.jl

@@ -121,52 +121,74 @@ SCATTER\\_GPLOT!(X; ...) adds a plot to `current` one.
 
 """
 function scatter_gplot(X; marker = nothing, ms = 4, plotOrder = :normal, c = :viridis)
-    dim = size(X,2)
-    if marker != nothing && plotOrder != :normal
-        if plotOrder == :s2l
+    N, dim = size(X)
+    if marker != nothing
+        if size(marker) == (N,) || size(marker) == (N, 1)
+            marker = marker[:]  # reshape N x 1 matrix to a vector of length N
+        else
+            error("marker only accepts a vector of length $(N) or a matrix of size $(N) x 1.")
+        end
+        if plotOrder == :normal
+            idx = 1:N
+        elseif plotOrder == :s2l
             idx = sortperm(marker)
         elseif plotOrder == :l2s
-            idx = sortperm(marker, rev=true)
+            idx = sortperm(marker, rev = true)
         else
-            print("Error: plotOrder only supports for :normal, :s2l, or :l2s.")
+            error("plotOrder only supports for :normal, :s2l, or :l2s.")
         end
-        X = X[idx,:]
+        X = X[idx, :]
         marker = marker[idx]
         if length(ms) > 1
             ms = ms[idx]
         end
     end
     if dim == 2
-        scatter(X[:,1],X[:,2], marker_z = marker, ms = ms, c = c, legend = false, mswidth = 0, cbar = true, aspect_ratio = 1, grid = false)
+        scatter(X[:, 1], X[:, 2], marker_z = marker, ms = ms, c = c,
+                legend = false, mswidth = 0, cbar = true, aspect_ratio = 1,
+                grid = false)
     elseif dim == 3
-        scatter(X[:,1],X[:,2],X[:,3], marker_z = marker, ms = ms, c = c, legend = false, mswidth = 0, cbar = true, aspect_ratio = 1, grid = false)
+        scatter(X[:, 1], X[:, 2], X[:, 3], marker_z = marker, ms = ms, c = c,
+                legend = false, mswidth = 0, cbar = true, aspect_ratio = 1,
+                grid = false)
     else
-        print("Dimension Error: scatter_gplot only supports for 2-dim or 3-dim scatter plots.")
+        error("Dimension Error: scatter_gplot only supports for 2-dim or 3-dim scatter plots.")
     end
 end
 
 function scatter_gplot!(X; marker = nothing, ms = 4, plotOrder = :normal, c = :viridis)
-    dim = size(X,2)
-    if marker != nothing && plotOrder != :normal
-        if plotOrder == :s2l
+    N, dim = size(X)
+    if marker != nothing
+        if size(marker) == (N,) || size(marker) == (N, 1)
+            marker = marker[:]  # reshape N x 1 matrix to a vector of length N
+        else
+            error("marker only accepts a vector of length $(N) or a matrix of size $(N) x 1.")
+        end
+        if plotOrder == :normal
+            idx = 1:N
+        elseif plotOrder == :s2l
             idx = sortperm(marker)
         elseif plotOrder == :l2s
-            idx = sortperm(marker, rev=true)
+            idx = sortperm(marker, rev = true)
         else
-            print("Error: plotOrder only supports for :normal, :s2l, or :l2s.")
+            error("plotOrder only supports for :normal, :s2l, or :l2s.")
         end
-        X = X[idx,:]
+        X = X[idx, :]
         marker = marker[idx]
         if length(ms) > 1
             ms = ms[idx]
         end
     end
     if dim == 2
-        scatter!(X[:,1],X[:,2], marker_z = marker, ms = ms, c = c, legend = false, mswidth = 0, cbar = true, aspect_ratio = 1, grid = false)
+        scatter!(X[:, 1], X[:, 2], marker_z = marker, ms = ms, c = c,
+                legend = false, mswidth = 0, cbar = true, aspect_ratio = 1,
+                grid = false)
     elseif dim == 3
-        scatter!(X[:,1],X[:,2],X[:,3], marker_z = marker, ms = ms, c = c, legend = false, mswidth = 0, cbar = true, aspect_ratio = 1, grid = false)
+        scatter!(X[:, 1], X[:, 2], X[:, 3], marker_z = marker, ms = ms, c = c,
+                legend = false, mswidth = 0, cbar = true, aspect_ratio = 1,
+                grid = false)
     else
-        print("Dimension Error: scatter_gplot! only supports for 2-dim or 3-dim scatter plots.")
+        error("Dimension Error: scatter_gplot! only supports for 2-dim or 3-dim scatter plots.")
     end
 end