diff options
Diffstat (limited to 'numpy/lib/histograms.py')
| -rw-r--r-- | numpy/lib/histograms.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/lib/histograms.py b/numpy/lib/histograms.py index 9c4ba8efc..ccae9de22 100644 --- a/numpy/lib/histograms.py +++ b/numpy/lib/histograms.py @@ -259,8 +259,6 @@ def _get_bin_edges(a, bins, range, weights): The upper bound, lowerbound, and number of bins, used in the optimized implementation of `histogram` that works on uniform bins. """ - first_edge, last_edge = _get_outer_edges(a, range) - # parse the overloaded bins argument n_equal_bins = None bin_edges = None @@ -276,6 +274,8 @@ def _get_bin_edges(a, bins, range, weights): raise TypeError("Automated estimation of the number of " "bins is not supported for weighted data") + first_edge, last_edge = _get_outer_edges(a, range) + # truncate the range if needed if range is not None: keep = (a >= first_edge) @@ -304,6 +304,8 @@ def _get_bin_edges(a, bins, range, weights): if n_equal_bins < 1: raise ValueError('`bins` must be positive, when an integer') + first_edge, last_edge = _get_outer_edges(a, range) + elif np.ndim(bins) == 1: bin_edges = np.asarray(bins) if np.any(bin_edges[:-1] > bin_edges[1:]): |