From a349defbc46f30a69b1c40616ac9e57583b25642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20S=C3=B8rensen?= Date: Tue, 11 Feb 2025 10:48:56 +0100 Subject: [PATCH] changing deprecated function --- odeformer/metrics.py | 2 +- odeformer/model/mixins.py | 2 +- odeformer/model/sklearn_wrapper.py | 2 +- odeformer/regressors.py | 2 +- odeformer/trainer.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/odeformer/metrics.py b/odeformer/metrics.py index db56312..f479f06 100755 --- a/odeformer/metrics.py +++ b/odeformer/metrics.py @@ -219,7 +219,7 @@ def compute_metrics(predicted, true, predicted_tree=None, tree=None, metrics="r2 else: try: l1_error = np.mean(np.abs((true[i] - predicted[i]))) - if np.isnan(l1_error): results[metric].append(np.infty) + if np.isnan(l1_error): results[metric].append(np.inf) else: results[metric].append(l1_error) except Exception as e: results[metric].append(np.nan) diff --git a/odeformer/model/mixins.py b/odeformer/model/mixins.py index b3e59f9..3e09dd0 100755 --- a/odeformer/model/mixins.py +++ b/odeformer/model/mixins.py @@ -117,7 +117,7 @@ def sort_candidates( metrics = sorting_metric, )[sorting_metric][0] if math.isnan(_score): - _score = -np.infty if descending else np.infty + _score = -np.inf if descending else np.inf _scores.append(_score) sorted_idx = np.argsort(_scores) if descending: sorted_idx = list(reversed(sorted_idx)) diff --git a/odeformer/model/sklearn_wrapper.py b/odeformer/model/sklearn_wrapper.py index 6f44626..eff689a 100644 --- a/odeformer/model/sklearn_wrapper.py +++ b/odeformer/model/sklearn_wrapper.py @@ -211,7 +211,7 @@ def sort_candidates(self, times, trajectory, candidates, metric="snmse", verbose for candidate in candidates: score = self.evaluate_tree(candidate, times, trajectory, metric) if math.isnan(score): - score = -np.infty if descending else np.infty + score = -np.inf if descending else np.inf scores.append(score) sorted_idx = np.argsort(scores) diff --git a/odeformer/regressors.py b/odeformer/regressors.py index 62950a4..033b427 100755 --- a/odeformer/regressors.py +++ b/odeformer/regressors.py @@ -21,7 +21,7 @@ def order_data(X, y): def get_infinite_relative_error(prediction, truth): abs_relative_error = np.abs((prediction - truth) / (truth + 1e-100)) - abs_relative_error = np.nan_to_num(abs_relative_error, nan=np.infty) + abs_relative_error = np.nan_to_num(abs_relative_error, nan=np.inf) return np.max(abs_relative_error) diff --git a/odeformer/trainer.py b/odeformer/trainer.py index e53c46e..8f37331 100755 --- a/odeformer/trainer.py +++ b/odeformer/trainer.py @@ -170,7 +170,7 @@ def __init__(self, modules, env, params, path=None, root=None): m = (m, True) if 'r2' in m else (m, False) self.metrics.append(m) self.best_metrics = { - metric: (-np.infty if biggest else np.infty) + metric: (-np.inf if biggest else np.inf) for (metric, biggest) in self.metrics }