Skip to content
Snippets Groups Projects
Commit 3ad2dfcf authored by Marcel Loose's avatar Marcel Loose :sunglasses:
Browse files

Replace deprecated NumPy types

parent 7f43dc38
Branches
Tags
1 merge request!47Replace deprecated NumPy types
...@@ -58,7 +58,7 @@ copyright = u'2022, David Rafferty' ...@@ -58,7 +58,7 @@ copyright = u'2022, David Rafferty'
# The short X.Y version. # The short X.Y version.
version = '1.4' version = '1.4'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.4.10' release = '1.4.11'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# This module stores the version and changelog # This module stores the version and changelog
# Version number # Version number
__version__ = '1.4.10' __version__ = '1.4.11'
# Change log # Change log
def changelog(): def changelog():
...@@ -11,6 +11,10 @@ def changelog(): ...@@ -11,6 +11,10 @@ def changelog():
LSMTool Changelog. LSMTool Changelog.
----------------------------------------------- -----------------------------------------------
2023/02/10 - Version 1.4.11
Replace all deprecated `numpy` types with their plain counterpart
2023/01/09 - Version 1.4.10 2023/01/09 - Version 1.4.10
Fix issues with concatenating two sky models Fix issues with concatenating two sky models
......
...@@ -370,17 +370,17 @@ class KDTree(object): ...@@ -370,17 +370,17 @@ class KDTree(object):
retshape = np.shape(x)[:-1] retshape = np.shape(x)[:-1]
if retshape!=(): if retshape!=():
if k is None: if k is None:
dd = np.empty(retshape,dtype=np.object) dd = np.empty(retshape,dtype=object)
ii = np.empty(retshape,dtype=np.object) ii = np.empty(retshape,dtype=object)
elif k>1: elif k>1:
dd = np.empty(retshape+(k,),dtype=float) dd = np.empty(retshape+(k,),dtype=float)
dd.fill(np.inf) dd.fill(np.inf)
ii = np.empty(retshape+(k,),dtype=np.int) ii = np.empty(retshape+(k,),dtype=int)
ii.fill(self.n) ii.fill(self.n)
elif k==1: elif k==1:
dd = np.empty(retshape,dtype=float) dd = np.empty(retshape,dtype=float)
dd.fill(np.inf) dd.fill(np.inf)
ii = np.empty(retshape,dtype=np.int) ii = np.empty(retshape,dtype=int)
ii.fill(self.n) ii.fill(self.n)
else: else:
raise ValueError("Requested %s nearest neighbors; acceptable numbers are integers greater than or equal to one, or None") raise ValueError("Requested %s nearest neighbors; acceptable numbers are integers greater than or equal to one, or None")
...@@ -411,7 +411,7 @@ class KDTree(object): ...@@ -411,7 +411,7 @@ class KDTree(object):
elif k>1: elif k>1:
dd = np.empty(k,dtype=float) dd = np.empty(k,dtype=float)
dd.fill(np.inf) dd.fill(np.inf)
ii = np.empty(k,dtype=np.int) ii = np.empty(k,dtype=int)
ii.fill(self.n) ii.fill(self.n)
for j in range(len(hits)): for j in range(len(hits)):
dd[j], ii[j] = hits[j] dd[j], ii[j] = hits[j]
...@@ -479,7 +479,7 @@ class KDTree(object): ...@@ -479,7 +479,7 @@ class KDTree(object):
return self.__query_ball_point(x,r,p,eps) return self.__query_ball_point(x,r,p,eps)
else: else:
retshape = x.shape[:-1] retshape = x.shape[:-1]
result = np.empty(retshape,dtype=np.object) result = np.empty(retshape,dtype=object)
for c in np.ndindex(retshape): for c in np.ndindex(retshape):
result[c] = self.__query_ball_point(x[c], r, p=p, eps=eps) result[c] = self.__query_ball_point(x[c], r, p=p, eps=eps)
return result return result
......
...@@ -90,8 +90,8 @@ def guess_regular_grid(xnodes, ynodes, pixelsize=None) : ...@@ -90,8 +90,8 @@ def guess_regular_grid(xnodes, ynodes, pixelsize=None) :
xn_rav, yn_rav = xnodes.ravel(), ynodes.ravel() xn_rav, yn_rav = xnodes.ravel(), ynodes.ravel()
if pixelsize is None : if pixelsize is None :
pixelsize = derive_pixelsize(xnodes, ynodes) pixelsize = derive_pixelsize(xnodes, ynodes)
minxn = np.int(np.min(xn_rav) / pixelsize) * pixelsize minxn = int(np.min(xn_rav) / pixelsize) * pixelsize
minyn = np.int(np.min(yn_rav) / pixelsize) * pixelsize minyn = int(np.min(yn_rav) / pixelsize) * pixelsize
xunb, yunb = np.meshgrid(np.arange(minxn, np.max(xn_rav)+pixelsize, pixelsize), xunb, yunb = np.meshgrid(np.arange(minxn, np.max(xn_rav)+pixelsize, pixelsize),
np.arange(minyn, np.max(yn_rav)+pixelsize, pixelsize)) np.arange(minyn, np.max(yn_rav)+pixelsize, pixelsize))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment