Merge pull request #62 from Marco-Congedo/dev

Dev
Marco-Congedo · Jun 26, 2021 · 135473a · 135473a
2 parents 118b01c + 5e30df9
commit 135473a
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 35 deletions.
diff --git a/Manifest.toml b/Manifest.toml
@@ -3,22 +3,36 @@
 [[Base64]]
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
+[[Compat]]
+deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
+git-tree-sha1 = "dc7dedc2c2aa9faf59a55c622760a25cbefbe941"
+uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
+version = "3.31.0"
+
 [[CovarianceEstimation]]
 deps = ["LinearAlgebra", "Statistics", "StatsBase"]
-git-tree-sha1 = "85501f0aa96395e944639e3531fe9b0f08393af1"
+git-tree-sha1 = "bc3930158d2be029e90b7c40d1371c4f54fa04db"
 uuid = "587fd27a-f159-11e8-2dae-1979310e6154"
-version = "0.2.5"
+version = "0.2.6"
 
 [[DataAPI]]
-git-tree-sha1 = "ad84f52c0b8f05aa20839484dbaf01690b41ff84"
+git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385"
 uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
-version = "1.4.0"
+version = "1.7.0"
 
 [[DataStructures]]
-deps = ["InteractiveUtils", "OrderedCollections"]
-git-tree-sha1 = "88d48e133e6d3dd68183309877eac74393daa7eb"
+deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
+git-tree-sha1 = "4437b64df1e0adccc3e5d1adbc3ac741095e4677"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.17.20"
+version = "0.18.9"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[DelimitedFiles]]
+deps = ["Mmap"]
+uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 
 [[Distributed]]
 deps = ["Random", "Serialization", "Sockets"]
