@@ -79,12 +79,8 @@ def _default_xyz(data: 'SarracenDataFrame', # noqa: F821
7979 return x , y , z
8080
8181
82- def _default_bounds (data : 'SarracenDataFrame' , # noqa: F821
83- x : str ,
84- y : str ,
85- x_data : np .ndarray ,
82+ def _default_bounds (x_data : np .ndarray ,
8683 y_data : np .ndarray ,
87- z_data : Union [np .ndarray , None ],
8884 xlim : Union [Tuple [Union [float , None ], Union [float , None ]],
8985 None ],
9086 ylim : Union [Tuple [Union [float , None ], Union [float , None ]],
@@ -568,8 +564,7 @@ def interpolate_2d(data: 'SarracenDataFrame', # noqa: F821
568564 x , y = _default_xy (data , x , y )
569565 _verify_columns (data , x , y )
570566
571- xlim , ylim = _default_bounds (data , x , y , data [x ], data [y ], None ,
572- xlim , ylim )
567+ xlim , ylim = _default_bounds (data [x ], data [y ], xlim , ylim )
573568 x_pixels , y_pixels = _set_pixels (x_pixels , y_pixels , xlim , ylim )
574569 _check_boundaries (x_pixels , y_pixels , xlim , ylim )
575570 w_data = _get_weight (data , target , dens_weight )
@@ -676,8 +671,7 @@ def interpolate_2d_vec(data: 'SarracenDataFrame', # noqa: F821
676671 x , y = _default_xy (data , x , y )
677672 _verify_columns (data , x , y )
678673
679- xlim , ylim = _default_bounds (data , x , y , data [x ], data [y ], None ,
680- xlim , ylim )
674+ xlim , ylim = _default_bounds (data [x ], data [y ], xlim , ylim )
681675 x_pixels , y_pixels = _set_pixels (x_pixels , y_pixels , xlim , ylim )
682676 _check_boundaries (x_pixels , y_pixels , xlim , ylim )
683677
@@ -787,8 +781,7 @@ def interpolate_2d_line(data: 'SarracenDataFrame', # noqa: F821
787781 if isinstance (ylim , float ) or isinstance (ylim , int ):
788782 ylim = ylim , ylim
789783
790- xlim , ylim = _default_bounds (data , x , y , data [x ], data [y ], None ,
791- xlim , ylim )
784+ xlim , ylim = _default_bounds (data [x ], data [y ], xlim , ylim )
792785 if xlim [0 ] == xlim [1 ] and ylim [0 ] == ylim [1 ]:
793786 raise ValueError ('Zero length cross section!' )
794787
@@ -909,8 +902,7 @@ def interpolate_3d_line(data: 'SarracenDataFrame', # noqa: F821
909902 z2 = data .loc [:, z ].min () if zlim is None or zlim [1 ] is None else zlim [1 ]
910903 zlim = z1 , z2
911904
912- xlim , ylim = _default_bounds (data , x , y , data [x ], data [y ], data [z ],
913- xlim , ylim )
905+ xlim , ylim = _default_bounds (data [x ], data [y ], xlim , ylim )
914906 if ylim [1 ] == ylim [0 ] and xlim [1 ] == xlim [0 ] and zlim [1 ] == zlim [0 ]:
915907 raise ValueError ('Zero length cross section!' )
916908
@@ -1058,8 +1050,7 @@ def interpolate_3d_proj(data: 'SarracenDataFrame', # noqa: F821
10581050
10591051 x_data , y_data , z_data = _rotate_xyz (data , x , y , z , rotation , rot_origin )
10601052
1061- xlim , ylim = _default_bounds (data , x , y , x_data , y_data , z_data ,
1062- xlim , ylim )
1053+ xlim , ylim = _default_bounds (x_data , y_data , xlim , ylim )
10631054 x_pixels , y_pixels = _set_pixels (x_pixels , y_pixels , xlim , ylim )
10641055 _check_boundaries (x_pixels , y_pixels , xlim , ylim )
10651056
@@ -1190,8 +1181,7 @@ def interpolate_3d_vec(data: 'SarracenDataFrame', # noqa: F821
11901181
11911182 x_data , y_data , z_data = _rotate_xyz (data , x , y , z , rotation , rot_origin )
11921183
1193- xlim , ylim = _default_bounds (data , x , y , x_data , y_data , z_data ,
1194- xlim , ylim )
1184+ xlim , ylim = _default_bounds (x_data , y_data , xlim , ylim )
11951185 x_pixels , y_pixels = _set_pixels (x_pixels , y_pixels , xlim , ylim )
11961186 _check_boundaries (x_pixels , y_pixels , xlim , ylim )
11971187
@@ -1344,8 +1334,7 @@ def interpolate_3d_cross(data: 'SarracenDataFrame', # noqa: F821
13441334 x_data , y_data , z_data = _rotate_xyz (data , x , y , z , rotation , rot_origin )
13451335
13461336 # boundaries of the plot default to the max & min values of the data.
1347- xlim , ylim = _default_bounds (data , x , y , x_data , y_data , z_data ,
1348- xlim , ylim )
1337+ xlim , ylim = _default_bounds (x_data , y_data , xlim , ylim )
13491338 x_pixels , y_pixels = _set_pixels (x_pixels , y_pixels , xlim , ylim )
13501339 _check_boundaries (x_pixels , y_pixels , xlim , ylim )
13511340
@@ -1472,8 +1461,7 @@ def interpolate_3d_cross_vec(data: 'SarracenDataFrame', # noqa: F821
14721461 x_data , y_data , z_data = _rotate_xyz (data , x , y , z , rotation , rot_origin )
14731462
14741463 # boundaries of the plot default to the max & min values of the data.
1475- xlim , ylim = _default_bounds (data , x , y , x_data , y_data , z_data ,
1476- xlim , ylim )
1464+ xlim , ylim = _default_bounds (x_data , y_data , xlim , ylim )
14771465 x_pixels , y_pixels = _set_pixels (x_pixels , y_pixels , xlim , ylim )
14781466 _check_boundaries (x_pixels , y_pixels , xlim , ylim )
14791467
@@ -1606,8 +1594,7 @@ def interpolate_3d_grid(data: 'SarracenDataFrame', # noqa: F821
16061594 xlim = (None , None )
16071595 if not ylim :
16081596 ylim = (None , None )
1609- xlim , ylim = _default_bounds (data , x , y , x_data , y_data , z_data ,
1610- xlim , ylim )
1597+ xlim , ylim = _default_bounds (x_data , y_data , xlim , ylim )
16111598 zlim = zlim if zlim else (z_data .min (), z_data .max ())
16121599
16131600 x_pixels , y_pixels = _set_pixels (x_pixels , y_pixels , xlim , ylim )
0 commit comments