diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2009-04-10 01:58:27 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2009-04-10 01:58:27 +0000 |
| commit | e02bf24487e84fb7bbb6bb2ffc25d5833f5ae30d (patch) | |
| tree | 72e3d3283c7473815b08fee55b62f6845f52f3fc /numpy/lib | |
| parent | 85eb59a8b2625296310bb8628177792cc506a509 (diff) | |
| download | numpy-e02bf24487e84fb7bbb6bb2ffc25d5833f5ae30d.tar.gz | |
Fix ticket #928
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/function_base.py | 4 | ||||
| -rw-r--r-- | numpy/lib/tests/test_regression.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 3d7428e69..d37dd0feb 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -505,7 +505,9 @@ def histogramdd(sample, bins=10, range=None, normed=False, weights=None): Ncount[i][on_edge] -= 1 # Flattened histogram matrix (1D) - hist = zeros(nbin.prod(), float) + # Reshape is used so that overlarge arrays + # will raise an error. + hist = zeros(nbin, float).reshape(-1) # Compute the sample indices in the flattened histogram matrix. ni = nbin.argsort() diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py index e58756b9b..5eeb16295 100644 --- a/numpy/lib/tests/test_regression.py +++ b/numpy/lib/tests/test_regression.py @@ -44,6 +44,10 @@ class TestRegression(object): q,r = np.polydiv(x,x) assert_(q.dtype == np.float, msg) + def test_histogramdd_too_many_bins(self) : + """Ticket 928.""" + assert_raises(ValueError, np.histogramdd, [np.ones(10)]*32) + if __name__ == "__main__": run_module_suite() |