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

[ENH] update Johnson QPDistributions with bugfixes and vectorization (cyclic-boosting ver.1.4.0) #232

Merged
merged 68 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
90357b9
Revert "[MNT] skip `CyclicBoosting` and QPD tests until #189 failures…
fkiraly Jan 30, 2024
303bf2c
Merge branch 'main' into revert-193-skip-cyclic
fkiraly Jan 30, 2024
17b3e65
Update test_all_regressors.py
fkiraly Jan 30, 2024
d5d0c0e
Merge branch 'main' into revert-193-skip-cyclic
fkiraly Jan 30, 2024
608354b
Merge branch 'main' into revert-193-skip-cyclic
fkiraly Mar 24, 2024
c564906
update for vectorized QPD and bug fix for qpd test
setoguchi-naoki Apr 3, 2024
bf59ee8
remove unnessesary data type
setoguchi-naoki Apr 3, 2024
cbeb877
update python dependency
setoguchi-naoki Apr 3, 2024
087748b
minor change
setoguchi-naoki Apr 3, 2024
e2459c7
move findiff into function
setoguchi-naoki Apr 3, 2024
00fef17
minor change
setoguchi-naoki Apr 3, 2024
dc2e81b
remove QPD_U
setoguchi-naoki Apr 3, 2024
d0dd460
move base to folder
fkiraly Apr 18, 2024
b60afc4
delegate class
fkiraly Apr 18, 2024
24ef82f
start work
fkiraly Apr 18, 2024
6ea8e1c
corrected name
fkiraly Apr 18, 2024
7d36bec
Merge branch 'delegate-distr' into qpd-delegate
fkiraly Apr 18, 2024
669fbe4
docstr
fkiraly Apr 18, 2024
b84c6f7
complete
fkiraly Apr 18, 2024
744f273
Update _delegate.py
fkiraly Apr 18, 2024
c4247bf
Update _delegate.py
fkiraly Apr 18, 2024
d6e7749
Merge branch 'delegate-distr' into qpd-delegate
fkiraly Apr 18, 2024
99772f8
linting
fkiraly Apr 18, 2024
0e7aea0
Merge branch 'delegate-distr' into qpd-delegate
fkiraly Apr 18, 2024
55ea736
Update qpd.py
fkiraly Apr 18, 2024
2beca66
Merge branch 'main' into qpd-delegate
fkiraly Apr 18, 2024
ca77535
Update _base.py
fkiraly Apr 18, 2024
01cdb7f
should be delegate
fkiraly Apr 18, 2024
d308d60
Update qpd.py
fkiraly Apr 18, 2024
72b3c18
Update qpd.py
fkiraly Apr 18, 2024
857fb58
Merge branch 'main' into revert-193-skip-cyclic
fkiraly Apr 18, 2024
f7428b1
fix broadcasting
fkiraly Apr 18, 2024
e9d3641
broadcast for qpd status quo
fkiraly Apr 18, 2024
a1b4b6b
fix qpd
fkiraly Apr 18, 2024
ea0eb96
flatten
fkiraly Apr 18, 2024
813d28c
Merge branch 'main' into revert-193-skip-cyclic
fkiraly Apr 19, 2024
e7e13d4
move to one loc, treat alpha
fkiraly Apr 19, 2024
323e58c
Update qpd.py
fkiraly Apr 19, 2024
f06963a
Update qpd.py
fkiraly Apr 19, 2024
770cf3f
Update qpd.py
fkiraly Apr 19, 2024
e4c947d
Update test_all_distrs.py
fkiraly Apr 19, 2024
93225af
Merge branch 'main' into pr/232
fkiraly Apr 19, 2024
ddddc95
remove findiff, It is included in cyclic-boosting
setoguchi-naoki Apr 25, 2024
db033e0
put back QPD_U
setoguchi-naoki Apr 29, 2024
2e3d9e7
put back QPD_U class
setoguchi-naoki Apr 29, 2024
6384074
Merge branch 'revert-193-skip-cyclic' of https://github.com/sktime/sk…
setoguchi-naoki Apr 29, 2024
4d7ab34
Merge branch 'qpd-delegate' into revert-193-skip-cyclic
setoguchi-naoki Apr 29, 2024
0277946
Consolidated interface to be QPD Johnson
setoguchi-naoki Apr 29, 2024
2c8aa4a
documentation
setoguchi-naoki Apr 29, 2024
d3f3466
Merge branch 'revert-193-skip-cyclic' of https://github.com/setoguchi…
setoguchi-naoki Apr 29, 2024
22e562e
Merge branch 'main' into revert-193-skip-cyclic
setoguchi-naoki Apr 29, 2024
0e1f65f
remove log_pdf
setoguchi-naoki Apr 29, 2024
e96c743
formatting
setoguchi-naoki Apr 29, 2024
bb328a9
formatting
setoguchi-naoki Apr 30, 2024
e464536
Merge branch 'main' into pr/232
fkiraly Apr 30, 2024
65272bc
Update qpd.py
fkiraly Apr 30, 2024
ab2224b
new API for distributions
setoguchi-naoki May 1, 2024
70616e4
Merge branch 'revert-193-skip-cyclic' of https://github.com/setoguchi…
setoguchi-naoki May 1, 2024
38c4ddd
remove unnecessary code
setoguchi-naoki May 1, 2024
0c45301
mod tags
setoguchi-naoki May 1, 2024
cad61ae
may be included in future versions of cyclic-boosting
setoguchi-naoki May 1, 2024
9c859a5
fix bug
setoguchi-naoki May 1, 2024
333b69a
resolve shape mismatch
setoguchi-naoki May 7, 2024
8c599a5
mod input and resolve shape
setoguchi-naoki May 12, 2024
265ac34
formatting
setoguchi-naoki May 12, 2024
823a32d
miss commit
setoguchi-naoki May 12, 2024
5773f27
minor change
setoguchi-naoki May 12, 2024
e91ea5d
docstring
setoguchi-naoki May 14, 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
1 change: 0 additions & 1 deletion docs/source/api_reference/distributions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Non-parametric and empirical distributions
:template: class.rst

Empirical
QPD_U
QPD_S
QPD_B

Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ all_extras = [
"statsmodels>=0.12.1",
"tabulate",
"uncertainties",
"cyclic-boosting>=1.2.5; python_version < '3.12'"
"cyclic-boosting>=1.4.0; python_version < '3.12'",
"findiff"
]

dev = [
Expand Down
4 changes: 2 additions & 2 deletions skpro/distributions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Probability distribution objects."""

# copyright: skpro developers, BSD-3-Clause License (see LICENSE file)
# adapted from sktime

Expand All @@ -10,12 +11,11 @@
"TDistribution",
"QPD_S",
"QPD_B",
"QPD_U",
]

from skpro.distributions.empirical import Empirical
from skpro.distributions.laplace import Laplace
from skpro.distributions.mixture import Mixture
from skpro.distributions.normal import Normal
from skpro.distributions.qpd import QPD_B, QPD_S, QPD_U
from skpro.distributions.qpd import QPD_B, QPD_S
from skpro.distributions.t import TDistribution
Loading
Loading