You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/06/05 19:51:02 UTC

svn commit: r1901686 - in /poi/trunk/poi/src: main/java/org/apache/poi/ss/formula/atp/ main/java/org/apache/poi/ss/formula/eval/ main/java/org/apache/poi/ss/formula/functions/ test/java/org/apache/poi/ss/formula/functions/

Author: fanningpj
Date: Sun Jun  5 19:51:01 2022
New Revision: 1901686

URL: http://svn.apache.org/viewvc?rev=1901686&view=rev
Log:
add COVAR and COVARIANCE.P functions

Added:
    poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Covar.java
      - copied, changed from r1901685, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java
    poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TwoArrayFunction.java
      - copied, changed from r1901685, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java
    poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCovar.java
      - copied, changed from r1901685, poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCorrel.java
Modified:
    poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
    poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
    poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java

Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java?rev=1901686&r1=1901685&r2=1901686&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java Sun Jun  5 19:51:01 2022
@@ -90,6 +90,7 @@ public final class AnalysisToolPak imple
         r(m, "COUPNCD", null);
         r(m, "COUPNUM", null);
         r(m, "COUPPCD", null);
+        r(m, "COVARIANCE.P", Covar.instanceP);
         r(m, "CUBEKPIMEMBER", null);
         r(m, "CUBEMEMBER", null);
         r(m, "CUBEMEMBERPROPERTY", null);

Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java?rev=1901686&r1=1901685&r2=1901686&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java Sun Jun  5 19:51:01 2022
@@ -288,7 +288,7 @@ public final class FunctionEval {
         retval[305] = new Sumx2py2();
         // 306: CHITEST
         retval[307] = Correl.instance;
-        // 308: COVAR
+        retval[308] = Covar.instanceP;
         // 309: FORECAST
         // 310: FTEST
         retval[311] = new Intercept();

Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java?rev=1901686&r1=1901685&r2=1901686&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java Sun Jun  5 19:51:01 2022
@@ -17,19 +17,11 @@
 package org.apache.poi.ss.formula.functions;
 
 import org.apache.commons.math3.stat.correlation.PearsonsCorrelation;
-import org.apache.poi.ss.formula.ThreeDEval;
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
 import org.apache.poi.ss.formula.eval.ErrorEval;
 import org.apache.poi.ss.formula.eval.EvaluationException;
 import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringValueEval;
 import org.apache.poi.ss.formula.eval.ValueEval;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -46,7 +38,7 @@ import java.util.List;
  *   See https://support.microsoft.com/en-us/office/correl-function-995dcef7-0c0a-4bed-a3fb-239d7b68ca92
  * </p>
  */
-public class Correl extends Fixed2ArgFunction {
+public class Correl extends TwoArrayFunction {
 
     public static final Correl instance = new Correl();
 
@@ -60,108 +52,8 @@ public class Correl extends Fixed2ArgFun
             return new NumberEval(correl);
         } catch (EvaluationException e) {
             return e.getErrorEval();
+        } catch (Exception e) {
+            return ErrorEval.NA;
         }
     }
-
-    private List<DoubleList> getNumberArrays(ValueEval operand0, ValueEval operand1) throws EvaluationException {
-        double[] retval0 = collectValuesWithBlanks(operand0).toArray();
-        double[] retval1 = collectValuesWithBlanks(operand1).toArray();
-        if (retval0.length != retval1.length) {
-            throw new EvaluationException(ErrorEval.NA);
-        }
-        DoubleList filtered0 = new DoubleList();
-        DoubleList filtered1 = new DoubleList();
-        int len = Math.min(retval0.length, retval1.length);
-        for (int i = 0; i < len; i++) {
-            if (Double.isNaN(retval0[i]) || Double.isNaN(retval1[i])) {
-                //ignore
-            } else {
-                filtered0.add(retval0[i]);
-                filtered1.add(retval1[i]);
-            }
-        }
-        return Arrays.asList(filtered0, filtered1);
-    }
-
-    private DoubleList collectValuesWithBlanks(ValueEval operand) throws EvaluationException {
-        DoubleList doubleList = new DoubleList();
-        if (operand instanceof ThreeDEval) {
-            ThreeDEval ae = (ThreeDEval) operand;
-            for (int sIx = ae.getFirstSheetIndex(); sIx <= ae.getLastSheetIndex(); sIx++) {
-                int width = ae.getWidth();
-                int height = ae.getHeight();
-                for (int rrIx = 0; rrIx < height; rrIx++) {
-                    for (int rcIx = 0; rcIx < width; rcIx++) {
-                        ValueEval ve = ae.getValue(sIx, rrIx, rcIx);
-                        Double d = collectValue(ve);
-                        if (d == null) {
-                            doubleList.add(Double.NaN);
-                        } else {
-                            doubleList.add(d.doubleValue());
-                        }
-                    }
-                }
-            }
-            return doubleList;
-        }
-        if (operand instanceof TwoDEval) {
-            TwoDEval ae = (TwoDEval) operand;
-            int width = ae.getWidth();
-            int height = ae.getHeight();
-            for (int rrIx = 0; rrIx < height; rrIx++) {
-                for (int rcIx = 0; rcIx < width; rcIx++) {
-                    ValueEval ve = ae.getValue(rrIx, rcIx);
-                    Double d = collectValue(ve);
-                    if (d == null) {
-                        doubleList.add(Double.NaN);
-                    } else {
-                        doubleList.add(d.doubleValue());
-                    }
-                }
-            }
-            return doubleList;
-        }
-        if (operand instanceof RefEval) {
-            RefEval re = (RefEval) operand;
-            for (int sIx = re.getFirstSheetIndex(); sIx <= re.getLastSheetIndex(); sIx++) {
-                Double d = collectValue(re.getInnerValueEval(sIx));
-                if (d == null) {
-                    doubleList.add(Double.NaN);
-                } else {
-                    doubleList.add(d.doubleValue());
-                }
-            }
-            return doubleList;
-        }
-        Double d = collectValue(operand);
-        if (d == null) {
-            doubleList.add(Double.NaN);
-        } else {
-            doubleList.add(d.doubleValue());
-        }
-        return doubleList;
-    }
-
-    private Double collectValue(ValueEval ve) throws EvaluationException {
-        if (ve == null) {
-            throw new IllegalArgumentException("ve must not be null");
-        }
-        if (ve instanceof NumericValueEval) {
-            NumericValueEval ne = (NumericValueEval) ve;
-            return ne.getNumberValue();
-        }
-        if (ve instanceof StringValueEval) {
-            String s = ((StringValueEval) ve).getStringValue().trim();
-            return OperandResolver.parseDouble(s);
-        }
-        if (ve instanceof ErrorEval) {
-            throw new EvaluationException((ErrorEval) ve);
-        }
-        if (ve == BlankEval.instance) {
-            return null;
-        }
-        throw new RuntimeException("Invalid ValueEval type passed for conversion: ("
-                + ve.getClass() + ")");
-    }
-
 }

