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

fix: use numbers.Real for checking type #386

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/modopt/base/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

"""

import numbers
import numpy as np
from modopt.interface.errors import warn

Expand Down Expand Up @@ -68,14 +69,14 @@ def check_float(input_obj):
check_int : related function

"""
if not isinstance(input_obj, (int, float, list, tuple, np.ndarray)):
if not isinstance(input_obj, (int, numbers.Real, list, tuple, np.ndarray)):
raise TypeError("Invalid input type.")
if isinstance(input_obj, int):
input_obj = float(input_obj)
elif isinstance(input_obj, (list, tuple)):
input_obj = np.array(input_obj, dtype=float)
elif isinstance(input_obj, np.ndarray) and (
not np.issubdtype(input_obj.dtype, np.floating)
not np.issubdtype(input_obj.dtype, numbers.Real)
):
input_obj = input_obj.astype(float)

Expand Down Expand Up @@ -117,9 +118,9 @@ def check_int(input_obj):
check_float : related function

"""
if not isinstance(input_obj, (int, float, list, tuple, np.ndarray)):
if not isinstance(input_obj, (int, numbers.Real, list, tuple, np.ndarray)):
raise TypeError("Invalid input type.")
if isinstance(input_obj, float):
if isinstance(input_obj, numbers.Real):
input_obj = int(input_obj)
elif isinstance(input_obj, (list, tuple)):
input_obj = np.array(input_obj, dtype=int)
Expand Down
3 changes: 2 additions & 1 deletion src/modopt/opt/algorithms/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from inspect import getmro

import numpy as np
import numbers
from tqdm.auto import tqdm

from modopt.base import backend
Expand Down Expand Up @@ -192,7 +193,7 @@ def _check_param(self, param_val):
For invalid input type

"""
if not isinstance(param_val, float):
if not isinstance(param_val, numbers.Real):
raise TypeError("Algorithm parameter must be a float value.")

def _check_param_update(self, param_update):
Expand Down
5 changes: 3 additions & 2 deletions src/modopt/signal/positivity.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

"""

import numbers
import numpy as np


Expand Down Expand Up @@ -93,13 +94,13 @@ def positive(input_data, ragged=False):
[1, 2, 3]])

"""
if not isinstance(input_data, (int, float, list, tuple, np.ndarray)):
if not isinstance(input_data, (int, numbers.Real, list, tuple, np.ndarray)):
raise TypeError(
"Invalid data type, input must be `int`, `float`, `list`, "
+ "`tuple` or `np.ndarray`.",
)

if isinstance(input_data, (int, float)):
if isinstance(input_data, (int, numbers.Real)):
return pos_thresh(input_data)

if ragged:
Expand Down
Loading