Skip to content

Commit 33b034b

Browse files
Merge pull request #82 from Marco-Congedo/dev
Dev
2 parents b1c57f3 + efae904 commit 33b034b

18 files changed

+73
-44
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MIT License
2-
Copyright (c) 2019-2022, Marco Congedo, CNRS, Grenobe, France:
2+
Copyright (c) 2019-2023, Marco Congedo, CNRS, Grenobe, France:
33
https://sites.google.com/site/marcocongedo/home
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy

Manifest.toml

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.7.3"
3+
julia_version = "1.7.2"
44
manifest_format = "2.0"
5+
project_hash = "56170651fc802598e709181b97780d9e067e6980"
56

67
[[deps.AbstractFFTs]]
78
deps = ["ChainRulesCore", "LinearAlgebra"]
@@ -11,6 +12,7 @@ version = "1.2.1"
1112

1213
[[deps.ArgTools]]
1314
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
15+
version = "1.1.1"
1416

1517
[[deps.Artifacts]]
1618
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
@@ -39,6 +41,7 @@ version = "4.2.0"
3941
[[deps.CompilerSupportLibraries_jll]]
4042
deps = ["Artifacts", "Libdl"]
4143
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
44+
version = "1.0.2+0"
4245

4346
[[deps.DSP]]
4447
deps = ["Compat", "FFTW", "IterTools", "LinearAlgebra", "Polynomials", "Random", "Reexport", "SpecialFunctions", "Statistics"]
@@ -59,6 +62,7 @@ version = "0.9.1"
5962
[[deps.Downloads]]
6063
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
6164
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
65+
version = "1.6.0"
6266

6367
[[deps.FFTW]]
6468
deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"]
@@ -77,9 +81,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
7781

7882
[[deps.IntelOpenMP_jll]]
7983
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
80-
git-tree-sha1 = "d979e54b71da82f3a65b62553da4fc3d18c9004c"
84+
git-tree-sha1 = "0cb9352ef2e01574eeebdb102948a58740dcaf83"
8185
uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0"
82-
version = "2018.0.3+2"
86+
version = "2023.1.0+0"
8387

8488
[[deps.InteractiveUtils]]
8589
deps = ["Markdown"]
@@ -92,14 +96,14 @@ uuid = "3587e190-3f89-42d0-90ee-14403ec27112"
9296
version = "0.1.7"
9397

9498
[[deps.IrrationalConstants]]
95-
git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151"
99+
git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2"
96100
uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
97-
version = "0.1.1"
101+
version = "0.2.2"
98102

99103
[[deps.IterTools]]
100-
git-tree-sha1 = "fa6287a4469f5e048d763df38279ee729fbd44e5"
104+
git-tree-sha1 = "4ced6667f9974fc5c5943fa5e2ef1ca43ea9e450"
101105
uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
102-
version = "1.4.0"
106+
version = "1.8.0"
103107

104108
[[deps.JLLWrappers]]
105109
deps = ["Preferences"]
@@ -114,10 +118,12 @@ uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
114118
[[deps.LibCURL]]
115119
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
116120
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
121+
version = "0.6.3"
117122

118123
[[deps.LibCURL_jll]]
119124
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
120125
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
126+
version = "7.84.0+0"
121127

122128
[[deps.LibGit2]]
123129
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
@@ -126,12 +132,13 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
126132
[[deps.LibSSH2_jll]]
127133
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
128134
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
135+
version = "1.10.2+0"
129136

130137
[[deps.Libdl]]
131138
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
132139

133140
[[deps.LinearAlgebra]]
134-
deps = ["Libdl", "libblastrampoline_jll"]
141+
deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
135142
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
136143

137144
[[deps.LogExpFunctions]]
@@ -162,14 +169,17 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
162169

163170
[[deps.NetworkOptions]]
164171
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
172+
version = "1.2.0"
165173

166174
[[deps.OpenBLAS_jll]]
167175
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
168176
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
177+
version = "0.3.21+4"
169178

170179
[[deps.OpenLibm_jll]]
171180
deps = ["Artifacts", "Libdl"]
172181
uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
182+
version = "0.8.1+0"
173183

