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/05/26 09:15:44 UTC
svn commit: r1901275 - in /poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions: DStdev.java DVar.java
Author: fanningpj
Date: Thu May 26 09:15:43 2022
New Revision: 1901275
URL: http://svn.apache.org/viewvc?rev=1901275&view=rev
Log:
small refactor
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStdev.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DVar.java
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStdev.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStdev.java?rev=1901275&r1=1901274&r2=1901275&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStdev.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStdev.java Thu May 26 09:15:43 2022
@@ -30,13 +30,12 @@ import java.util.ArrayList;
* Gets the standard deviation value of a column in an area with given conditions.
*/
public final class DStdev implements IDStarAlgorithm {
- private final ArrayList<Double> values = new ArrayList<>();
+ private final ArrayList<NumericValueEval> values = new ArrayList<>();
@Override
public boolean processMatch(ValueEval eval) {
if (eval instanceof NumericValueEval) {
- final double val = ((NumericValueEval)eval).getNumberValue();
- values.add(val);
+ values.add((NumericValueEval) eval);
}
return true;
}
@@ -45,8 +44,8 @@ public final class DStdev implements IDS
public ValueEval getResult() {
final double[] array = new double[values.size()];
int pos = 0;
- for (Double d : values) {
- array[pos++] = d;
+ for (NumericValueEval d : values) {
+ array[pos++] = d.getNumberValue();
}
final double stdev = StatsLib.stdev(array);
return new NumberEval(new BigDecimal(NumberToTextConverter.toText(stdev)).doubleValue());
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DVar.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DVar.java?rev=1901275&r1=1901274&r2=1901275&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DVar.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DVar.java Thu May 26 09:15:43 2022
@@ -30,13 +30,12 @@ import java.util.ArrayList;
* Gets the variance value of a column in an area with given conditions.
*/
public final class DVar implements IDStarAlgorithm {
- private final ArrayList<Double> values = new ArrayList<>();
+ private final ArrayList<NumericValueEval> values = new ArrayList<>();
@Override
public boolean processMatch(ValueEval eval) {
if (eval instanceof NumericValueEval) {
- final double val = ((NumericValueEval)eval).getNumberValue();
- values.add(val);
+ values.add((NumericValueEval) eval);
}
return true;
}
@@ -45,8 +44,8 @@ public final class DVar implements IDSta
public ValueEval getResult() {
final double[] array = new double[values.size()];
int pos = 0;
- for (Double d : values) {
- array[pos++] = d;
+ for (NumericValueEval d : values) {
+ array[pos++] = d.getNumberValue();
}
final double var = StatsLib.var(array);
return new NumberEval(new BigDecimal(NumberToTextConverter.toText(var)).doubleValue());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org