Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#60724 - Partial implementation for SUBTOTAL() 'ignore hidden rows' variations 

The function still doesn't deal with auto-filtering, but it now handles variations that should skip hidden rows.

Taught the evaluation framework to know about hidden rows similar to what was already there for skipping subtotals within subtotal ranges.

Added unit test cases.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1855789 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Greg Woolsey 2019-03-18 19:09:11 +00:00
parent 19005a4e63
commit 82f9c29258
17 changed files with 195 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
View File

@ -46,6 +46,16 @@ final class HSSFEvaluationSheet implements EvaluationSheet {
return _hs.getLastRowNum();
}
/* (non-Javadoc)
* @see org.apache.poi.ss.formula.EvaluationSheet#isRowHidden(int)
* @since POI 4.0.2
*/
public boolean isRowHidden(int rowIndex) {
HSSFRow row = _hs.getRow(rowIndex);
if (row == null) return false;
return row.getZeroHeight();
}
@Override
public EvaluationCell getCell(int rowIndex, int columnIndex) {
HSSFRow row = _hs.getRow(rowIndex);

8
src/java/org/apache/poi/ss/formula/EvaluationSheet.java
View File

@ -48,4 +48,12 @@ public interface EvaluationSheet {
* @since POI 4.0.0
*/
public int getLastRowNum();
/**
* Used by SUBTOTAL and similar functions that have options to ignore hidden rows
* @param rowIndex
* @return true if the row is hidden, false if not
* @since POI 4.0.2
*/
public boolean isRowHidden(int rowIndex);
}

10
src/java/org/apache/poi/ss/formula/LazyAreaEval.java
View File

@ -94,4 +94,14 @@ final class LazyAreaEval extends AreaEvalBase {
SheetRefEvaluator _sre = _evaluator.getSheetEvaluator(_evaluator.getFirstSheetIndex());
return _sre.isSubTotal(getFirstRow() + rowIndex, getFirstColumn() + columnIndex);
}
/**
* @return whether the row at rowIndex is hidden
* @see org.apache.poi.ss.formula.eval.AreaEvalBase#isRowHidden(int)
*/
public boolean isRowHidden(int rowIndex) {
// delegate the query to the sheet evaluator which has access to internal ptgs
SheetRefEvaluator _sre = _evaluator.getSheetEvaluator(_evaluator.getFirstSheetIndex());
return _sre.isRowHidden(getFirstRow() + rowIndex);
}
}

12
src/java/org/apache/poi/ss/formula/LazyRefEval.java
View File

@ -47,11 +47,23 @@ public final class LazyRefEval extends RefEvalBase {
return new LazyAreaEval(area, _evaluator);
}
/**
* @return true if the cell is a subtotal
*/
public boolean isSubTotal() {
SheetRefEvaluator sheetEvaluator = _evaluator.getSheetEvaluator(getFirstSheetIndex());
return sheetEvaluator.isSubTotal(getRow(), getColumn());
}
/**
* @return whether the row at rowIndex is hidden
*/
public boolean isRowHidden() {
// delegate the query to the sheet evaluator which has access to internal ptgs
SheetRefEvaluator _sre = _evaluator.getSheetEvaluator(_evaluator.getFirstSheetIndex());
return _sre.isRowHidden(getRow());
}
public String toString() {
CellReference cr = new CellReference(getRow(), getColumn());
return getClass().getName() + "[" +

12
src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
View File

@ -56,6 +56,8 @@ final class SheetRefEvaluator {
}
/**
* @param rowIndex
* @param columnIndex
* @return whether cell at rowIndex and columnIndex is a subtotal
* @see org.apache.poi.ss.formula.functions.Subtotal
*/
@ -77,4 +79,14 @@ final class SheetRefEvaluator {
return subtotal;
}
/**
* Used by functions that calculate differently depending on row visibility, like some
* variations of SUBTOTAL()
* @see org.apache.poi.ss.formula.functions.Subtotal
* @param rowIndex
* @return true if the row is hidden
*/
public boolean isRowHidden(int rowIndex) {
return getSheet().isRowHidden(rowIndex);
}
}

9
src/java/org/apache/poi/ss/formula/TwoDEval.java
View File

@ -19,6 +19,7 @@ package org.apache.poi.ss.formula;
import org.apache.poi.ss.formula.eval.AreaEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.Subtotal;
/**
* Common interface of {@link AreaEval} and {@link org.apache.poi.ss.formula.eval.AreaEvalBase},
@ -65,4 +66,12 @@ public interface TwoDEval extends ValueEval {
*/
boolean isSubTotal(int rowIndex, int columnIndex);
/**
*
* @param rowIndex
* @return true if the row is hidden
* @see Subtotal
*/
boolean isRowHidden(int rowIndex);
}

