@@ -278,115 +278,115 @@ def test_get_corssing_distance():
278278
279279def test__grid_index ():
280280 # Inside bin, going right
281- assert np .isclose (_grid_index (- 3.2 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 1 )
282- assert np .isclose (_grid_index (3.2 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 4 )
281+ assert np .isclose (_grid_index (- 3.2 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 1 )
282+ assert np .isclose (_grid_index (3.2 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 4 )
283283
284284 # Inside bin, going left
285- assert np .isclose (_grid_index (- 3.2 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 1 )
286- assert np .isclose (_grid_index (3.2 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 4 )
285+ assert np .isclose (_grid_index (- 3.2 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 1 )
286+ assert np .isclose (_grid_index (3.2 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 4 )
287287
288288 # At internal grid, going right
289- assert np .isclose (_grid_index (2.0 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 4 )
290- assert np .isclose (_grid_index (- 2.0 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2 )
289+ assert np .isclose (_grid_index (2.0 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 4 )
290+ assert np .isclose (_grid_index (- 2.0 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2 )
291291
292292 # At internal grid, going left
293- assert np .isclose (_grid_index (2.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 3 )
294- assert np .isclose (_grid_index (- 2.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 1 )
293+ assert np .isclose (_grid_index (2.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 3 )
294+ assert np .isclose (_grid_index (- 2.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 1 )
295295
296296 # At left-most grid, going right
297- assert np .isclose (_grid_index (- 6.0 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 0 )
297+ assert np .isclose (_grid_index (- 6.0 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 0 )
298298
299299 # At right-most grid, going left
300- assert np .isclose (_grid_index (6.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 5 )
300+ assert np .isclose (_grid_index (6.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 5 )
301301
302302 # At internal grid (within tolerance), going right
303- assert np .isclose (_grid_index (2.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 4 )
304- assert np .isclose (_grid_index (2.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 4 )
305- assert np .isclose (_grid_index (- 2.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2 )
306- assert np .isclose (_grid_index (- 2.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2 )
303+ assert np .isclose (_grid_index (2.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 4 )
304+ assert np .isclose (_grid_index (2.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 4 )
305+ assert np .isclose (_grid_index (- 2.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2 )
306+ assert np .isclose (_grid_index (- 2.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2 )
307307
308308 # At internal grid (within tolerance), going left
309- assert np .isclose (_grid_index (2.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 3 )
310- assert np .isclose (_grid_index (2.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 3 )
311- assert np .isclose (_grid_index (- 2.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 1 )
312- assert np .isclose (_grid_index (- 2.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 1 )
309+ assert np .isclose (_grid_index (2.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 3 )
310+ assert np .isclose (_grid_index (2.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 3 )
311+ assert np .isclose (_grid_index (- 2.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 1 )
312+ assert np .isclose (_grid_index (- 2.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 1 )
313313
314314 # At left-most grid (within tolerance), going right
315- assert np .isclose (_grid_index (- 6.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 0 )
316- assert np .isclose (_grid_index (- 6.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 0 )
315+ assert np .isclose (_grid_index (- 6.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 0 )
316+ assert np .isclose (_grid_index (- 6.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 0 )
317317
318318 # At right-most grid (within tolerance), going left
319- assert np .isclose (_grid_index (6.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 5 )
320- assert np .isclose (_grid_index (6.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 5 )
319+ assert np .isclose (_grid_index (6.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 5 )
320+ assert np .isclose (_grid_index (6.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 5 )
321321
322322
323323def test__grid_distance ():
324324 # Inside bin, going right
325- assert np .isclose (_grid_distance (- 3.2 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 1.2 / 0.4 )
326- assert np .isclose (_grid_distance (3.2 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 0.8 / 0.4 )
325+ assert np .isclose (_grid_distance (- 3.2 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 1.2 / 0.4 )
326+ assert np .isclose (_grid_distance (3.2 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 0.8 / 0.4 )
327327
328328 # Inside bin, going left
329- assert np .isclose (_grid_distance (- 3.2 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 0.8 / 0.4 )
330- assert np .isclose (_grid_distance (3.2 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 1.2 / 0.4 )
329+ assert np .isclose (_grid_distance (- 3.2 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 0.8 / 0.4 )
330+ assert np .isclose (_grid_distance (3.2 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 1.2 / 0.4 )
331331
332332 # Outside, moving closer
333- assert np .isclose (_grid_distance (8.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4 )
334- assert np .isclose (_grid_distance (- 8.0 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4 )
333+ assert np .isclose (_grid_distance (8.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
334+ assert np .isclose (_grid_distance (- 8.0 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
335335
336336 # At internal grid, going right
337- assert np .isclose (_grid_distance (2.0 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4 )
338- assert np .isclose (_grid_distance (- 2.0 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4 )
337+ assert np .isclose (_grid_distance (2.0 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
338+ assert np .isclose (_grid_distance (- 2.0 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
339339
340340 # At internal grid, going left
341- assert np .isclose (_grid_distance (2.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4 )
342- assert np .isclose (_grid_distance (- 2.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4 )
341+ assert np .isclose (_grid_distance (2.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
342+ assert np .isclose (_grid_distance (- 2.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
343343
344344 # At left-most grid, going right
345- assert np .isclose (_grid_distance (- 6.0 , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4 )
345+ assert np .isclose (_grid_distance (- 6.0 , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
346346
347347 # At right-most grid, going left
348- assert np .isclose (_grid_distance (6.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4 )
348+ assert np .isclose (_grid_distance (6.0 , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4 )
349349
350350 # At internal grid (within tolerance), going right
351351 assert np .isclose (
352- _grid_distance (2.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
352+ _grid_distance (2.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
353353 )
354354 assert np .isclose (
355- _grid_distance (2.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
355+ _grid_distance (2.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
356356 )
357357 assert np .isclose (
358- _grid_distance (- 2.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
358+ _grid_distance (- 2.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
359359 )
360360 assert np .isclose (
361- _grid_distance (- 2.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
361+ _grid_distance (- 2.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
362362 )
363363
364364 # At internal grid (within tolerance), going left
365365 assert np .isclose (
366- _grid_distance (2.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
366+ _grid_distance (2.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
367367 )
368368 assert np .isclose (
369- _grid_distance (2.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
369+ _grid_distance (2.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
370370 )
371371 assert np .isclose (
372- _grid_distance (- 2.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
372+ _grid_distance (- 2.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
373373 )
374374 assert np .isclose (
375- _grid_distance (- 2.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
375+ _grid_distance (- 2.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
376376 )
377377
378378 # At left-most grid (within tolerance), going right
379379 assert np .isclose (
380- _grid_distance (- 6.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
380+ _grid_distance (- 6.0 + tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
381381 )
382382 assert np .isclose (
383- _grid_distance (- 6.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
383+ _grid_distance (- 6.0 - tiny , 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
384384 )
385385
386386 # At right-most grid (within tolerance), going left
387387 assert np .isclose (
388- _grid_distance (6.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
388+ _grid_distance (6.0 + tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
389389 )
390390 assert np .isclose (
391- _grid_distance (6.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ]), 2.0 / 0.4
391+ _grid_distance (6.0 - tiny , - 0.4 , mesh ["x0" ], mesh ["dx" ], COINCIDENCE_TOLERANCE ), 2.0 / 0.4
392392 )
0 commit comments