Copied: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Covar.java (from r1901685, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Covar.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Covar.java&p1=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java&r1=1901685&r2=1901686&rev=1901686&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Covar.java Sun Jun  5 19:51:01 2022
@@ -16,152 +16,49 @@
 ==================================================================== */
 package org.apache.poi.ss.formula.functions;
 
+import org.apache.commons.math3.stat.correlation.Covariance;
 import org.apache.commons.math3.stat.correlation.PearsonsCorrelation;
-import org.apache.poi.ss.formula.ThreeDEval;
-import org.apache.poi.ss.formula.TwoDEval;
-import org.apache.poi.ss.formula.eval.BlankEval;
+import org.apache.poi.ss.formula.OperationEvaluationContext;
 import org.apache.poi.ss.formula.eval.ErrorEval;
 import org.apache.poi.ss.formula.eval.EvaluationException;
 import org.apache.poi.ss.formula.eval.NumberEval;
-import org.apache.poi.ss.formula.eval.NumericValueEval;
-import org.apache.poi.ss.formula.eval.OperandResolver;
-import org.apache.poi.ss.formula.eval.RefEval;
-import org.apache.poi.ss.formula.eval.StringValueEval;
 import org.apache.poi.ss.formula.eval.ValueEval;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
- * Implementation for Excel CORREL() function.
+ * Implementation for Excel COVAR() and COVARIANCE.P() functions.
  * <p>
- *   <b>Syntax</b>:<br> <b>CORREL </b>(<b>array1</b>, <b>array2</b>)<br>
+ *   <b>Syntax</b>:<br> <b>COVAR </b>(<b>array1</b>, <b>array2</b>)<br>
  * </p>
- * <p>
- *   The CORREL function returns the correlation coefficient of two cell ranges.
- *   Use the correlation coefficient to determine the relationship between two properties.
- *   For example, you can examine the relationship between a location's average temperature and the use of air conditioners.
- * </p>
- * <p>
- *   See https://support.microsoft.com/en-us/office/correl-function-995dcef7-0c0a-4bed-a3fb-239d7b68ca92
+ * @see <a href="https://support.microsoft.com/en-us/office/covar-function-50479552-2c03-4daf-bd71-a5ab88b2db03">COVAR</a>
+ * @see <a href="https://support.microsoft.com/en-us/office/covariance-p-function-6f0e1e6d-956d-4e4b-9943-cfef0bf9edfc">COVARIANCE.P</a>
  * </p>
  */
-public class Correl extends Fixed2ArgFunction {
+public class Covar extends TwoArrayFunction implements FreeRefFunction {
 
-    public static final Correl instance = new Correl();
+    public static final Covar instanceP = new Covar();
 
     @Override
     public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
         try {
             final List<DoubleList> arrays = getNumberArrays(arg0, arg1);
-            final PearsonsCorrelation pc = new PearsonsCorrelation();
-            final double correl = pc.correlation(
-                    arrays.get(0).toArray(), arrays.get(1).toArray());
-            return new NumberEval(correl);
+            final Covariance covar = new Covariance();
+            final double result = covar.covariance(
+                    arrays.get(0).toArray(), arrays.get(1).toArray(), false);
+            return new NumberEval(result);
         } catch (EvaluationException e) {
             return e.getErrorEval();
+        } catch (Exception e) {
+            return ErrorEval.NA;
         }
     }
 
-    private List<DoubleList> getNumberArrays(ValueEval operand0, ValueEval operand1) throws EvaluationException {
-        double[] retval0 = collectValuesWithBlanks(operand0).toArray();
-        double[] retval1 = collectValuesWithBlanks(operand1).toArray();
-        if (retval0.length != retval1.length) {
-            throw new EvaluationException(ErrorEval.NA);
-        }
-        DoubleList filtered0 = new DoubleList();
-        DoubleList filtered1 = new DoubleList();
-        int len = Math.min(retval0.length, retval1.length);
-        for (int i = 0; i < len; i++) {
-            if (Double.isNaN(retval0[i]) || Double.isNaN(retval1[i])) {
-                //ignore
-            } else {
-                filtered0.add(retval0[i]);
-                filtered1.add(retval1[i]);
-            }
-        }
-        return Arrays.asList(filtered0, filtered1);
-    }
-
-    private DoubleList collectValuesWithBlanks(ValueEval operand) throws EvaluationException {
-        DoubleList doubleList = new DoubleList();
-        if (operand instanceof ThreeDEval) {
-            ThreeDEval ae = (ThreeDEval) operand;
-            for (int sIx = ae.getFirstSheetIndex(); sIx <= ae.getLastSheetIndex(); sIx++) {
-                int width = ae.getWidth();
-                int height = ae.getHeight();
-                for (int rrIx = 0; rrIx < height; rrIx++) {
-                    for (int rcIx = 0; rcIx < width; rcIx++) {
-                        ValueEval ve = ae.getValue(sIx, rrIx, rcIx);
-                        Double d = collectValue(ve);
-                        if (d == null) {
-                            doubleList.add(Double.NaN);
-                        } else {
-                            doubleList.add(d.doubleValue());
-                        }
-                    }
-                }
-            }
-            return doubleList;
-        }
-        if (operand instanceof TwoDEval) {
-            TwoDEval ae = (TwoDEval) operand;
-            int width = ae.getWidth();
-            int height = ae.getHeight();
-            for (int rrIx = 0; rrIx < height; rrIx++) {
-                for (int rcIx = 0; rcIx < width; rcIx++) {
-                    ValueEval ve = ae.getValue(rrIx, rcIx);
-                    Double d = collectValue(ve);
-                    if (d == null) {
-                        doubleList.add(Double.NaN);
-                    } else {
-                        doubleList.add(d.doubleValue());
-                    }
-                }
-            }
-            return doubleList;
-        }
-        if (operand instanceof RefEval) {
-            RefEval re = (RefEval) operand;
-            for (int sIx = re.getFirstSheetIndex(); sIx <= re.getLastSheetIndex(); sIx++) {
-                Double d = collectValue(re.getInnerValueEval(sIx));
-                if (d == null) {
-                    doubleList.add(Double.NaN);
-                } else {
-                    doubleList.add(d.doubleValue());
-                }
-            }
-            return doubleList;
-        }
-        Double d = collectValue(operand);
-        if (d == null) {
-            doubleList.add(Double.NaN);
-        } else {
-            doubleList.add(d.doubleValue());
-        }
-        return doubleList;
-    }
-
-    private Double collectValue(ValueEval ve) throws EvaluationException {
-        if (ve == null) {
-            throw new IllegalArgumentException("ve must not be null");
-        }
-        if (ve instanceof NumericValueEval) {
-            NumericValueEval ne = (NumericValueEval) ve;
-            return ne.getNumberValue();
-        }
-        if (ve instanceof StringValueEval) {
-            String s = ((StringValueEval) ve).getStringValue().trim();
-            return OperandResolver.parseDouble(s);
-        }
-        if (ve instanceof ErrorEval) {
-            throw new EvaluationException((ErrorEval) ve);
-        }
-        if (ve == BlankEval.instance) {
-            return null;
+    @Override
+    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
+        if (args.length != 2) {
+            return ErrorEval.VALUE_INVALID;
         }
-        throw new RuntimeException("Invalid ValueEval type passed for conversion: ("
-                + ve.getClass() + ")");
+        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0], args[1]);
     }
-
 }