@@ -28,6 +42,10 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 deps = ["Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
+[[LibGit2]]
+deps = ["Printf"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
 [[Libdl]]
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
@@ -44,40 +62,58 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
 
 [[Missings]]
 deps = ["DataAPI"]
-git-tree-sha1 = "ed61674a0864832495ffe0a7e889c0da76b0f4c8"
+git-tree-sha1 = "4ea90bd5d3985ae1f9a908bd4500ae88921c5ce7"
 uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
-version = "0.4.4"
+version = "1.0.0"
+
+[[Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
 [[OrderedCollections]]
-git-tree-sha1 = "cf59cfed2e2c12e8a2ff0a4f1e9b2cd8650da6db"
+git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
 uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
-version = "1.3.2"
+version = "1.4.1"
+
+[[Pkg]]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PosDefManifold]]
 deps = ["LinearAlgebra", "Statistics"]
-git-tree-sha1 = "9d2e1da251012e519228a386a39fe2aa32eee12e"
+git-tree-sha1 = "2010295335c00d7465571c6ee5e1eac5dc4a25e3"
 uuid = "f45a3650-5c51-11e9-1e9a-133aa5e309cf"
-version = "0.4.8"
+version = "0.4.9"
 
 [[Printf]]
 deps = ["Unicode"]
 uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
 [[Random]]
 deps = ["Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
 [[Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 
+[[SharedArrays]]
+deps = ["Distributed", "Mmap", "Random", "Serialization"]
+uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
+
 [[Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
 [[SortingAlgorithms]]
-deps = ["DataStructures", "Random", "Test"]
-git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd"
+deps = ["DataStructures"]
+git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96"
 uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
-version = "0.3.1"
+version = "1.0.0"
 
 [[SparseArrays]]
 deps = ["LinearAlgebra", "Random"]
@@ -87,15 +123,24 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
+[[StatsAPI]]
+git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510"
+uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
+version = "1.0.0"
+
 [[StatsBase]]
-deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"]
-git-tree-sha1 = "19bfcb46245f69ff4013b3df3b977a289852c3a1"
+deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
+git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d"
 uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.32.2"
+version = "0.33.8"
 
 [[Test]]
 deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
 [[Unicode]]
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Diagonalizations"
 uuid = "9cd687f3-b62d-43f3-8fd3-ffcd9e581047"
 authors = ["Marco-Congedo <marco.congedo@gmail.com>"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 CovarianceEstimation = "587fd27a-f159-11e8-2dae-1979310e6154"

diff --git a/docs/src/Diagonalizations.md b/docs/src/Diagonalizations.md
@@ -420,7 +420,7 @@ i.e.,
 
 and let ``D`` be a diagonal matrix, then it is easy to verify that any
 matrix ``FPD`` is an *equivalent* approximate joint diagonalizer of the set
-``C``. To check if two diagonalizers are equivaent, you can use the
+``C``. To check if two diagonalizers are equivalent, you can use the
 [`spForm`](@ref) function.
 
 ## notation & nomenclature

diff --git a/src/Diagonalizations.jl b/src/Diagonalizations.jl
@@ -1,8 +1,8 @@
 #   Main Module of the Diagonalization.jl Package for Julia language
-#   v 0.1.9 - last update 25th of February 2020
+#   v 0.2.1 - last update 25th of June 2021.
 
 #   MIT License
-#   Copyright (c) 2019, 2020
+#   Copyright (c) 2019-2021,
 #   Marco Congedo, CNRS, Grenoble, France:
 #   https://sites.google.com/site/marcocongedo/home
 
@@ -240,6 +240,8 @@ function Base.show(io::IO, ::MIME{Symbol("text/plain")}, f::LinearFilter)
   println(io, greyFont,"ar=accumulated regularized ev")
 end
 
+##
+
 println("\n⭐ "," Welcome to the ", 📌, " package", " ⭐\n")
 @info " "
 println(" Your Machine `",gethostname(),"` (",Sys.MACHINE, ")")

diff --git a/src/ajd.jl b/src/ajd.jl
@@ -1,7 +1,7 @@
 #   Unit "ajd.jl" of the Diagonalization.jl Package for Julia language
 #
 #   MIT License
-#   Copyright (c) 2019, 2020
+#   Copyright (c) 2019-2021,
 #   Marco Congedo, CNRS, Grenoble, France:
 #   https://sites.google.com/site/marcocongedo/home
 

diff --git a/src/cca.jl b/src/cca.jl
@@ -1,7 +1,7 @@
 #   Unit "cca.jl" of the Diagonalization.jl Package for Julia language
 #
 #   MIT License
-#   Copyright (c) 2019, 2020
+#   Copyright (c) 2019-2021,
 #   Marco Congedo, CNRS, Grenoble, France:
 #   https://sites.google.com/site/marcocongedo/home
 

diff --git a/src/csp.jl b/src/csp.jl
@@ -1,7 +1,7 @@
 #   Unit "csp.jl" of the Diagonalization.jl Package for Julia language
 #
 #   MIT License
-#   Copyright (c) 2019, 2020
+#   Copyright (c) 2019-2021,
 #   Marco Congedo, CNRS, Grenoble, France:
 #   https://sites.google.com/site/marcocongedo/home
 

diff --git a/src/gcca.jl b/src/gcca.jl
@@ -1,7 +1,7 @@
 #   Unit "gcca.jl" of the Diagonalization.jl Package for Julia language
 #
 #   MIT License
-#   Copyright (c) 2019, 2020
+#   Copyright (c) 2019-2021,
 #   Marco Congedo, CNRS, Grenoble, France:
 #   https://sites.google.com/site/marcocongedo/home
 

diff --git a/src/optim/Gajd.jl b/src/optim/Gajd.jl
@@ -1,7 +1,7 @@
 #  Unit "Gajd.jl" of the Diagonalization.jl Package for Julia language
 #
 #  MIT License
-#  Copyright (c) 2019,
+#  Copyright (c) 2020-2021,
 #  Marco Congedo, CNRS, Grenoble, France:
 #  https://sites.google.com/site/marcocongedo/home
 

diff --git a/src/optim/Jade.jl b/src/optim/Jade.jl
@@ -1,7 +1,7 @@
 #  Unit "Jade.jl" of the Diagonalization.jl Package for Julia language
 #
 #  MIT License
-#  Copyright (c) 2019, 2020
+#  Copyright (c) 2019-2021
 #  Marco Congedo, CNRS, Grenoble, France:
 #  https://sites.google.com/site/marcocongedo/home
 #  Konstantin Usevich, CNRS, Nancy, France

diff --git a/src/optim/JoB.jl b/src/optim/JoB.jl
@@ -1,7 +1,7 @@
 #   Unit "JoB.jl" of the Diagonalization.jl Package for Julia language
 #
 #   MIT License
-#   Copyright (c) 2019,
+#   Copyright (c) 2019-2021,
 #   Marco Congedo, CNRS, Grenoble, France:
 #   https://sites.google.com/site/marcocongedo/home
 

diff --git a/src/optim/LogLike.jl b/src/optim/LogLike.jl
@@ -1,7 +1,7 @@
 #  Unit "LogLike.jl" of the Diagonalization.jl package for Julia language
 #
 #  MIT License
-#  Copyright (c) 2019, 2020
+#  Copyright (c) 2019-2021,
 #  Marco Congedo, CNRS, Grenoble, France:
 #  https://sites.google.com/site/marcocongedo/home
 
@@ -133,6 +133,8 @@ function logLike(𝐂::Union{Vector{Hermitian}, Vector{Symmetric}};
 			  eVar 	   :: TeVaro = ○,
 			  eVarMeth :: Function = searchsortedfirst)
 
+	w===○ && @warn 📌*" package - `loglike` function: argument `w` is not taken into consideration for this AJD algorithm. Uniform weights will be applied."
+
 	# pre-whiten or initialize and stack matrices horizontally
 	W, C = _preWhiteOrInit(𝐂, preWhite, Jeffrey, eVar, eVarMeth, init, :stacked)
 

diff --git a/src/optim/QnLogLike.jl b/src/optim/QnLogLike.jl
@@ -1,7 +1,7 @@
 #  Unit "QnLogLike.jl" of the Diagonalization.jl Package for Julia language
 #
 #  MIT License
-#  Copyright (c) 2020,
+#  Copyright (c) 2020-2021,
 #  Marco Congedo°, Ronald Phlypo, CNRS, UGA, Grenoble-INP, France
 #  Alexandre Gramfort¨, INRIA, U. Paris Saclay, France
 #  ° https://sites.google.com/site/marcocongedo/

diff --git a/src/optim/common.jl b/src/optim/common.jl
@@ -1,7 +1,7 @@
 #  Unit "common.jl" of the Diagonalization.jl Package for Julia language
 #
 #  MIT License
-#  Copyright (c) 2019,
+#  Copyright (c) 2019-2021,
 #  Marco Congedo, CNRS, Grenoble, France:
 #  https://sites.google.com/site/marcocongedo/home
 

diff --git a/src/pca.jl b/src/pca.jl
@@ -1,7 +1,7 @@
 #   Unit "pca.jl" of the Diagonalization.jl Package for Julia language
 #
 #   MIT License
-#   Copyright (c) 2019, 2020
+#   Copyright (c) 2019-2021,
 #   Marco Congedo, CNRS, Grenoble, France:
 #   https://sites.google.com/site/marcocongedo/home
 

diff --git a/src/tools.jl b/src/tools.jl
@@ -1,7 +1,7 @@
 #   Unit "tools.jl" of the Diagonalization.jl Package for Julia language
 #
 #   MIT License
-#   Copyright (c) 2019, 2020
+#   Copyright (c) 2019-2021,
 #   Marco Congedo, CNRS, Grenoble, France:
 #   https://sites.google.com/site/marcocongedo/home