replace np.float with np.float64

This commit is contained in:
2023-06-29 10:37:16 +02:00
parent 681b8f2953
commit 0a965f66ce
3 changed files with 19 additions and 19 deletions

View File

@@ -63,8 +63,8 @@ class geometry:
numPoints=len(next(iter(meas.values())))
numZoom=len(meas)
M=np.ndarray((numPoints, numZoom, 2), np.float)
K=np.array(tuple(meas.keys()), np.float)
M=np.ndarray((numPoints, numZoom, 2), np.float64)
K=np.array(tuple(meas.keys()), np.float64)
for i, (k, v) in enumerate(meas.items()):
M[:, i, :]=np.array(v)
@@ -91,7 +91,7 @@ class geometry:
# [.. .. ..] [..]
# [0 1 -bn] [pny]
# A * aa = y
A=np.ndarray((numPoints*2, 3), np.float)
A=np.ndarray((numPoints*2, 3), np.float64)
A[:numPoints,:2]=(1,0)
A[numPoints:,:2]=(0,1)
A[:,2]=-AB.T.ravel()
@@ -102,7 +102,7 @@ class geometry:
if debug:
# plot least square line fitting
ax.autoscale(False)
P=np.ndarray((2, 2), np.float)
P=np.ndarray((2, 2), np.float64)
for i in range(numPoints):
q=aa[2]
@@ -125,9 +125,9 @@ class geometry:
# # A * aa = y
# # calculate least square line fitting for each point
# A=np.asmatrix(np.ndarray((numZoom, 2), np.float))
# A=np.asmatrix(np.ndarray((numZoom, 2), np.float64))
# A[:, 1]=1
# AA=np.ndarray((numPoints, 2), np.float) # fitting results a1..an b1..bn
# AA=np.ndarray((numPoints, 2), np.float64) # fitting results a1..an b1..bn
# for i in range(numPoints):
# A[:, 0]=M[i, :, 0].reshape(-1, 1)
# y=np.asmatrix(M[i, :, 1]).T
@@ -139,7 +139,7 @@ class geometry:
# ax.autoscale(False)
# rngx=(M[:, :, 0].min(), M[:, :, 0].max())
# Y=np.stack((AA[:, 0]*rngx[0]+AA[:, 1], AA[:, 0]*rngx[1]+AA[:, 1]))
# P=np.ndarray((2, 2), np.float)
# P=np.ndarray((2, 2), np.float64)
# P[:, 0]=rngx
# for i in range(numPoints):
@@ -153,9 +153,9 @@ class geometry:
# # [a1 -1] * [x] [-b1]
# # [a2 -1] * [y] = [-b2]
# P=np.ndarray(((numPoints-1)*numPoints//2, 2), np.float)
# P=np.ndarray(((numPoints-1)*numPoints//2, 2), np.float64)
# k=0
# D=np.ndarray((2, 2), np.float)
# D=np.ndarray((2, 2), np.float64)
# D[:, 1]=-1
# # for i in range(numPoints):
# # for j in range(i+1,numPoints):
@@ -225,8 +225,8 @@ class geometry:
if len(meas)<2:
_log.error('need at least 2 zoom levels:\nmeas:{}'.format(meas))
return
AA=np.ndarray((len(meas), 2, 2), np.float)
K=np.array(tuple(meas.keys()), np.float)
AA=np.ndarray((len(meas), 2, 2), np.float64)
K=np.array(tuple(meas.keys()), np.float64)
for i, (k, v) in enumerate(meas.items()):
m=np.array(v) # measurements
if m.shape[0]<3:
@@ -234,7 +234,7 @@ class geometry:
return
d=m[1:]-m[0] # distances
A=np.zeros((d.shape[0]*2, d.shape[1]), np.float)
A=np.zeros((d.shape[0]*2, d.shape[1]), np.float64)
A[:d.shape[0], :2]=A[d.shape[0]:, 2:]=d[:, 2:]
y=d[:, :2].T.ravel()
@@ -341,7 +341,7 @@ class geometry:
# (1,0,1,0,0,0),
# (0,0,0,1,0,1),
# (1,1,1,0,0,0),
# (0,0,0,1,1,1)), np.float)
# (0,0,0,1,1,1)), np.float64)
if fid is None:
fid=np.array(((0,0),(0,1),(1,0),(1,1)))

File diff suppressed because one or more lines are too long

View File

@@ -3453,7 +3453,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
sp.setup_sync(verbose=True)
sp.setup_coord_trf()
assert(points.dtcfgype==np.float)
assert(points.dtcfgype==np.float64)
sp.points = points
if TASK_GRID == task: