From 77cbdd10577414194a8817e123361758ea5201a2 Mon Sep 17 00:00:00 2001 From: Hugo Buurmeijer Date: Tue, 13 May 2025 16:34:37 -0700 Subject: [PATCH 1/2] Fix compatibility with NumPy 2 --- ssmlearnpy/reduced_dynamics/shift_or_differentiate.py | 5 ++--- ssmlearnpy/utils/ridge.py | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ssmlearnpy/reduced_dynamics/shift_or_differentiate.py b/ssmlearnpy/reduced_dynamics/shift_or_differentiate.py index cadedb2..272cab3 100644 --- a/ssmlearnpy/reduced_dynamics/shift_or_differentiate.py +++ b/ssmlearnpy/reduced_dynamics/shift_or_differentiate.py @@ -1,6 +1,5 @@ import logging import numpy as np -#from ssmlearnpy.utils.finite_time_differences import finite_time_differences from findiff import FinDiff #logger = logging.getlogger("shift_or_differentiate") @@ -20,8 +19,8 @@ def shift_or_differentiate(x, t, type, accuracy = 4): #logger.info("Differentiate data for continuous time dynamical system") X, y = [], [] for i_traj in range(len(x)): - # create finite difference object - fd = FinDiff(1, t[i_traj][1] - t[i_traj][0], 1, acc = accuracy) # first order differential with given accuracy + # create finite difference object + fd = FinDiff(1, float(t[i_traj][1] - t[i_traj][0]), 1, acc=accuracy) # first order differential with given accuracy dx_dt_traj = fd(np.array(x[i_traj])) # findiff differentiates along axis 0. X.append(x[i_traj]) y.append( dx_dt_traj) diff --git a/ssmlearnpy/utils/ridge.py b/ssmlearnpy/utils/ridge.py index a254e52..18c12d7 100644 --- a/ssmlearnpy/utils/ridge.py +++ b/ssmlearnpy/utils/ridge.py @@ -2,7 +2,6 @@ import numpy as np -from numpy.lib.arraysetops import isin from sklearn.preprocessing import StandardScaler from sklearn.preprocessing import PolynomialFeatures, FunctionTransformer from sklearn.gaussian_process.kernels import Kernel From ff81c2393f90c21da43335d45d96bc305beb0002 Mon Sep 17 00:00:00 2001 From: Hugo Buurmeijer Date: Tue, 13 May 2025 16:40:56 -0700 Subject: [PATCH 2/2] Rm numpy<2 from requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 179e1ae..18f1b7d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -numpy==1.24.3 +numpy scipy scikit-learn matplotlib