UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[python] matplotlib: fix hist implementation

Browse Source 
This fixes the following crash: input 'hist([1,2,100],[1,2]) on a Python
console with matplotlib.pyplot imported
This commit is contained in:
Émilie Feral
2020-03-31 10:49:50 +02:00
parent bc1eae17d7
commit 28224bd75e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
python/port/mod/matplotlib/pyplot/modpyplot.cpp
View File

@@ -251,23 +251,25 @@ mp_obj_t modpyplot_hist(size_t n_args, const mp_obj_t *args) {
// Initialize bins list
mp_obj_t * binItems = m_new(mp_obj_t, nBins);
for (size_t i=0; i<nBins; i++) {
binItems[i] = mp_obj_new_int(0);
binItems[i] = MP_OBJ_NEW_SMALL_INT(0);
}
// Fill bins list by linearly scanning the x and incrementing the bin count
// Linearity is enabled thanks to sorting
size_t binIndex = 0;
size_t xIndex = 0;
while (xIndex < xLength) {
assert(binIndex < nBins);
mp_float_t upperBound = mp_obj_get_float(edgeItems[binIndex+1]);
while (mp_obj_get_float(xItems[xIndex]) < upperBound || (binIndex == nBins - 1 && mp_obj_get_float(xItems[xIndex]) == upperBound)) {
// Increment the bin count
binItems[binIndex] = mp_obj_new_int(mp_obj_get_int(binItems[binIndex]) + 1); // TODO: better way? Use int_unary_op?
while (binIndex < nBins) {
mp_float_t lowerBound = mp_obj_get_float(edgeItems[binIndex]);
// Skip xItem if below the lower bound
while (xIndex < xLength && mp_obj_get_float(xItems[xIndex]) < lowerBound) {
xIndex++;
}
mp_float_t upperBound = mp_obj_get_float(edgeItems[binIndex+1]);
while (xIndex < xLength && (mp_obj_get_float(xItems[xIndex]) < upperBound || (binIndex == nBins - 1 && mp_obj_get_float(xItems[xIndex]) == upperBound))) {
assert(mp_obj_get_float(xItems[xIndex]) >= lowerBound);
// Increment the bin count
binItems[binIndex] = MP_OBJ_NEW_SMALL_INT(MP_OBJ_SMALL_INT_VALUE(binItems[binIndex]) + 1);
xIndex++;
if (xIndex == xLength) {
break;
}
}
binIndex++;
}