From 6ef0b557aadae0e750df80193d3372acea633ba2 Mon Sep 17 00:00:00 2001 From: Aske L Ejdrup <50575240+Ejdrup@users.noreply.github.com> Date: Wed, 19 Jan 2022 16:56:08 +0100 Subject: [PATCH 1/4] Updated for speed Updated circular_convolve_mra() to process faster. Changed from loop to list comprehension. --- modwt.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modwt.py b/modwt.py index b978c76..128d256 100644 --- a/modwt.py +++ b/modwt.py @@ -32,11 +32,7 @@ def circular_convolve_mra(h_j_o, w_j): ''' calculate the mra D_j''' N = len(w_j) l = np.arange(N) - D_j = np.zeros(N) - for t in range(N): - index = np.mod(t + l, N) - w_j_p = np.array([w_j[ind] for ind in index]) - D_j[t] = (np.array(h_j_o) * w_j_p).sum() + D_j = [(h_j_o * w_j[np.mod(t + l, N)]).sum() for t in range(N)] return D_j From 6550e474917455efcb2b1c003a58f6f2c89a9aae Mon Sep 17 00:00:00 2001 From: Aske L Ejdrup <50575240+Ejdrup@users.noreply.github.com> Date: Tue, 8 Feb 2022 18:33:07 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a158d0d..388f0f4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # modwtpy +Forked from main and rewritten loop to list compr. for speed. +Aske L. Ejdrup, 2022. + modwt in python find the detail from the matlab Documentation: @@ -17,4 +20,4 @@ import pandas as pd gdpdata = pd.DataFrame.from_csv('GDPcomponents.csv') wt = modwt(gdpdata['govtexp'], 'db2', 5) wtmra = modwtmra(wt, 'db2') -``` \ No newline at end of file +``` From a36b9548f14fb34968a9b6fedd6232011b312948 Mon Sep 17 00:00:00 2001 From: Aske L Ejdrup <50575240+Ejdrup@users.noreply.github.com> Date: Tue, 8 Feb 2022 18:33:16 +0100 Subject: [PATCH 3/4] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 388f0f4..518324c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # modwtpy Forked from main and rewritten loop to list compr. for speed. + Aske L. Ejdrup, 2022. modwt in python From 827acdf5e33122039e57c9b4b9e4c3ae155d6f0f Mon Sep 17 00:00:00 2001 From: Aske L Ejdrup <50575240+Ejdrup@users.noreply.github.com> Date: Tue, 8 Feb 2022 18:33:35 +0100 Subject: [PATCH 4/4] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 518324c..0e0744e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # modwtpy -Forked from main and rewritten loop to list compr. for speed. - -Aske L. Ejdrup, 2022. +Forked from main and rewritten loop to list compr. for speed by Aske Ejdrup, 2022. modwt in python