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.

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

Jump to bottom

Removed all the asscaler functions since they are deprecated in numpy #64

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed all the asscaler functions since they are deprecated in numpy #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/luminol/modules/time_series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ def average(self, default=None):
:param default: Value to return as a default should the calculation not be possible.
:return: Float representing the average value or `None`.
"""
return numpy.asscalar(numpy.average(self.values)) if self.values else default
return numpy.average(self.values).item() if self.values else default

def median(self, default=None):
"""
Expand All @@ -325,7 +325,7 @@ def median(self, default=None):
:param default: Value to return as a default should the calculation not be possible.
:return: Float representing the median value or `None`.
"""
return numpy.asscalar(numpy.median(self.values)) if self.values else default
return numpy.median(self.values).item() if self.values else default

def max(self, default=None):
"""
Expand All @@ -334,7 +334,7 @@ def max(self, default=None):
:param default: Value to return as a default should the calculation not be possible.
:return: Float representing the maximum value or `None`.
"""
return numpy.asscalar(numpy.max(self.values)) if self.values else default
return numpy.max(self.values).item() if self.values else default

def min(self, default=None):
"""
Expand All @@ -343,7 +343,7 @@ def min(self, default=None):
:param default: Value to return as a default should the calculation not be possible.
:return: Float representing the maximum value or `None`.
"""
return numpy.asscalar(numpy.min(self.values)) if self.values else default
return numpy.min(self.values).item() if self.values else default

def percentile(self, n, default=None):
"""
Expand All @@ -353,7 +353,7 @@ def percentile(self, n, default=None):
:param default: Value to return as a default should the calculation not be possible.
:return: Float representing the Nth percentile value or `None`.
"""
return numpy.asscalar(numpy.percentile(self.values, n)) if self.values else default
return numpy.percentile(self.values, n).item() if self.values else default

def stdev(self, default=None):
"""
Expand All @@ -362,7 +362,7 @@ def stdev(self, default=None):
:param default: Value to return as a default should the calculation not be possible.
:return: Float representing the standard deviation value or `None`.
"""
return numpy.asscalar(numpy.std(self.values)) if self.values else default
return numpy.std(self.values).item() if self.values else default

def sum(self, default=None):
"""
Expand All @@ -371,4 +371,4 @@ def sum(self, default=None):
:param default: Value to return as a default should the calculation not be possible.
:return: Float representing the sum or `None`.
"""
return numpy.asscalar(numpy.sum(self.values)) if self.values else default
return numpy.sum(self.values).item() if self.values else default