174184
[[deps.OpenSpecFun_jll]]
175185
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
@@ -178,8 +188,9 @@ uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
178188
version = "0.5.5+0"
179189

180190
[[deps.Pkg]]
181-
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
191+
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
182192
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
193+
version = "1.9.0"
183194

184195
[[deps.Polynomials]]
185196
deps = ["LinearAlgebra", "RecipesBase"]
@@ -195,9 +206,9 @@ version = "0.5.0"
195206

196207
[[deps.Preferences]]
197208
deps = ["TOML"]
198-
git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
209+
git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
199210
uuid = "21216c6a-2e73-6563-6e65-726566657250"
200-
version = "1.3.0"
211+
version = "1.4.0"
201212

202213
[[deps.Printf]]
203214
deps = ["Unicode"]
@@ -223,6 +234,7 @@ version = "1.2.2"
223234

224235
[[deps.SHA]]
225236
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
237+
version = "0.7.0"
226238

227239
[[deps.Serialization]]
228240
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -231,7 +243,7 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
231243
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
232244

233245
[[deps.SparseArrays]]
234-
deps = ["LinearAlgebra", "Random"]
246+
deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"]
235247
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
236248

237249
[[deps.SpecialFunctions]]
@@ -243,18 +255,22 @@ version = "2.1.7"
243255
[[deps.Statistics]]
244256
deps = ["LinearAlgebra", "SparseArrays"]
245257
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
258+
version = "1.9.0"
259+
260+
[[deps.SuiteSparse_jll]]
261+
deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"]
262+
uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
263+
version = "5.10.1+6"
246264

247265
[[deps.TOML]]
248266
deps = ["Dates"]
249267
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
268+
version = "1.0.3"
250269

251270
[[deps.Tar]]
252271
deps = ["ArgTools", "SHA"]
253272
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
254-
255-
[[deps.Test]]
256-
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
257-
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
273+
version = "1.10.0"
258274

259275
[[deps.UUIDs]]
260276
deps = ["Random", "SHA"]
@@ -266,15 +282,19 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
266282
[[deps.Zlib_jll]]
267283
deps = ["Libdl"]
268284
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
285+
version = "1.2.13+0"
269286

270287
[[deps.libblastrampoline_jll]]
271-
deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
288+
deps = ["Artifacts", "Libdl"]
272289
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
290+
version = "5.7.0+0"
273291

274292
[[deps.nghttp2_jll]]
275293
deps = ["Artifacts", "Libdl"]
276294
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
295+
version = "1.48.0+0"
277296

278297
[[deps.p7zip_jll]]
279298
deps = ["Artifacts", "Libdl"]
280299
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
300+
version = "17.4.0+0"

Project.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name = "FourierAnalysis"
22
uuid = "e7e9c730-dc46-11e9-3633-f1ab55cc17e1"
33
authors = ["Marco-Congedo <marco.congedo@gmail.com>"]
4-
version = "1.2.2"
4+
version = "1.2.3"
5+
56

67
[deps]
78
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -13,9 +14,9 @@ RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
1314
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1415

1516
[compat]
16-
AbstractFFTs = "~0.5.0, 1"
17-
DSP = "~0.7.5"
18-
FFTW = "~1.3.0, 1"
19-
PosDefManifold = "0.4.9, 0.5"
20-
RecipesBase = "~1.1.2, 1"
17+
AbstractFFTs = "0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.2, 1.3"
18+
DSP = "0.7"
19+
FFTW = "1.3, 1.4,1.5, 1.6, 1.7"
20+
PosDefManifold = "0.5"
21+
RecipesBase = "1.1, 1.2, 1.3"
2122
julia = "1"

src/FourierAnalysis.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Main Module of the FourierAnalysis Package for julia language
2-
# v 1.2.2 - last update September 2022
2+
# v 1.2.3 - last update June 2023
33
#
44
# MIT License
5-
# Copyright (c) 2019-2022,
5+
# Copyright (c) 2019-2023,
66
# Marco Congedo, CNRS, Grenobe, France:
77
# https://sites.google.com/site/marcocongedo/home
88

