Skip to content

Commit 3e86c5a

Browse files
authored
move away from numpy.fix in favor of numpy.trunc (#830)
1 parent ae4d9fb commit 3e86c5a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

demo/image_blender.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def array2image(arr, mode):
6565
arr = arr.swapaxes(1, 2).swapaxes(0, 2)
6666
arr[arr < 0] = 0
6767
arr[arr > 255] = 255
68-
arr = numpy.fix(arr).astype(numpy.uint8)
68+
arr = numpy.trunc(arr).astype(numpy.uint8)
6969
return Image.frombytes(mode, arr.shape[1::-1], arr.tobytes())
7070

7171

pywt/data/_wavelab_signals.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ def demo_signal(name='Bumps', n=None):
200200
f = f[512:1536]
201201
elif name == 'piece-regular':
202202
f = np.zeros(n)
203-
n_12 = int(np.fix(n / 12))
204-
n_7 = int(np.fix(n / 7))
205-
n_5 = int(np.fix(n / 5))
206-
n_3 = int(np.fix(n / 3))
207-
n_2 = int(np.fix(n / 2))
208-
n_20 = int(np.fix(n / 20))
203+
n_12 = int(np.trunc(n / 12))
204+
n_7 = int(np.trunc(n / 7))
205+
n_5 = int(np.trunc(n / 5))
206+
n_3 = int(np.trunc(n / 3))
207+
n_2 = int(np.trunc(n / 2))
208+
n_20 = int(np.trunc(n / 20))
209209
f1 = -15 * demo_signal('bumps', n)
210210
t = np.arange(1, n_12 + 1) / n_12
211211
f2 = -np.exp(4 * t)
@@ -231,9 +231,9 @@ def demo_signal(name='Bumps', n=None):
231231
f = bias - f
232232
elif name == 'piece-polynomial':
233233
f = np.zeros(n)
234-
n_5 = int(np.fix(n / 5))
235-
n_10 = int(np.fix(n / 10))
236-
n_20 = int(np.fix(n / 20))
234+
n_5 = int(np.trunc(n / 5))
235+
n_10 = int(np.trunc(n / 10))
236+
n_20 = int(np.trunc(n / 20))
237237
t = np.arange(1, n_5 + 1) / n_5
238238
f1 = 20 * (t**3 + t**2 + 4)
239239
f3 = 40 * (2 * t**3 + t) + 100

0 commit comments

Comments
 (0)