You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2015/10/01 16:05:29 UTC
svn commit: r1706254 - in /poi/trunk/src:
java/org/apache/poi/ss/formula/functions/FinanceFunction.java
testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
Author: centic
Date: Thu Oct 1 14:05:28 2015
New Revision: 1706254
URL: http://svn.apache.org/viewvc?rev=1706254&view=rev
Log:
Bug 55032: Fix handling missing option values in financial functions PV, FV, NPER and PMT
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java?rev=1706254&r1=1706253&r2=1706254&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java Thu Oct 1 14:05:28 2015
@@ -20,6 +20,7 @@ package org.apache.poi.ss.formula.functi
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.MissingArgEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ValueEval;
@@ -63,10 +64,24 @@ public abstract class FinanceFunction im
switch (args.length) {
case 3:
return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], DEFAULT_ARG3, DEFAULT_ARG4);
- case 4:
- return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], args[3], DEFAULT_ARG4);
- case 5:
- return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], args[3], args[4]);
+ case 4: {
+ ValueEval arg3 = args[3];
+ if(arg3 == MissingArgEval.instance) {
+ arg3 = DEFAULT_ARG3;
+ }
+ return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], arg3, DEFAULT_ARG4);
+ }
+ case 5: {
+ ValueEval arg3 = args[3];
+ if(arg3 == MissingArgEval.instance) {
+ arg3 = DEFAULT_ARG3;
+ }
+ ValueEval arg4 = args[4];
+ if(arg4 == MissingArgEval.instance) {
+ arg4 = DEFAULT_ARG4;
+ }
+ return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], arg3, arg4);
+ }
}
return ErrorEval.VALUE_INVALID;
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java?rev=1706254&r1=1706253&r2=1706254&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java Thu Oct 1 14:05:28 2015
@@ -29,7 +29,12 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellValue;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
import org.junit.Test;
/**
@@ -176,4 +181,32 @@ public final class TestFormulaBugs {
double value) {
sheet.createRow(rowIx).createCell(colIx).setCellValue(value);
}
+
+ @Test
+ public void test55032() throws IOException {
+ Workbook wb = new HSSFWorkbook();
+ Sheet sheet = wb.createSheet("input");
+
+ Row row = sheet.createRow(0);
+ Cell cell = row.createCell(1);
+
+ checkFormulaValue(wb, cell, "PV(0.08/12, 20*12, 500, ,0)", -59777.14585);
+ checkFormulaValue(wb, cell, "PV(0.08/12, 20*12, 500, ,)", -59777.14585);
+ checkFormulaValue(wb, cell, "PV(0.08/12, 20*12, 500, 500,)", -59878.6315455);
+
+ checkFormulaValue(wb, cell, "FV(0.08/12, 20*12, 500, ,)", -294510.2078107270);
+ checkFormulaValue(wb, cell, "PMT(0.08/12, 20*12, 500, ,)", -4.1822003450);
+ checkFormulaValue(wb, cell, "NPER(0.08/12, 20*12, 500, ,)", -2.0758873434);
+
+ wb.close();
+ }
+
+ private void checkFormulaValue(Workbook wb, Cell cell, String formula, double expectedValue) {
+ cell.setCellFormula(formula);
+
+ FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
+ CellValue value = evaluator.evaluate(cell);
+
+ assertEquals(expectedValue, value.getNumberValue(), 0.0001);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org