Skip to content

Commit

Permalink
Fixed problems in cumsum and cumprod where multiple leading null valu…
Browse files Browse the repository at this point in the history 
…es give incorrect answers. (deephaven#5464)

Fixed bug in cumsum and cumprod when there are multiple initial null values.
Resolves deephaven#5462
  • Loading branch information
@chipkent
chipkent committed May 8, 2024
1 parent dcf77c1 commit f2dc4fe
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
20 changes: 10 additions & 10 deletions engine/function/src/templates/Numeric.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1934,10 +1934,10 @@ public class Numeric {
if (isNaN(v) || isNaN(result[i - 1])) {
Arrays.fill(result, i, n, Double.NaN);
return result;
} else if (isNull(result[i - 1])) {
result[i] = v;
} else if (isNull(v)) {
result[i] = result[i - 1];
} else if (isNull(result[i - 1])) {
result[i] = v;
} else {
result[i] = result[i - 1] + v;
}
Expand Down Expand Up @@ -1969,10 +1969,10 @@ public class Numeric {
while (vi.hasNext()) {
final ${pt.primitive} v = vi.${pt.iteratorNext}();

if (isNull(result[i - 1])) {
result[i] = v;
} else if (isNull(v)) {
if (isNull(v)) {
result[i] = result[i - 1];
} else if (isNull(result[i - 1])) {
result[i] = v;
} else {
result[i] = result[i - 1] + v;
}
Expand Down Expand Up @@ -2055,10 +2055,10 @@ public class Numeric {
if (isNaN(v) || isNaN(result[i - 1])) {
Arrays.fill(result, i, n, Double.NaN);
return result;
} else if (isNull(result[i - 1])) {
result[i] = v;
} else if (isNull(v)) {
result[i] = result[i - 1];
} else if (isNull(result[i - 1])) {
result[i] = v;
} else {
result[i] = result[i - 1] * v;
}
Expand Down Expand Up @@ -2090,10 +2090,10 @@ public class Numeric {
while (vi.hasNext()) {
final ${pt.primitive} v = vi.${pt.iteratorNext}();

if (isNull(result[i - 1])) {
result[i] = v;
} else if (isNull(v)) {
if (isNull(v)) {
result[i] = result[i - 1];
} else if (isNull(result[i - 1])) {
result[i] = v;
} else {
result[i] = result[i - 1] * v;
}
Expand Down
6 changes: 6 additions & 0 deletions engine/function/src/templates/TestNumeric.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -805,13 +805,15 @@ public class TestNumeric extends BaseArrayTestCase {
assertEquals(new double[]{1, 3, 6, 10, 15}, cumsum(new ${pt.primitive}[]{1, 2, 3, 4, 5}));
assertEquals(new double[]{1, 3, 6, 6, 11}, cumsum(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5}));
assertEquals(new double[]{NULL_DOUBLE, 2, 5, 9, 14}, cumsum(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5}));
assertEquals(new double[]{NULL_DOUBLE, NULL_DOUBLE, 2, 5, 9, 14}, cumsum(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5}));
assertEquals(new double[0], cumsum(new ${pt.primitive}[0]));
assertEquals(new double[0], cumsum(new ${pt.boxed}[0]));
assertEquals(null, cumsum((${pt.primitive}[]) null));

assertEquals(new double[]{1, 3, 6, 10, 15}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, 4, 5})));
assertEquals(new double[]{1, 3, 6, 6, 11}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5})));
assertEquals(new double[]{NULL_DOUBLE, 2, 5, 9, 14}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5})));
assertEquals(new double[]{NULL_DOUBLE, NULL_DOUBLE, 2, 5, 9, 14}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5})));
assertEquals(new double[0], cumsum(new ${pt.vectorDirect}()));
assertEquals(null, cumsum((${pt.vector}) null));

Expand All @@ -832,13 +834,15 @@ public class TestNumeric extends BaseArrayTestCase {
assertEquals(new long[]{1, 3, 6, 10, 15}, cumsum(new ${pt.primitive}[]{1, 2, 3, 4, 5}));
assertEquals(new long[]{1, 3, 6, 6, 11}, cumsum(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5}));
assertEquals(new long[]{NULL_LONG, 2, 5, 9, 14}, cumsum(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5}));
assertEquals(new long[]{NULL_LONG, NULL_LONG, 2, 5, 9, 14}, cumsum(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5}));
assertEquals(new long[0], cumsum(new ${pt.primitive}[0]));
assertEquals(new long[0], cumsum(new ${pt.boxed}[0]));
assertEquals(null, cumsum((${pt.primitive}[]) null));

assertEquals(new long[]{1, 3, 6, 10, 15}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, 4, 5})));
assertEquals(new long[]{1, 3, 6, 6, 11}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5})));
assertEquals(new long[]{NULL_LONG, 2, 5, 9, 14}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5})));
assertEquals(new long[]{NULL_LONG, NULL_LONG, 2, 5, 9, 14}, cumsum(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5})));
assertEquals(new long[0], cumsum(new ${pt.vectorDirect}()));
assertEquals(null, cumsum((${pt.vector}) null));

Expand All @@ -852,6 +856,7 @@ public class TestNumeric extends BaseArrayTestCase {
assertEquals(new double[]{1, 2, 6, 24, 120}, cumprod(new ${pt.primitive}[]{1, 2, 3, 4, 5}));
assertEquals(new double[]{1, 2, 6, 6, 30}, cumprod(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5}));
assertEquals(new double[]{NULL_DOUBLE, 2, 6, 24, 120}, cumprod(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5}));
assertEquals(new double[]{NULL_DOUBLE, NULL_DOUBLE, 2, 6, 24, 120}, cumprod(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5}));
assertEquals(new double[0], cumprod(new ${pt.primitive}[0]));
assertEquals(new double[0], cumprod(new ${pt.boxed}[0]));
assertEquals(null, cumprod((${pt.primitive}[]) null));
Expand All @@ -860,6 +865,7 @@ public class TestNumeric extends BaseArrayTestCase {
assertEquals(new double[]{1, 2, 6, 24, 120}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, 4, 5})));
assertEquals(new double[]{1, 2, 6, 6, 30}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, 2, 3, ${pt.null}, 5})));
assertEquals(new double[]{NULL_DOUBLE, 2, 6, 24, 120}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, 2, 3, 4, 5})));
assertEquals(new double[]{NULL_DOUBLE, NULL_DOUBLE, 2, 6, 24, 120}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{${pt.null}, ${pt.null}, 2, 3, 4, 5})));
assertEquals(new double[0], cumprod(new ${pt.vectorDirect}()));
assertEquals(null, cumprod((${pt.vector}) null));
assertEquals(new double[]{1, Double.NaN, Double.NaN, Double.NaN, Double.NaN}, cumprod(new ${pt.vectorDirect}(new ${pt.primitive}[]{1, Float.NaN, 3, 4, 5})));
Expand Down

0 comments on commit f2dc4fe

Please sign in to comment.