Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix correctness issue in regr_r2 #22611

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Fix correctness issue in regr_r2 #22611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions presto-main/src/main/java/com/facebook/presto/operator/aggregation/AggregationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ public static double getRegressionSyy(RegressionState state)

public static double getRegressionR2(RegressionState state)
{
if (state.getM2X() != 0 && state.getM2Y() == 0) {
return 1.0;
}
return Math.pow(state.getC2(), 2) / (state.getM2X() * state.getM2Y());
}

Expand Down
14 changes: 14 additions & 0 deletions ...n/src/test/java/com/facebook/presto/operator/aggregation/TestDoubleRegrR2Aggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package com.facebook.presto.operator.aggregation;

import org.apache.commons.math3.stat.regression.SimpleRegression;
import org.testng.annotations.Test;

import static com.facebook.presto.block.BlockAssertions.createDoublesBlock;
import static com.google.common.base.Preconditions.checkArgument;
Expand Down Expand Up @@ -45,6 +46,19 @@ else if (length == 1) {
}
}

@Test
public void testTwoSpecialCase()
{
// when m2x = 0, result is null
Double[] y = new Double[] {1.0, 1.0, 1.0, 1.0, 1.0};
Double[] x = new Double[] {1.0, 1.0, 1.0, 1.0, 1.0};
testAggregation(null, createDoublesBlock(y), createDoublesBlock(x));

// when m2x != 0 and m2y = 0, result is 1.0
x = new Double[] {1.0, 2.0, 3.0, 4.0, 5.0};
testAggregation(1.0, createDoublesBlock(y), createDoublesBlock(x));
}

@Override
protected void testNonTrivialAggregation(Double[] y, Double[] x)
{
Expand Down
14 changes: 14 additions & 0 deletions ...ain/src/test/java/com/facebook/presto/operator/aggregation/TestRealRegrR2Aggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package com.facebook.presto.operator.aggregation;

import org.apache.commons.math3.stat.regression.SimpleRegression;
import org.testng.annotations.Test;

import static com.facebook.presto.block.BlockAssertions.createBlockOfReals;
import static com.google.common.base.Preconditions.checkArgument;
Expand Down Expand Up @@ -45,6 +46,19 @@ else if (length == 1) {
}
}

@Test
public void testTwoSpecialCase()
{
// when m2x = 0, result is null
Float[] y = new Float[] {1.0f, 1.0f, 1.0f, 1.0f, 1.0f};
Float[] x = new Float[] {1.0f, 1.0f, 1.0f, 1.0f, 1.0f};
testAggregation(null, createBlockOfReals(y), createBlockOfReals(x));

// when m2x != 0 and m2y = 0, result is 1.0
x = new Float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f};
testAggregation(1.0f, createBlockOfReals(y), createBlockOfReals(x));
}

@Override
protected void testNonTrivialAggregation(Float[] y, Float[] x)
{
Expand Down
Loading