@@ -293,69 +293,153 @@ def test__grid_index():
293293 assert np .isclose (_grid_index (6.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5 )
294294
295295 # At internal grid (within tolerance), going right
296- assert np .isclose (_grid_index (3.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5 )
297- assert np .isclose (_grid_index (3.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5 )
298- assert np .isclose (_grid_index (- 3.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 1 )
299- assert np .isclose (_grid_index (- 3.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 1 )
296+ assert np .isclose (
297+ _grid_index (3.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5
298+ )
299+ assert np .isclose (
300+ _grid_index (3.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5
301+ )
302+ assert np .isclose (
303+ _grid_index (- 3.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 1
304+ )
305+ assert np .isclose (
306+ _grid_index (- 3.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 1
307+ )
300308
301309 # At internal grid (within tolerance), going left
302- assert np .isclose (_grid_index (3.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 4 )
303- assert np .isclose (_grid_index (3.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 4 )
304- assert np .isclose (_grid_index (- 3.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0 )
305- assert np .isclose (_grid_index (- 3.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0 )
310+ assert np .isclose (
311+ _grid_index (3.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 4
312+ )
313+ assert np .isclose (
314+ _grid_index (3.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 4
315+ )
316+ assert np .isclose (
317+ _grid_index (- 3.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0
318+ )
319+ assert np .isclose (
320+ _grid_index (- 3.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0
321+ )
306322
307323 # At left-most grid (within tolerance), going right
308- assert np .isclose (_grid_index (- 6.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0 )
309- assert np .isclose (_grid_index (- 6.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0 )
324+ assert np .isclose (
325+ _grid_index (- 6.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0
326+ )
327+ assert np .isclose (
328+ _grid_index (- 6.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0
329+ )
310330
311331 # At right-most grid (within tolerance), going left
312- assert np .isclose (_grid_index (6.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5 )
313- assert np .isclose (_grid_index (6.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5 )
332+ assert np .isclose (
333+ _grid_index (6.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5
334+ )
335+ assert np .isclose (
336+ _grid_index (6.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 5
337+ )
314338
315339
316340def test__grid_distance ():
317341 # Inside bin, going right
318- assert np .isclose (_grid_distance (- 3.2 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0.2 / 0.4 )
319- assert np .isclose (_grid_distance (3.2 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.8 / 0.4 )
342+ assert np .isclose (
343+ _grid_distance (- 3.2 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0.2 / 0.4
344+ )
345+ assert np .isclose (
346+ _grid_distance (3.2 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.8 / 0.4
347+ )
320348
321349 # Inside bin, going left
322- assert np .isclose (_grid_distance (- 3.2 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.8 / 0.4 )
323- assert np .isclose (_grid_distance (3.2 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0.2 / 0.4 )
350+ assert np .isclose (
351+ _grid_distance (- 3.2 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.8 / 0.4
352+ )
353+ assert np .isclose (
354+ _grid_distance (3.2 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 0.2 / 0.4
355+ )
324356
325357 # Outside, moving closer
326- assert np .isclose (_grid_distance (8.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
327- assert np .isclose (_grid_distance (- 8.0 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
358+ assert np .isclose (
359+ _grid_distance (8.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4
360+ )
361+ assert np .isclose (
362+ _grid_distance (- 8.0 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4
363+ )
328364
329365 # At internal grid, going right
330- assert np .isclose (_grid_distance (3.0 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
331- assert np .isclose (_grid_distance (- 3.0 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
366+ assert np .isclose (
367+ _grid_distance (3.0 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4
368+ )
369+ assert np .isclose (
370+ _grid_distance (- 3.0 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4
371+ )
332372
333373 # At internal grid, going left
334- assert np .isclose (_grid_distance (3.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
335- assert np .isclose (_grid_distance (- 3.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
374+ assert np .isclose (
375+ _grid_distance (3.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4
376+ )
377+ assert np .isclose (
378+ _grid_distance (- 3.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4
379+ )
336380
337381 # At left-most grid, going right
338- assert np .isclose (_grid_distance (- 6.0 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
382+ assert np .isclose (
383+ _grid_distance (- 6.0 , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4
384+ )
339385
340386 # At right-most grid, going left
341- assert np .isclose (_grid_distance (6.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
387+ assert np .isclose (
388+ _grid_distance (6.0 , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4
389+ )
342390
343391 # At internal grid (within tolerance), going right
344- assert np .isclose (_grid_distance (3.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
345- assert np .isclose (_grid_distance (3.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
346- assert np .isclose (_grid_distance (- 3.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
347- assert np .isclose (_grid_distance (- 3.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
392+ assert np .isclose (
393+ _grid_distance (3.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
394+ 3.0 / 0.4 ,
395+ )
396+ assert np .isclose (
397+ _grid_distance (3.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
398+ 3.0 / 0.4 ,
399+ )
400+ assert np .isclose (
401+ _grid_distance (- 3.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
402+ 2.0 / 0.4 ,
403+ )
404+ assert np .isclose (
405+ _grid_distance (- 3.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
406+ 2.0 / 0.4 ,
407+ )
348408
349409 # At internal grid (within tolerance), going left
350- assert np .isclose (_grid_distance (3.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
351- assert np .isclose (_grid_distance (3.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
352- assert np .isclose (_grid_distance (- 3.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
353- assert np .isclose (_grid_distance (- 3.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
410+ assert np .isclose (
411+ _grid_distance (3.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
412+ 2.0 / 0.4 ,
413+ )
414+ assert np .isclose (
415+ _grid_distance (3.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
416+ 2.0 / 0.4 ,
417+ )
418+ assert np .isclose (
419+ _grid_distance (- 3.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
420+ 3.0 / 0.4 ,
421+ )
422+ assert np .isclose (
423+ _grid_distance (- 3.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
424+ 3.0 / 0.4 ,
425+ )
354426
355427 # At left-most grid (within tolerance), going right
356- assert np .isclose (_grid_distance (- 6.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
357- assert np .isclose (_grid_distance (- 6.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
428+ assert np .isclose (
429+ _grid_distance (- 6.0 + tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
430+ 3.0 / 0.4 ,
431+ )
432+ assert np .isclose (
433+ _grid_distance (- 6.0 - tiny , 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
434+ 3.0 / 0.4 ,
435+ )
358436
359437 # At right-most grid (within tolerance), going left
360- assert np .isclose (_grid_distance (6.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
361- assert np .isclose (_grid_distance (6.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ), 3.0 / 0.4 )
438+ assert np .isclose (
439+ _grid_distance (6.0 + tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
440+ 3.0 / 0.4 ,
441+ )
442+ assert np .isclose (
443+ _grid_distance (6.0 - tiny , - 0.4 , grid , Nbin + 1 , COINCIDENCE_TOLERANCE ),
444+ 3.0 / 0.4 ,
445+ )
0 commit comments