aboutsummaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorCédric Walter <cedricwalter@apache.org>2013-11-04 21:27:12 +0000
committerCédric Walter <cedricwalter@apache.org>2013-11-04 21:27:12 +0000
commit26dc6796dfe7950566d935f12eb17171cc042051 (patch)
treef14ab4cbb229ec0e616ac1e1eeb53a0b4e671491 /src/java
parentf97310c1f6f288efafc49eb328c2222d3ef2840f (diff)
downloadpoi-26dc6796dfe7950566d935f12eb17171cc042051.tar.gz
poi-26dc6796dfe7950566d935f12eb17171cc042051.zip
Bug 54535: Bug in INTERCEPT and SLOPE, review and integration test added to FormulaEvalTestData.xls
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1538772 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java')
-rw-r--r--src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java b/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
index a676f5b347..4fed7f9e98 100644
--- a/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
+++ b/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
@@ -68,7 +68,7 @@ public final class LinearRegressionFunction extends Fixed2ArgFunction {
super(1);
_value = value;
}
- @Override
+
protected ValueEval getItemInternal(int index) {
return _value;
}
@@ -80,7 +80,7 @@ public final class LinearRegressionFunction extends Fixed2ArgFunction {
super(1);
_ref = ref;
}
- @Override
+
protected ValueEval getItemInternal(int index) {
return _ref.getInnerValueEval();
}
@@ -95,7 +95,7 @@ public final class LinearRegressionFunction extends Fixed2ArgFunction {
_ae = ae;
_width = ae.getWidth();
}
- @Override
+
protected ValueEval getItemInternal(int index) {
int rowIx = index / _width;
int colIx = index % _width;
@@ -114,8 +114,8 @@ public final class LinearRegressionFunction extends Fixed2ArgFunction {
ValueEval arg0, ValueEval arg1) {
double result;
try {
- ValueVector vvX = createValueVector(arg0);
- ValueVector vvY = createValueVector(arg1);
+ ValueVector vvY = createValueVector(arg0);
+ ValueVector vvX = createValueVector(arg1);
int size = vvX.getSize();
if (size == 0 || vvY.getSize() != size) {
return ErrorEval.NA;
@@ -137,7 +137,6 @@ public final class LinearRegressionFunction extends Fixed2ArgFunction {
ErrorEval firstXerr = null;
ErrorEval firstYerr = null;
boolean accumlatedSome = false;
- double result = 0.0;
// first pass: read in data, compute xbar and ybar
double sumx = 0.0, sumy = 0.0;