Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sparse kde #222

Merged
merged 173 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
b6984ae
Add basic API for SparseKDE and supporting functions
PicoCentauri Feb 9, 2024
73d57ac
periodic euclidean distance
GardevoirX Feb 12, 2024
12f6a53
migration
GardevoirX Feb 13, 2024
460ff2d
migration2
GardevoirX Feb 13, 2024
e05ee31
migration complete
GardevoirX Feb 13, 2024
d625c2a
unittests
GardevoirX Feb 13, 2024
f138b05
mahalanobis distance refactor
GardevoirX Feb 13, 2024
ac1cd93
distance tests
GardevoirX Feb 13, 2024
0942b1e
test fix
GardevoirX Feb 13, 2024
00577b0
sample
GardevoirX Feb 13, 2024
15682e4
minor fix
GardevoirX Feb 14, 2024
aa55db6
comment update
GardevoirX Feb 14, 2024
ccec98f
format clean
GardevoirX Feb 14, 2024
aea9e93
docstring update
GardevoirX Feb 14, 2024
d8e248b
format clean
GardevoirX Feb 14, 2024
ed78b44
typing update
GardevoirX Feb 14, 2024
f75e791
remove optional typing
GardevoirX Feb 14, 2024
f197629
typing fix
GardevoirX Feb 15, 2024
88dc9bd
typing for py38
GardevoirX Feb 16, 2024
69a3cba
Add basic documentation
PicoCentauri Feb 16, 2024
68ba548
format and distance documentation
GardevoirX Feb 16, 2024
95d39b2
sparse doc
GardevoirX Feb 16, 2024
8d73428
minor optimization
GardevoirX Feb 16, 2024
b9f28c9
split quick shift from sparse kde
GardevoirX Feb 16, 2024
4702f9c
quick shift and tutorials for sparse KDE
GardevoirX Feb 17, 2024
9abbaee
docstrings
GardevoirX Feb 17, 2024
f52fbfc
privatize some functions and documentation fix
GardevoirX Feb 18, 2024
3bc589e
Update sparse-kde.py
GardevoirX May 1, 2024
29167f7
Update sparse-kde.py
GardevoirX May 1, 2024
d5ec5b4
Update sparse-kde.py
GardevoirX May 1, 2024
e30835e
Update _quick_shift.py
GardevoirX May 1, 2024
15063dc
Update clustering.rst
GardevoirX May 1, 2024
0ebdf82
Update __init__.py
GardevoirX May 1, 2024
5e1e59b
Update _pairwise.py
GardevoirX May 1, 2024
902a46f
Update _pairwise.py
GardevoirX May 1, 2024
e33b2b9
Comment and test updates
GardevoirX May 2, 2024
adfbd01
Minor update for test
GardevoirX May 2, 2024
73b4a52
Remove kernel parameters
GardevoirX May 2, 2024
c70a206
CHANGELOG update
GardevoirX May 2, 2024
3a84b8c
Remove some redundant parameters
GardevoirX May 2, 2024
9706573
Documentation update
GardevoirX May 2, 2024
daa9289
Minor test update
GardevoirX May 2, 2024
4062800
Add metrics into change log
GardevoirX May 2, 2024
1c34a8c
Add basic API for SparseKDE and supporting functions
PicoCentauri Feb 9, 2024
e31e6b5
periodic euclidean distance
GardevoirX Feb 12, 2024
60bd8a5
migration
GardevoirX Feb 13, 2024
5c11ce2
migration2
GardevoirX Feb 13, 2024
151d95a
migration complete
GardevoirX Feb 13, 2024
ebc2235
unittests
GardevoirX Feb 13, 2024
2684fc1
mahalanobis distance refactor
GardevoirX Feb 13, 2024
2892ad3
distance tests
GardevoirX Feb 13, 2024
6efd9f7
test fix
GardevoirX Feb 13, 2024
203ec60
sample
GardevoirX Feb 13, 2024
edaf497
minor fix
GardevoirX Feb 14, 2024
c0d016d
comment update
GardevoirX Feb 14, 2024
c1733e5
format clean
GardevoirX Feb 14, 2024
2df9f4a
docstring update
GardevoirX Feb 14, 2024
f7a0a10
format clean
GardevoirX Feb 14, 2024
d8d5679
typing update
GardevoirX Feb 14, 2024
ce7d8e7
remove optional typing
GardevoirX Feb 14, 2024
e22f9b8
typing fix
GardevoirX Feb 15, 2024
21fe95f
typing for py38
GardevoirX Feb 16, 2024
c504be8
Add basic documentation
PicoCentauri Feb 16, 2024
0b0781f
format and distance documentation
GardevoirX Feb 16, 2024
81c119e
sparse doc
GardevoirX Feb 16, 2024
601e49e
minor optimization
GardevoirX Feb 16, 2024
aff4f72
split quick shift from sparse kde
GardevoirX Feb 16, 2024
b0d92d6
quick shift and tutorials for sparse KDE
GardevoirX Feb 17, 2024
e090af7
docstrings
GardevoirX Feb 17, 2024
3257746
privatize some functions and documentation fix
GardevoirX Feb 18, 2024
b7dcdbf
Update sparse-kde.py
GardevoirX May 1, 2024
0d916f4
Update sparse-kde.py
GardevoirX May 1, 2024
aed41b3
Update sparse-kde.py
GardevoirX May 1, 2024
adb4367
Update _quick_shift.py
GardevoirX May 1, 2024
d52703f
Update clustering.rst
GardevoirX May 1, 2024
e3c4da8
Update __init__.py
GardevoirX May 1, 2024
da5b962
Update _pairwise.py
GardevoirX May 1, 2024
bb065dc
Update _pairwise.py
GardevoirX May 1, 2024
316cbd1
Comment and test updates
GardevoirX May 2, 2024
2bc08b4
Minor update for test
GardevoirX May 2, 2024
96dd0f5
Remove kernel parameters
GardevoirX May 2, 2024
d6b6e85
CHANGELOG update
GardevoirX May 2, 2024
a73ae61
Remove some redundant parameters
GardevoirX May 2, 2024
e9fc71a
Documentation update
GardevoirX May 2, 2024
b451c09
Minor test update
GardevoirX May 2, 2024
870f06b
Add metrics into change log
GardevoirX May 2, 2024
4ddf5f4
Update CHANGELOG
GardevoirX May 3, 2024
97ccb42
Update examples/neighbors/sparse-kde.py
GardevoirX May 3, 2024
9cb3f08
Update src/skmatter/clustering/__init__.py
GardevoirX May 3, 2024
0483225
Update src/skmatter/clustering/_quick_shift.py
GardevoirX May 3, 2024
27186ae
Update src/skmatter/metrics/_pairwise.py
GardevoirX May 3, 2024
f20adfc
Update src/skmatter/neighbors/_sparsekde.py
GardevoirX May 3, 2024
2512bde
Documentation improvement
GardevoirX May 3, 2024
ee2be2d
Add test for case fspread being used
GardevoirX May 3, 2024
abeed90
Improve the passing style of the metric
GardevoirX May 3, 2024
7db8ae9
Example and documentation update
GardevoirX May 3, 2024
3ac7b70
Minor format fix
GardevoirX May 3, 2024
b6c31b6
More detailed documentation for quick shift
GardevoirX May 6, 2024
092c6b7
Metric and cell related documentation update
GardevoirX May 6, 2024
e3c29cb
Try to pass the github workflow
GardevoirX May 7, 2024
a8d8c4c
SparseKDE xample minor update
GardevoirX May 7, 2024
6d0a6f5
Update src/skmatter/clustering/_quick_shift.py
GardevoirX May 13, 2024
263ecbd
Update src/skmatter/clustering/_quick_shift.py
GardevoirX May 13, 2024
fc85268
Update src/skmatter/clustering/_quick_shift.py
GardevoirX May 13, 2024
1164750
Update src/skmatter/metrics/_pairwise.py
GardevoirX May 13, 2024
b7a2a3f
Update src/skmatter/metrics/__init__.py
GardevoirX May 13, 2024
efc1d6a
Update src/skmatter/metrics/_pairwise.py
GardevoirX May 13, 2024
2b5ec32
Documentation minor update
GardevoirX May 13, 2024
3bd34cc
Update src/skmatter/metrics/_pairwise.py
GardevoirX May 13, 2024
0dd30ae
Update dictionary key from cell to cell_length
GardevoirX May 13, 2024
32cdf31
Add some documentation might be helpful for future developing
GardevoirX May 15, 2024
9c5249b
Clean up the class SparseKDE
GardevoirX May 15, 2024
96a0ccd
Further clean up
GardevoirX May 16, 2024
7001661
Improve the Gaussian example
GardevoirX May 22, 2024
be4dd3e
Improve some property names of SparseKDE
GardevoirX May 23, 2024
c2bf670
Minor fix
GardevoirX May 23, 2024
fb1b3cf
Merge branch 'sparse-kde' of https://github.com/GardevoirX/scikit-mat…
GardevoirX May 27, 2024
22dc9cd
Update CHANGELOG
GardevoirX Jun 10, 2024
afd43de
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 10, 2024
6695ee7
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 10, 2024
89fb410
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 10, 2024
02c49be
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 10, 2024
7894df2
Update CHANGELOG
GardevoirX Jun 10, 2024
34deaf6
Update src/skmatter/clustering/_quick_shift.py
GardevoirX Jun 10, 2024
b68f76d
Update src/skmatter/clustering/_quick_shift.py
GardevoirX Jun 10, 2024
a898ea8
Fix mis-rendered documents and some symbols
GardevoirX Jun 10, 2024
bfc1f55
Fix function rendering issue in doc
GardevoirX Jun 10, 2024
681470b
Docstring format clean
GardevoirX Jun 10, 2024
d49d904
Get rid of fortran ordering
GardevoirX Jun 10, 2024
bdd0174
Periodic example for quickshift and minor fix in docs
GardevoirX Jun 10, 2024
1137ba9
Rename the pairwise_euclidean_distances
GardevoirX Jun 10, 2024
f236539
Format fix
GardevoirX Jun 10, 2024
5bc258a
Merge remote-tracking branch 'center/main' into sparse-kde
GardevoirX Jun 10, 2024
6559c8e
Merge branch 'main' into sparse-kde
GardevoirX Jun 15, 2024
ca3cec8
Get hbond dataset loader back
GardevoirX Jun 15, 2024
7ffa8ef
Add tests for quick shift and remove unused functions
GardevoirX Jun 15, 2024
f1ca319
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 27, 2024
da1cc79
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 27, 2024
973888b
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 27, 2024
096e43f
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 27, 2024
c0bd0a3
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 27, 2024
04dae85
Update examples/neighbors/sparse-kde.py
GardevoirX Jun 27, 2024
1f28aae
Fix round errors in doc examples
GardevoirX Jun 28, 2024
1f4ea8c
Merge branch 'main' into sparse-kde
GardevoirX Aug 7, 2024
e965f99
Update examples/neighbors/sparse-kde.py
GardevoirX Aug 7, 2024
34e6312
Merge description cells
GardevoirX Aug 7, 2024
7d1abad
Merge branch 'sparse-kde' of https://github.com/GardevoirX/scikit-mat…
GardevoirX Aug 7, 2024
4df1f38
Add running time in example
GardevoirX Aug 7, 2024
c81d7eb
Format fix
GardevoirX Aug 7, 2024
f9391e6
Change log update
GardevoirX Aug 7, 2024
3cfa914
Split examples into two notebooks
GardevoirX Aug 7, 2024
1aa0155
Add back kernel argument
GardevoirX Aug 7, 2024
65c9636
Minor name fix
GardevoirX Aug 7, 2024
24b93c4
Minor update
GardevoirX Aug 7, 2024
38c9da3
Minor fix
GardevoirX Aug 7, 2024
2098e5d
Minor test update
GardevoirX Aug 9, 2024
12a3590
Update examples/neighbors/sparse-kde.py
GardevoirX Aug 12, 2024
a049505
Update examples/neighbors/sparse-kde.py
GardevoirX Aug 12, 2024
f0c7741
Update docs/src/references/neighbors.rst
GardevoirX Aug 12, 2024
33f09bf
Update examples/neighbors/pamm.py
GardevoirX Aug 12, 2024
0410832
Update examples/neighbors/pamm.py
GardevoirX Aug 12, 2024
284360a
Update examples/neighbors/pamm.py
GardevoirX Aug 12, 2024
5b59abd
Update src/skmatter/neighbors/_sparsekde.py
GardevoirX Aug 12, 2024
7dff19f
Update src/skmatter/neighbors/_sparsekde.py
GardevoirX Aug 12, 2024
9d8ad9b
Update examples/neighbors/pamm.py
GardevoirX Aug 12, 2024
21ff481
Updates on kde attributes and example
GardevoirX Aug 12, 2024
62b1e0b
Merge branch 'sparse-kde' of https://github.com/GardevoirX/scikit-mat…
GardevoirX Aug 12, 2024
1e3d2e3
Update src/skmatter/utils/_sparsekde.py
GardevoirX Aug 12, 2024
939e0a4
Update _sparsekde.py
GardevoirX Aug 12, 2024
0bc1715
Updates on the semi-positive tests
GardevoirX Sep 18, 2024
a4aea47
Update sparse-kde.py
GardevoirX Sep 19, 2024
23043e2
Add comments to `_bandwidth_inv_` and `_normkernels_`
GardevoirX Oct 7, 2024
96136dc
Update CHANGELOG
agoscinski Oct 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ The rules for CHANGELOG file:
- Updating ``FPS`` to allow a numpy array of ints as an initialize parameter (#145)
- Supported Python versions are now ranging from 3.9 - 3.12.
- Updating ``skmatter.datasets`` submodule to support sklearn 1.5.0 (#229)
- Add `SparseKDE` class (#222)
- Add `QuickShift` class (#222)
- Add an example on how to conduct PAMM algorithm with `SparseKDE` and `QuickShift`
(#222)
- Add H2O-BLYP-Piglet dataset (#222)
- Add two distance metrics that support the periodic boundry condition,
`periodic_pairwise_euclidean_distances` and `pairwise_mahalanobis_distances` (#222)

0.2.0 (2023/08/24)
------------------
Expand Down
6 changes: 6 additions & 0 deletions docs/src/bibliography.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ References
"Principal covariates regression: Part I. Theory", Chemom. intell. lab. syst. 14
(1992) 155-164 https://doi.org/10.1016/0169-7439(92)80100-I

.. [Gasparotto2014]
Piero Gasparotto, Michele Ceriotti,
"Recognizing molecular patterns by machine learning: An agnostic structural
definition of the hydrogen bond", J. Chem. Phys., 141 (17): 174110.
https://doi.org/10.1063/1.4900655.

.. [Imbalzano2018]
Giulio Imbalzano, Andrea Anelli, Daniele Giofré,Sinja Klees, Jörg Behler, and
Michele Ceriotti, “Automatic selection of atomic fingerprints and reference
Expand Down
2 changes: 1 addition & 1 deletion docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"sphinx_toggleprompt",
]

example_subdirs = ["pcovr", "selection", "regression", "reconstruction"]
example_subdirs = ["pcovr", "selection", "regression", "reconstruction", "neighbors"]
sphinx_gallery_conf = {
"filename_pattern": "/*",
"examples_dirs": [f"../../examples/{p}" for p in example_subdirs],
Expand Down
11 changes: 11 additions & 0 deletions docs/src/references/clustering.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Clustering
==========

.. automodule:: skmatter.clustering

.. _quick-shift-api:

Quick Shift
------------

.. autoclass:: skmatter.clustering.QuickShift
GardevoirX marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions docs/src/references/datasets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Datasets

.. include:: ../../../src/skmatter/datasets/descr/degenerate_CH4_manifold.rst

.. include:: ../../../src/skmatter/datasets/descr/h2o-blyp-piglet.rst

.. include:: ../../../src/skmatter/datasets/descr/nice_dataset.rst

.. include:: ../../../src/skmatter/datasets/descr/who_dataset.rst
2 changes: 2 additions & 0 deletions docs/src/references/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ API Reference
preprocessing
selection
linear_models
clustering
decomposition
metrics
neighbors
datasets
utils
15 changes: 15 additions & 0 deletions docs/src/references/metrics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,18 @@ Component-wise Prediction Rigidity
----------------------------------

.. autofunction:: skmatter.metrics.componentwise_prediction_rigidity


.. _pairwise-euclidian-api:

Pairwise Euclidean Distances
----------------------------

.. autofunction:: skmatter.metrics.periodic_pairwise_euclidean_distances

.. _pairwise-mahalanobis-api:

Pairwise Mahalanobis Distance
-----------------------------

.. autofunction:: skmatter.metrics.pairwise_mahalanobis_distances
16 changes: 16 additions & 0 deletions docs/src/references/neighbors.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Neighbors
=========

.. automodule:: skmatter.neighbors

.. _sparse-kde-api:

Sparse Kernel Density Estimation
--------------------------------

.. autoclass:: skmatter.neighbors.SparseKDE
GardevoirX marked this conversation as resolved.
Show resolved Hide resolved
:show-inheritance:

.. automethod:: fit
.. automethod:: score_samples
.. automethod:: score
11 changes: 11 additions & 0 deletions docs/src/references/utils.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,14 @@ Random Partitioning with Overlaps
---------------------------------

.. autofunction:: skmatter.model_selection.train_test_split


Effective Dimension of Covariance Matrix
----------------------------------------

.. autofunction:: skmatter.utils.effdim

Oracle Approximating Shrinkage
------------------------------

.. autofunction:: skmatter.utils.oas
1 change: 1 addition & 0 deletions docs/src/tutorials.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
examples/selection/index
examples/regression/index
examples/reconstruction/index
examples/neighbors/index
2 changes: 2 additions & 0 deletions examples/neighbors/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Neighbors
=========
Loading