7
src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
View File

@ -146,4 +146,11 @@ public abstract class AreaEvalBase implements AreaEval {
return false;
}
/**
* @return false by default, meaning all rows are calculated
* @see org.apache.poi.ss.formula.TwoDEval#isRowHidden(int)
*/
public boolean isRowHidden(int rowIndex) {
return false;
}
}

8
src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
View File

@ -62,6 +62,14 @@ final class ForkedEvaluationSheet implements EvaluationSheet {
return _masterSheet.getLastRowNum();
}
/* (non-Javadoc)
* @see org.apache.poi.ss.formula.EvaluationSheet#isRowHidden(int)
* @since POI 4.0.2
*/
public boolean isRowHidden(int rowIndex) {
return _masterSheet.isRowHidden(rowIndex);
}
@Override
public EvaluationCell getCell(int rowIndex, int columnIndex) {
RowColKey key = new RowColKey(rowIndex, columnIndex);

5
src/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
View File

@ -162,7 +162,7 @@ public abstract class AggregateFunction extends MultiOperandNumericFunction {
* @param func the function to wrap
* @return wrapped instance. The actual math is delegated to the argument function.
*/
/*package*/ static Function subtotalInstance(Function func) {
/*package*/ static Function subtotalInstance(Function func, boolean countHiddenRows) {
final AggregateFunction arg = (AggregateFunction)func;
return new AggregateFunction() {
@Override
@ -178,6 +178,9 @@ public abstract class AggregateFunction extends MultiOperandNumericFunction {
return false;
}
public boolean isHiddenRowCounted() {
return countHiddenRows;
}
};
}

25
src/java/org/apache/poi/ss/formula/functions/Count.java
View File

@ -86,6 +86,9 @@ public final class Count implements Function {
}
};
/**
* matches hidden rows but not subtotals
*/
private static final I_MatchPredicate subtotalPredicate = new I_MatchAreaPredicate() {
public boolean matches(ValueEval valueEval) {
return defaultPredicate.matches(valueEval);
@ -99,16 +102,34 @@ public final class Count implements Function {
}
};
/**
* matches nither hidden rows or subtotals
*/
private static final I_MatchPredicate subtotalVisibleOnlyPredicate = new I_MatchAreaPredicate() {
public boolean matches(ValueEval valueEval) {
return defaultPredicate.matches(valueEval);
}
/**
* don't count cells that are subtotals
*/
public boolean matches(TwoDEval areEval, int rowIndex, int columnIndex) {
return !areEval.isSubTotal(rowIndex, columnIndex) && !areEval.isRowHidden(rowIndex);
}
};
/**
* Create an instance of Count to use in {@link Subtotal}
* <p>
* If there are other subtotals within argument refs (or nested subtotals),
* these nested subtotals are ignored to avoid double counting.
* </p>
* @param includeHiddenRows true to include hidden rows in the aggregate, false to skip them
* @return function
*
* @see Subtotal
*/
public static Count subtotalInstance() {
return new Count(subtotalPredicate );
public static Count subtotalInstance(boolean includeHiddenRows) {
return new Count(includeHiddenRows ? subtotalPredicate : subtotalVisibleOnlyPredicate);
}
}

20
src/java/org/apache/poi/ss/formula/functions/Counta.java
View File

@ -80,7 +80,8 @@ public final class Counta implements Function {
return true;
}
};
private static final I_MatchPredicate subtotalPredicate = new I_MatchAreaPredicate() {
private static final I_MatchPredicate subtotalPredicate = new I_MatchAreaPredicate() {
public boolean matches(ValueEval valueEval) {
return defaultPredicate.matches(valueEval);
}
@ -93,8 +94,21 @@ public final class Counta implements Function {
}
};
public static Counta subtotalInstance() {
return new Counta(subtotalPredicate);
private static final I_MatchPredicate subtotalVisibleOnlyPredicate = new I_MatchAreaPredicate() {
public boolean matches(ValueEval valueEval) {
return defaultPredicate.matches(valueEval);
}
/**
* don't count cells in rows that are hidden or subtotal cells
*/
public boolean matches(TwoDEval areEval, int rowIndex, int columnIndex) {
return !areEval.isSubTotal(rowIndex, columnIndex) && ! areEval.isRowHidden(rowIndex);
}
};
public static Counta subtotalInstance(boolean includeHiddenRows) {
return new Counta(includeHiddenRows ? subtotalPredicate : subtotalVisibleOnlyPredicate);
}
}

9
src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
View File

@ -152,6 +152,14 @@ public abstract class MultiOperandNumericFunction implements Function {
return true;
}
/**
* @return true if values in hidden rows are counted
* @see Subtotal
*/
public boolean isHiddenRowCounted() {
return true;
}
/**
* Collects values from a single argument
*/
@ -165,6 +173,7 @@ public abstract class MultiOperandNumericFunction implements Function {
for (int rcIx = 0; rcIx < width; rcIx++) {
ValueEval ve = ae.getValue(sIx, rrIx, rcIx);
if (!isSubtotalCounted() && ae.isSubTotal(rrIx, rcIx)) continue;
if (!isHiddenRowCounted() && ae.isRowHidden(rrIx)) continue;
collectValue(ve, true, temp);
}
}

48
src/java/org/apache/poi/ss/formula/functions/Subtotal.java
View File

@ -56,7 +56,17 @@ import java.util.List;
* <tr align='center'><td>9</td><td>SUM</td></tr>
* <tr align='center'><td>10</td><td>VAR *</td></tr>
* <tr align='center'><td>11</td><td>VARP *</td></tr>
* <tr align='center'><td>101-111</td><td>*</td></tr>
* <tr align='center'><td>101</td><td>AVERAGE</td></tr>
* <tr align='center'><td>102</td><td>COUNT</td></tr>
* <tr align='center'><td>103</td><td>COUNTA</td></tr>
* <tr align='center'><td>104</td><td>MAX</td></tr>
* <tr align='center'><td>105</td><td>MIN</td></tr>
* <tr align='center'><td>106</td><td>PRODUCT</td></tr>
* <tr align='center'><td>107</td><td>STDEV</td></tr>
* <tr align='center'><td>108</td><td>STDEVP *</td></tr>
* <tr align='center'><td>109</td><td>SUM</td></tr>
* <tr align='center'><td>110</td><td>VAR *</td></tr>
* <tr align='center'><td>111</td><td>VARP *</td></tr>
* </table><br>
* * Not implemented in POI yet. Functions 101-111 are the same as functions 1-11 but with
* the option 'ignore hidden values'.
@ -68,20 +78,28 @@ public class Subtotal implements Function {
private static Function findFunction(int functionCode) throws EvaluationException {
switch (functionCode) {
case 1: return subtotalInstance(AggregateFunction.AVERAGE);
case 2: return Count.subtotalInstance();
case 3: return Counta.subtotalInstance();
case 4: return subtotalInstance(AggregateFunction.MAX);
case 5: return subtotalInstance(AggregateFunction.MIN);
case 6: return subtotalInstance(AggregateFunction.PRODUCT);
case 7: return subtotalInstance(AggregateFunction.STDEV);
case 1: return subtotalInstance(AggregateFunction.AVERAGE, true);
case 2: return Count.subtotalInstance(true);
case 3: return Counta.subtotalInstance(true);
case 4: return subtotalInstance(AggregateFunction.MAX, true);
case 5: return subtotalInstance(AggregateFunction.MIN, true);
case 6: return subtotalInstance(AggregateFunction.PRODUCT, true);
case 7: return subtotalInstance(AggregateFunction.STDEV, true);
case 8: throw new NotImplementedFunctionException("STDEVP");
case 9: return subtotalInstance(AggregateFunction.SUM);
case 9: return subtotalInstance(AggregateFunction.SUM, true);
case 10: throw new NotImplementedFunctionException("VAR");
case 11: throw new NotImplementedFunctionException("VARP");
}
if (functionCode > 100 && functionCode < 112) {
throw new NotImplementedException("SUBTOTAL - with 'exclude hidden values' option");
case 101: return subtotalInstance(AggregateFunction.AVERAGE, false);
case 102: return Count.subtotalInstance(false);
case 103: return Counta.subtotalInstance(false);
case 104: return subtotalInstance(AggregateFunction.MAX, false);
case 105: return subtotalInstance(AggregateFunction.MIN, false);
case 106: return subtotalInstance(AggregateFunction.PRODUCT, false);
case 107: return subtotalInstance(AggregateFunction.STDEV, false);
case 108: throw new NotImplementedFunctionException("STDEVP SUBTOTAL with 'exclude hidden values' option");
case 109: return subtotalInstance(AggregateFunction.SUM, false);
case 110: throw new NotImplementedFunctionException("VAR SUBTOTAL with 'exclude hidden values' option");
case 111: throw new NotImplementedFunctionException("VARP SUBTOTAL with 'exclude hidden values' option");
}
throw EvaluationException.invalidValue();
}
@ -93,9 +111,10 @@ public class Subtotal implements Function {
}
final Function innerFunc;
int functionCode = 0;
try {
ValueEval ve = OperandResolver.getSingleValue(args[0], srcRowIndex, srcColumnIndex);
int functionCode = OperandResolver.coerceValueToInt(ve);
functionCode = OperandResolver.coerceValueToInt(ve);
innerFunc = findFunction(functionCode);
} catch (EvaluationException e) {
return e.getErrorEval();
@ -116,6 +135,9 @@ public class Subtotal implements Function {
if(lazyRefEval.isSubTotal()) {
it.remove();
}
if (functionCode > 100 && lazyRefEval.isRowHidden()) {
it.remove();
}
}
}

10
src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
View File

@ -45,6 +45,16 @@ final class SXSSFEvaluationSheet implements EvaluationSheet {
return _xs.getLastRowNum();
}
/* (non-Javadoc)
* @see org.apache.poi.ss.formula.EvaluationSheet#isRowHidden(int)
* @since POI 4.0.2
*/
public boolean isRowHidden(int rowIndex) {
SXSSFRow row = _xs.getRow(rowIndex);
if (row == null) return false;
return row.getZeroHeight();
}
@Override
public EvaluationCell getCell(int rowIndex, int columnIndex) {
SXSSFRow row = _xs.getRow(rowIndex);

10
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
View File

@ -52,6 +52,16 @@ final class XSSFEvaluationSheet implements EvaluationSheet {
return _xs.getLastRowNum();
}
/* (non-Javadoc)
* @see org.apache.poi.ss.formula.EvaluationSheet#isRowHidden(int)
* @since POI 4.0.2
*/
public boolean isRowHidden(int rowIndex) {
final XSSFRow row = _xs.getRow(rowIndex);
if (row == null) return false;
return row.getZeroHeight();
}
/* (non-JavaDoc), inherit JavaDoc from EvaluationWorkbook
* @since POI 3.15 beta 3
*/

12
src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
View File

@ -376,6 +376,15 @@ public final class TestSubtotal {
confirmExpectedResult(evaluator, "SUBTOTAL(COUNT;B2:B8,C2:C8)", cellC2, 3.0);
confirmExpectedResult(evaluator, "SUBTOTAL(COUNTA;B2:B8,C2:C8)", cellC3, 5.0);
// test same functions ignoring hidden rows over a copy of the same data
cellC1 = sheet.getRow(11).getCell(3);
cellC2 = sheet.getRow(12).getCell(3);
cellC3 = sheet.getRow(13).getCell(3);
confirmExpectedResult(evaluator, "SUBTOTAL(SUM NO HIDDEN;B22:B28;C22:C28)", cellC1, 17.0);
confirmExpectedResult(evaluator, "SUBTOTAL(COUNT NO HIDDEN;B22:B28,C22:C28)", cellC2, 2.0);
confirmExpectedResult(evaluator, "SUBTOTAL(COUNTA NO HIDDEN;B22:B28,C22:C28)", cellC3, 4.0);
workbook.close();
}
@ -393,7 +402,6 @@ public final class TestSubtotal {
{ "SUBTOTAL(8,B2:B3)", NotImplementedException.class.getName() },
{ "SUBTOTAL(10,B2:B3)", NotImplementedException.class.getName() },
{ "SUBTOTAL(11,B2:B3)", NotImplementedException.class.getName() },
{ "SUBTOTAL(107,B2:B3)", NotImplementedException.class.getName() },
{ "SUBTOTAL(0,B2:B3)", null },
{ "SUBTOTAL(9)", FormulaParseException.class.getName() },
{ "SUBTOTAL()", FormulaParseException.class.getName() },
@ -404,7 +412,7 @@ public final class TestSubtotal {
try {
a3.setCellFormula(f[0]);
fe.evaluateAll();
assertEquals(FormulaError.VALUE.getCode(), a3.getErrorCellValue());
assertEquals(f[0], FormulaError.VALUE.getCode(), a3.getErrorCellValue());
} catch (Exception e) {
actualEx = e;
}

BIN
test-data/spreadsheet/SubtotalsNested.xls
View File

Binary file not shown.