Copied: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TwoArrayFunction.java (from r1901685, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TwoArrayFunction.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TwoArrayFunction.java&p1=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java&r1=1901685&r2=1901686&rev=1901686&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Correl.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TwoArrayFunction.java Sun Jun  5 19:51:01 2022
@@ -16,13 +16,11 @@
 ==================================================================== */
 package org.apache.poi.ss.formula.functions;
 
-import org.apache.commons.math3.stat.correlation.PearsonsCorrelation;
 import org.apache.poi.ss.formula.ThreeDEval;
 import org.apache.poi.ss.formula.TwoDEval;
 import org.apache.poi.ss.formula.eval.BlankEval;
 import org.apache.poi.ss.formula.eval.ErrorEval;
 import org.apache.poi.ss.formula.eval.EvaluationException;
-import org.apache.poi.ss.formula.eval.NumberEval;
 import org.apache.poi.ss.formula.eval.NumericValueEval;
 import org.apache.poi.ss.formula.eval.OperandResolver;
 import org.apache.poi.ss.formula.eval.RefEval;
@@ -32,38 +30,9 @@ import org.apache.poi.ss.formula.eval.Va
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * Implementation for Excel CORREL() function.
- * <p>
- *   <b>Syntax</b>:<br> <b>CORREL </b>(<b>array1</b>, <b>array2</b>)<br>
- * </p>
- * <p>
- *   The CORREL function returns the correlation coefficient of two cell ranges.
- *   Use the correlation coefficient to determine the relationship between two properties.
- *   For example, you can examine the relationship between a location's average temperature and the use of air conditioners.
- * </p>
- * <p>
- *   See https://support.microsoft.com/en-us/office/correl-function-995dcef7-0c0a-4bed-a3fb-239d7b68ca92
- * </p>
- */
-public class Correl extends Fixed2ArgFunction {
+abstract class TwoArrayFunction extends Fixed2ArgFunction {
 
-    public static final Correl instance = new Correl();
-
-    @Override
-    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) {
-        try {
-            final List<DoubleList> arrays = getNumberArrays(arg0, arg1);
-            final PearsonsCorrelation pc = new PearsonsCorrelation();
-            final double correl = pc.correlation(
-                    arrays.get(0).toArray(), arrays.get(1).toArray());
-            return new NumberEval(correl);
-        } catch (EvaluationException e) {
-            return e.getErrorEval();
-        }
-    }
-
-    private List<DoubleList> getNumberArrays(ValueEval operand0, ValueEval operand1) throws EvaluationException {
+    protected List<DoubleList> getNumberArrays(ValueEval operand0, ValueEval operand1) throws EvaluationException {
         double[] retval0 = collectValuesWithBlanks(operand0).toArray();
         double[] retval1 = collectValuesWithBlanks(operand1).toArray();
         if (retval0.length != retval1.length) {

Copied: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCovar.java (from r1901685, poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCorrel.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCovar.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCovar.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCorrel.java&r1=1901685&r2=1901686&rev=1901686&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCorrel.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCovar.java Sun Jun  5 19:51:01 2022
@@ -32,11 +32,11 @@ import static org.apache.poi.ss.util.Uti
 import static org.apache.poi.ss.util.Utils.assertError;
 
 /**
- * Tests for {@link Correl}
+ * Tests for {@link Covar}
  */
-final class TestCorrel {
+final class TestCovar {
 
-    //https://support.microsoft.com/en-us/office/correl-function-995dcef7-0c0a-4bed-a3fb-239d7b68ca92
+    //https://support.microsoft.com/en-us/office/covar-function-50479552-2c03-4daf-bd71-a5ab88b2db03
     @Test
     void testMicrosoftExample1() throws IOException {
         try (HSSFWorkbook wb = initWorkbook1()) {
@@ -44,7 +44,8 @@ final class TestCorrel {
             HSSFRow row = sheet.getRow(0);
             HSSFCell cell = row.createCell(100);
             HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-            assertDouble(fe, cell, "CORREL(A2:A6,B2:B6)", 0.997054486, 0.0000000005);
+            assertDouble(fe, cell, "COVAR(A2:A6,B2:B6)", 5.2, 0.0000000005);
+            assertDouble(fe, cell, "COVARIANCE.P(A2:A6,B2:B6)", 5.2, 0.0000000005);
         }
     }
 
@@ -55,7 +56,8 @@ final class TestCorrel {
             HSSFRow row = sheet.getRow(0);
             HSSFCell cell = row.createCell(100);
             HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-            assertDouble(fe, cell, "CORREL(A2:A6,B2:B6)", 0.9984884738, 0.0000000005);
+            assertDouble(fe, cell, "COVAR(A2:A6,B2:B6)", 5.5625, 0.0000000005);
+            assertDouble(fe, cell, "COVARIANCE.P(A2:A6,B2:B6)", 5.5625, 0.0000000005);
         }
     }
 
@@ -66,7 +68,8 @@ final class TestCorrel {
             HSSFRow row = sheet.getRow(0);
             HSSFCell cell = row.createCell(100);
             HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-            assertDouble(fe, cell, "CORREL(A2:A6,B2:B6)", 0.9984884738, 0.0000000005);
+            assertDouble(fe, cell, "COVAR(A2:A6,B2:B6)", 5.5625, 0.0000000005);
+            assertDouble(fe, cell, "COVARIANCE.P(A2:A6,B2:B6)", 5.5625, 0.0000000005);
         }
     }
 
@@ -77,8 +80,10 @@ final class TestCorrel {
             HSSFRow row = sheet.getRow(0);
             HSSFCell cell = row.createCell(100);
             HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
-            assertError(fe, cell, "CORREL(A2:A6,B2:B5)", FormulaError.NA);
-            assertError(fe, cell, "CORREL(A2:B6,B2:B6)", FormulaError.NA);
+            assertError(fe, cell, "COVAR(A2:A6,B2:B5)", FormulaError.NA);
+            assertError(fe, cell, "COVARIANCE.P(A2:A6,B2:B5)", FormulaError.NA);
+            assertError(fe, cell, "COVAR(A2:B6,B2:B6)", FormulaError.NA);
+            assertError(fe, cell, "COVARIANCE.P(A2:B6,B2:B6)", FormulaError.NA);
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org