Author: fanningpj
Date: Fri Feb 4 10:32:00 2022
New Revision: 1897759
URL: http://svn.apache.org/viewvc?rev=1897759&view=rev
Log:
add dollarfr function
Added:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java
- copied, changed from r1897752,
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarFr.java
- copied, changed from r1897752,
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.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/functions/DollarDe.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.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=1897759&r1=1897758&r2=1897759&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
Fri Feb 4 10:32:00 2022
@@ -103,7 +103,7 @@ public final class AnalysisToolPak imple
r(m, "DELTA", Delta.instance);
r(m, "DISC", null);
r(m, "DOLLARDE", DollarDe.instance);
- r(m, "DOLLARFR", null);
+ r(m, "DOLLARFR", DollarFr.instance);
r(m, "DURATION", null);
r(m, "EDATE", EDate.instance);
r(m, "EFFECT", null);
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java?rev=1897759&r1=1897758&r2=1897759&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java
Fri Feb 4 10:32:00 2022
@@ -26,12 +26,11 @@ import org.apache.poi.ss.formula.eval.Va
import java.math.BigDecimal;
import java.math.MathContext;
-import java.text.NumberFormat;
/**
* Implementation for Excel DOLLARDE() function.
* <p>
- *
<https://support.microsoft.com/en-us/office/dollarde-function-db85aab0-1677-428a-9dfd-a38476693427
+ *
https://support.microsoft.com/en-us/office/dollarde-function-db85aab0-1677-428a-9dfd-a38476693427
*/
public final class DollarDe extends Fixed2ArgFunction implements
FreeRefFunction {
@@ -54,26 +53,30 @@ public final class DollarDe extends Fixe
} else if (fraction == 0) {
return ErrorEval.DIV_ZERO;
}
+ int fractionLength = String.valueOf(fraction).length();
+ boolean negative = false;
long valueLong = number1.longValue();
+ if (valueLong < 0) {
+ negative = true;
+ valueLong = -valueLong;
+ number1 = -number1;
+ }
+
double valueFractional = number1 - valueLong;
if (valueFractional == 0.0) {
return new NumberEval(valueLong);
}
- int iterations = 0;
- final int maxIterations = 100;
- while (valueFractional < fraction && iterations < maxIterations) {
- valueFractional = valueFractional * 10;
- iterations++;
- }
- if (iterations == maxIterations && valueFractional < fraction) {
- return new NumberEval(valueLong);
+
+ BigDecimal inflated =
BigDecimal.valueOf(valueFractional).multiply(BigDecimal.valueOf(Math.pow(10,
fractionLength)));
+
+ BigDecimal calc = inflated.divide(BigDecimal.valueOf(fraction),
MathContext.DECIMAL128);
+ BigDecimal result = calc.add(BigDecimal.valueOf(valueLong));
+ if (negative) {
+ result = result.multiply(BigDecimal.valueOf(-1));
}
- BigDecimal calc = new BigDecimal((long)valueFractional)
- .divide(BigDecimal.valueOf(10), MathContext.DECIMAL128)
- .divide(BigDecimal.valueOf(fraction),
MathContext.DECIMAL128);
- return new
NumberEval(calc.add(BigDecimal.valueOf(valueLong)).doubleValue());
+ return new NumberEval(result.doubleValue());
} catch (EvaluationException e) {
return e.getErrorEval();
}
Copied:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java
(from r1897752,
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java&p1=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java&r1=1897752&r2=1897759&rev=1897759&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarFr.java
Fri Feb 4 10:32:00 2022
@@ -27,15 +27,16 @@ import org.apache.poi.ss.formula.eval.Va
import java.math.BigDecimal;
import java.math.MathContext;
import java.text.NumberFormat;
+import java.util.Locale;
/**
- * Implementation for Excel DOLLARDE() function.
+ * Implementation for Excel DOLLARFR() function.
* <p>
- *
<https://support.microsoft.com/en-us/office/dollarde-function-db85aab0-1677-428a-9dfd-a38476693427
+ *
https://support.microsoft.com/en-us/office/dollarfr-function-0835d163-3023-4a33-9824-3042c5d4f495
*/
-public final class DollarDe extends Fixed2ArgFunction implements
FreeRefFunction {
+public final class DollarFr extends Fixed2ArgFunction implements
FreeRefFunction {
- public static final FreeRefFunction instance = new DollarDe();
+ public static final FreeRefFunction instance = new DollarFr();
@Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval
arg1, ValueEval arg2) {
@@ -54,26 +55,30 @@ public final class DollarDe extends Fixe
} else if (fraction == 0) {
return ErrorEval.DIV_ZERO;
}
+ int fractionLength = String.valueOf(fraction).length();
+ boolean negative = false;
long valueLong = number1.longValue();
+ if (valueLong < 0) {
+ negative = true;
+ valueLong = -valueLong;
+ number1 = -number1;
+ }
+
double valueFractional = number1 - valueLong;
if (valueFractional == 0.0) {
return new NumberEval(valueLong);
}
- int iterations = 0;
- final int maxIterations = 100;
- while (valueFractional < fraction && iterations < maxIterations) {
- valueFractional = valueFractional * 10;
- iterations++;
- }
- if (iterations == maxIterations && valueFractional < fraction) {
- return new NumberEval(valueLong);
+
+ BigDecimal calc =
BigDecimal.valueOf(valueFractional).multiply(BigDecimal.valueOf(fraction))
+ .divide(BigDecimal.valueOf(Math.pow(10, fractionLength)),
MathContext.DECIMAL128);
+
+ BigDecimal result = calc.add(BigDecimal.valueOf(valueLong));
+ if (negative) {
+ result = result.multiply(BigDecimal.valueOf(-1));
}
- BigDecimal calc = new BigDecimal((long)valueFractional)
- .divide(BigDecimal.valueOf(10), MathContext.DECIMAL128)
- .divide(BigDecimal.valueOf(fraction),
MathContext.DECIMAL128);
- return new
NumberEval(calc.add(BigDecimal.valueOf(valueLong)).doubleValue());
+ return new NumberEval(result.doubleValue());
} catch (EvaluationException e) {
return e.getErrorEval();
}
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java?rev=1897759&r1=1897758&r2=1897759&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java
Fri Feb 4 10:32:00 2022
@@ -68,10 +68,15 @@ final class TestDollarDe {
HSSFRow row = sheet.createRow(0);
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
HSSFCell cell = row.createCell(0);
- assertDouble(fe, cell, "DOLLARDE(1.02,16)", 1.125,
0.00000000000001);
- assertDouble(fe, cell, "DOLLARDE(1.02,16.9)", 1.125,
0.00000000000001);
- assertDouble(fe, cell, "DOLLARDE(1.1,32)", 1.3125,
0.00000000000001);
- assertDouble(fe, cell, "DOLLARDE(1.1,32.1)", 1.3125,
0.00000000000001);
+ double tolerance = 0.000000000000001;
+ assertDouble(fe, cell, "DOLLARDE(1.02,16)", 1.125, tolerance);
+ assertDouble(fe, cell, "DOLLARDE(1.02,16.9)", 1.125, tolerance);
+ assertDouble(fe, cell, "DOLLARDE(1.32,16)", 3.0, tolerance);
+ assertDouble(fe, cell, "DOLLARDE(-1.02,16)", -1.125, tolerance);
+ assertDouble(fe, cell, "DOLLARDE(1.1,32)", 1.3125, tolerance);
+ assertDouble(fe, cell, "DOLLARDE(1.1,32.1)", 1.3125, tolerance);
+ assertDouble(fe, cell, "DOLLARDE(1.0,32)", 1.0, tolerance);
+ assertDouble(fe, cell, "DOLLARDE(1.000001,32)", 1.000003125,
tolerance);
}
}
Copied:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarFr.java
(from r1897752,
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarFr.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarFr.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java&r1=1897752&r2=1897759&rev=1897759&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarFr.java
Fri Feb 4 10:32:00 2022
@@ -23,7 +23,6 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.StringEval;
@@ -32,14 +31,13 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.apache.poi.ss.util.Utils.addRow;
import static org.apache.poi.ss.util.Utils.assertDouble;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
- * Tests for {@link DollarDe}
+ * Tests for {@link DollarFr}
*/
-final class TestDollarDe {
+final class TestDollarFr {
private static final OperationEvaluationContext ec = new
OperationEvaluationContext(null, null, 0, 0, 0, null);
@@ -60,7 +58,7 @@ final class TestDollarDe {
confirmDiv0("22.5","-0.9");
}
-
//https://support.microsoft.com/en-us/office/dollarde-function-db85aab0-1677-428a-9dfd-a38476693427
+
//https://support.microsoft.com/en-us/office/dollarfr-function-0835d163-3023-4a33-9824-3042c5d4f495
@Test
void testMicrosoftExample1() throws IOException {
try (HSSFWorkbook wb = new HSSFWorkbook()) {
@@ -68,10 +66,11 @@ final class TestDollarDe {
HSSFRow row = sheet.createRow(0);
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
HSSFCell cell = row.createCell(0);
- assertDouble(fe, cell, "DOLLARDE(1.02,16)", 1.125,
0.00000000000001);
- assertDouble(fe, cell, "DOLLARDE(1.02,16.9)", 1.125,
0.00000000000001);
- assertDouble(fe, cell, "DOLLARDE(1.1,32)", 1.3125,
0.00000000000001);
- assertDouble(fe, cell, "DOLLARDE(1.1,32.1)", 1.3125,
0.00000000000001);
+ double tolerance = 0.000000000000001;
+ assertDouble(fe, cell, "DOLLARFR(1.125,16)", 1.02, tolerance);
+ assertDouble(fe, cell, "DOLLARFR(-1.125,16)", -1.02, tolerance);
+ assertDouble(fe, cell, "DOLLARFR(1.000125,16)", 1.00002,
tolerance);
+ assertDouble(fe, cell, "DOLLARFR(1.125,32)", 1.04, tolerance);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