@@ -197,6 +197,7 @@ TaperKind,
197197
riesz,
198198
parzen,
199199
slepian,
200+
Taper,
200201
taper,
201202
slepians,
202203
taperinfo,

src/LOCAL_BUILD.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ begin
2727
docsDir = juliaCodeDir*projectName*"\\docs\\"
2828

2929
push!(LOAD_PATH, srcDir)
30-
using Documenter, LinearAlgebra, Statistics, AbstractFFTs, FFTW,
30+
using LinearAlgebra, Statistics, AbstractFFTs, FFTW,
3131
DSP, Revise, FourierAnalysis
3232

3333
# for compiling the documentation

src/coherence.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unit "coherence" of the FourierAnalysis Package for julia language
22
#
33
# MIT License
4-
# Copyright (c) 2019-2022,
4+
# Copyright (c) 2019-2023,
55
# Marco Congedo, CNRS, Grenobe, France:
66
# https://sites.google.com/site/marcocongedo/home
77

@@ -505,7 +505,7 @@ function Base.show(io::IO, ::MIME{Symbol("text/plain")}, C::Coherence)
505505
println(io, "sampling rate (.sr): $(C.sr)")
506506
println(io, "epoch length (.wl): $(C.wl)")
507507
println(io, "DC level (.DC): $(C.DC)")
508-
println(io, "taper kind (.tapering): $(C.taper)")
508+
println(io, "taper kind (.taper): $(C.taper)")
509509
println(io, "freq. lab. (.flabels): $(l)-", typeof(C.flabels))
510510
println(io, "data (.y): $(l)-", typeof(C.y))
511511
# println(io, C.y)

src/crossspectra.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unit "crossspectra" of the FourierAnalysis Package for julia language
22
#
33
# MIT License
4-
# Copyright (c) 2019-2022,
4+
# Copyright (c) 2019-2023,
55
# Marco Congedo, CNRS, Grenobe, France:
66
# https://sites.google.com/site/marcocongedo/home
77

@@ -406,7 +406,7 @@ function Base.show(io::IO, ::MIME{Symbol("text/plain")}, S::CrossSpectra)
406406
println(io, "sampling rate (.sr): $(S.sr)")
407407
println(io, "epoch length (.wl): $(S.wl)")
408408
println(io, "DC level (.DC): $(S.DC)")
409-
println(io, "taper kind (.tapering): $(S.taper)")
409+
println(io, "taper kind (.taper): $(S.taper)")
410410
println(io, "freq. lab. (.flabels): $(l)-", typeof(S.flabels))
411411
println(io, "data (.y): $(l)-", typeof(S.y))
412412
# println(io, S.y)

src/fftw.jl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unit "fftw.jl" of the FourierAnalysis Package for julia language
22
#
33
# MIT License
4-
# Copyright (c) 2019-2022,
4+
# Copyright (c) 2019-2023,
55
# Marco Congedo, CNRS, Grenobe, France:
66
# https://sites.google.com/site/marcocongedo/home
77

@@ -101,6 +101,13 @@ For example, the line above could have been written more shortly as
101101
p=Planner(plan_exhaustive, 10.0, 256)
102102
```
103103
104+
In order to create also a backward plan you would use instead
105+
106+
```julia
107+
p=Planner(plan_exhaustive, 10.0, 256, eltype(𝐗[1]), true)
108+
```
109+
110+
104111
"""
105112
struct Planner
106113
flags :: UInt32 # see

src/filters.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unit "filters" of the FourierAnalysis Package for julia language
22
#
33
# MIT License
4-
# Copyright (c) 2019-2022,
4+
# Copyright (c) 2019-2023,
55
# Marco Congedo, CNRS, Grenobe, France:
66
# https://sites.google.com/site/marcocongedo/home
77

src/goertzel.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unit "gortzel" of the FourierAnalysis Package for julia language
22
#
33
# MIT License
4-
# Copyright (c) 2019-2022,
4+
# Copyright (c) 2019-2023,
55
# Marco Congedo, CNRS, Grenobe, France:
66
# https://sites.google.com/site/marcocongedo/home
77

0 commit comments

Comments
 (0)