Skip to content

Separate DiscreteSINDy as a new class #654

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.

Sign up for GitHub

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

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
+1,448 −1,170
Open

Separate DiscreteSINDy as a new class #654

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9df5bcc
CLN: Separate DiscreteSINDy as its own class
yb6599 Oct 6, 2025
bbc6c2c
CLN: ensure consistency of shapes and types of x_next and u, and comp…
yb6599 Oct 9, 2025
7a093b4
TST: update tests for DiscreteSINDy
yb6599 Oct 9, 2025
9cf9d28
DOC: Update documentation for DiscreteSINDy
yb6599 Oct 16, 2025
38868a8
CLN: use predict from BaseSINDy for SINDy and DiscreteSINDy models
yb6599 Oct 16, 2025
ee7866e
CLN: Remove SINDy.differentiate()
yb6599 Oct 16, 2025
393f3e1
FIX: process trajectories only when x_dot is None
yb6599 Oct 20, 2025
404d6b3
CLN: lint the code
yb6599 Oct 20, 2025
2591d3d
CLN: resolve merge conflicts
yb6599 Oct 20, 2025
8821a49
FIX: fix _tensordot_to_einsum error
yb6599 Oct 20, 2025
194b548
CLN: remove discrete_time from scikit-time API
yb6599 Oct 21, 2025
37feb2c
CLN: remove SINDy.differentiate() and update DiscreteSINDy for featur…
yb6599 Oct 21, 2025
59ce33f
FIX: remove SINDyPI conditionals from DiscreteSINDy.print()
yb6599 Oct 21, 2025
4fe2aa4
TST: add test for validate_control_variables function
yb6599 Nov 4, 2025
56dc1c6
DOC: update documentation and add logistic map example in DiscreteSIN…
yb6599 Nov 5, 2025
6549ee7
CLN: separate equations function for DiscreteSINDy and code cleanup
yb6599 Nov 5, 2025
1134136
DOC: remove discrete SINDy examples from feature overview
yb6599 Nov 5, 2025
a8eeb56
CLN: remove unnecessary import from core
yb6599 Nov 5, 2025
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,464 changes: 904 additions & 560 deletions examples/1_feature_overview/example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions examples/1_feature_overview/example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def ignore_specific_warnings():
x_dot_test_predicted = model.predict(x_test)

# Compute derivatives with a finite difference method, for comparison
x_dot_test_computed = model.differentiate(x_test, t=dt)
x_dot_test_computed = model.differentiation_method._differentiate(x_test, t=dt)

fig, axs = plt.subplots(x_test.shape[1], 1, sharex=True, figsize=(7, 9))
for i in range(x_test.shape[1]):
Expand Down Expand Up @@ -168,7 +168,7 @@ def f(x):
x_train_map[0] = 0.5
for i in range(1, n_steps):
x_train_map[i] = f(x_train_map[i - 1]) + eps * np.random.randn()
model = ps.SINDy(discrete_time=True)
model = ps.DiscreteSINDy()
model.fit(x_train_map, t=1)

model.print()
Expand Down Expand Up @@ -782,7 +782,7 @@ def f(x):
x_dot_test_predicted = model.predict(x_test)

# Compute derivatives with a finite difference method, for comparison
x_dot_test_computed = model.differentiate(x_test, t=dt)
x_dot_test_computed = model.differentiation_method._differentiate(x_test, t=dt)

fig, axs = plt.subplots(x_test.shape[1], 1, sharex=True, figsize=(7, 9))
for i in range(x_test.shape[1]):
Expand Down Expand Up @@ -905,7 +905,7 @@ def u_fun(t):
x_dot_test_predicted = model.predict(x_test, u=u_test)

# Compute derivatives with a finite difference method, for comparison
x_dot_test_computed = model.differentiate(x_test, t=dt)
x_dot_test_computed = model.differentiation_method._differentiate(x_test, t=dt)

fig, axs = plt.subplots(x_test.shape[1], 1, sharex=True, figsize=(7, 9))
for i in range(x_test.shape[1]):
Expand Down Expand Up @@ -1105,7 +1105,7 @@ def u_fun(t):
num_parameters=1,
)
opt = ps.STLSQ(threshold=1e-1, normalize_columns=False)
model = ps.SINDy(feature_library=lib, optimizer=opt, discrete_time=True)
model = ps.DiscreteSINDy(feature_library=lib, optimizer=opt)
model.fit(xs_train, u=rs_train, t=1, feature_names=["x", "r"])
model.print()

Expand Down
3 changes: 3 additions & 0 deletions pysindy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
from . import optimizers
from . import deeptime
from . import utils

from ._core import SINDy
from ._core import DiscreteSINDy
from ._core import AxesArray
from .differentiation import BaseDifferentiation
from .differentiation import FiniteDifference
Expand Down Expand Up @@ -65,6 +67,7 @@

__all__ = [
"SINDy",
"DiscreteSINDy",
"differentiation",
"feature_library",
"optimizers",
Expand Down
Loading