You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2014/07/25 17:46:05 UTC
svn commit: r1613453 - in /poi/trunk/src: java/org/apache/poi/ss/formula/
java/org/apache/poi/ss/formula/eval/
java/org/apache/poi/ss/formula/functions/
testcases/org/apache/poi/ss/formula/eval/
testcases/org/apache/poi/ss/formula/functions/
Author: nick
Date: Fri Jul 25 15:46:05 2014
New Revision: 1613453
URL: http://svn.apache.org/r1613453
Log:
Update the RefEval method signature to cope with multi-sheet references, and have appropriate functions take advantage of this. For bug #55906
Added:
poi/trunk/src/java/org/apache/poi/ss/formula/SheetRange.java
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/LazyRefEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/CountUtils.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countblank.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countif.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/EDate.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Mode.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/T.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/LazyRefEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/LazyRefEval.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/LazyRefEval.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/LazyRefEval.java Fri Jul 25 15:46:05 2014
@@ -26,22 +26,21 @@ import org.apache.poi.ss.util.CellRefere
/**
* Provides Lazy Evaluation to a 3D Reference
- *
- * TODO Provide access to multiple sheets where present
*/
final class LazyRefEval extends RefEvalBase {
private final SheetRangeEvaluator _evaluator;
public LazyRefEval(int rowIndex, int columnIndex, SheetRangeEvaluator sre) {
- super(rowIndex, columnIndex);
- if (sre == null) {
- throw new IllegalArgumentException("sre must not be null");
- }
+ super(sre, rowIndex, columnIndex);
_evaluator = sre;
}
- public ValueEval getInnerValueEval() {
- return _evaluator.getEvalForCell(_evaluator.getFirstSheetIndex(), getRow(), getColumn());
+ @Deprecated
+ public ValueEval getInnerValueEval() {
+ return getInnerValueEval(_evaluator.getFirstSheetIndex());
+ }
+ public ValueEval getInnerValueEval(int sheetIndex) {
+ return _evaluator.getEvalForCell(sheetIndex, getRow(), getColumn());
}
public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
Added: poi/trunk/src/java/org/apache/poi/ss/formula/SheetRange.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/SheetRange.java?rev=1613453&view=auto
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/SheetRange.java (added)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/SheetRange.java Fri Jul 25 15:46:05 2014
@@ -0,0 +1,23 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+package org.apache.poi.ss.formula;
+
+public interface SheetRange {
+ public int getFirstSheetIndex();
+ public int getLastSheetIndex();
+}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java Fri Jul 25 15:46:05 2014
@@ -22,7 +22,7 @@ import org.apache.poi.ss.formula.eval.Va
/**
* Evaluator for returning cells or sheets for a range of sheets
*/
-final class SheetRangeEvaluator {
+final class SheetRangeEvaluator implements SheetRange {
private final int _firstSheetIndex;
private final int _lastSheetIndex;
private SheetRefEvaluator[] _sheetEvaluators;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java Fri Jul 25 15:46:05 2014
@@ -59,7 +59,7 @@ public final class OperandResolver {
throws EvaluationException {
ValueEval result;
if (arg instanceof RefEval) {
- result = ((RefEval) arg).getInnerValueEval();
+ result = chooseSingleElementFromRef((RefEval) arg);
} else if (arg instanceof AreaEval) {
result = chooseSingleElementFromArea((AreaEval) arg, srcCellRow, srcCellCol);
} else {
@@ -174,6 +174,10 @@ public final class OperandResolver {
}
return ae.getAbsoluteValue(ae.getFirstRow(), srcCellCol);
}
+
+ private static ValueEval chooseSingleElementFromRef(RefEval ref) {
+ return ref.getInnerValueEval( ref.getFirstSheetIndex() );
+ }
/**
* Applies some conversion rules if the supplied value is not already an integer.<br/>
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java Fri Jul 25 15:46:05 2014
@@ -17,9 +17,9 @@
package org.apache.poi.ss.formula.eval;
+import org.apache.poi.ss.formula.SheetRange;
+
/**
- * @author Amol S Deshmukh < amolweb at ya hoo dot com >
- *
* RefEval is the super interface for Ref2D and Ref3DEval. Basically a RefEval
* impl should contain reference to the original ReferencePtg or Ref3DPtg as
* well as the final "value" resulting from the evaluation of the cell
@@ -27,12 +27,11 @@ package org.apache.poi.ss.formula.eval;
* value object should be of type NumberEval; if cell type is CELL_TYPE_STRING,
* contained value object should be of type StringEval
*/
-public interface RefEval extends ValueEval {
-
+public interface RefEval extends ValueEval, SheetRange {
/**
- * @return the evaluated value of the cell referred to by this RefEval.
+ * @return the evaluated value of the cell referred to by this RefEval on the given sheet
*/
- ValueEval getInnerValueEval();
+ ValueEval getInnerValueEval(int sheetIndex);
/**
* returns the zero based column index.
@@ -43,6 +42,22 @@ public interface RefEval extends ValueEv
* returns the zero based row index.
*/
int getRow();
+
+ /**
+ * returns the first sheet index this applies to
+ */
+ int getFirstSheetIndex();
+
+ /**
+ * returns the last sheet index this applies to, which
+ * will be the same as the first for a 2D and many 3D references
+ */
+ int getLastSheetIndex();
+
+ /**
+ * returns the number of sheets this applies to
+ */
+ int getNumberOfSheets();
/**
* Creates an {@link AreaEval} offset by a relative amount from this RefEval
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java Fri Jul 25 15:46:05 2014
@@ -17,21 +17,46 @@
package org.apache.poi.ss.formula.eval;
+import org.apache.poi.ss.formula.SheetRange;
+
/**
* Common base class for implementors of {@link RefEval}
- *
- * @author Josh Micich
*/
public abstract class RefEvalBase implements RefEval {
-
+ private final int _firstSheetIndex;
+ private final int _lastSheetIndex;
private final int _rowIndex;
private final int _columnIndex;
- protected RefEvalBase(int rowIndex, int columnIndex) {
+ protected RefEvalBase(SheetRange sheetRange, int rowIndex, int columnIndex) {
+ if (sheetRange == null) {
+ throw new IllegalArgumentException("sheetRange must not be null");
+ }
+ _firstSheetIndex = sheetRange.getFirstSheetIndex();
+ _lastSheetIndex = sheetRange.getLastSheetIndex();
+ _rowIndex = rowIndex;
+ _columnIndex = columnIndex;
+ }
+ protected RefEvalBase(int firstSheetIndex, int lastSheetIndex, int rowIndex, int columnIndex) {
+ _firstSheetIndex = firstSheetIndex;
+ _lastSheetIndex = lastSheetIndex;
_rowIndex = rowIndex;
_columnIndex = columnIndex;
}
- public final int getRow() {
+ protected RefEvalBase(int onlySheetIndex, int rowIndex, int columnIndex) {
+ this(onlySheetIndex, onlySheetIndex, rowIndex, columnIndex);
+ }
+
+ public int getNumberOfSheets() {
+ return _lastSheetIndex-_firstSheetIndex+1;
+ }
+ public int getFirstSheetIndex() {
+ return _firstSheetIndex;
+ }
+ public int getLastSheetIndex() {
+ return _lastSheetIndex;
+ }
+ public final int getRow() {
return _rowIndex;
}
public final int getColumn() {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java Fri Jul 25 15:46:05 2014
@@ -17,6 +17,7 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
@@ -24,7 +25,6 @@ import org.apache.poi.ss.formula.eval.Mi
import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.ss.formula.eval.RefEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
/**
* Here are the general rules concerning Boolean functions:
@@ -61,6 +61,7 @@ public abstract class BooleanFunction im
* Note: no short-circuit boolean loop exit because any ErrorEvals will override the result
*/
for (int i=0, iSize=args.length; i<iSize; i++) {
+ Boolean tempVe;
ValueEval arg = args[i];
if (arg instanceof TwoDEval) {
TwoDEval ae = (TwoDEval) arg;
@@ -69,7 +70,7 @@ public abstract class BooleanFunction im
for (int rrIx=0; rrIx<height; rrIx++) {
for (int rcIx=0; rcIx<width; rcIx++) {
ValueEval ve = ae.getValue(rrIx, rcIx);
- Boolean tempVe = OperandResolver.coerceValueToBoolean(ve, true);
+ tempVe = OperandResolver.coerceValueToBoolean(ve, true);
if (tempVe != null) {
result = partialEvaluate(result, tempVe.booleanValue());
atleastOneNonBlank = true;
@@ -78,17 +79,25 @@ public abstract class BooleanFunction im
}
continue;
}
- Boolean tempVe;
- if (arg instanceof RefEval) {
- ValueEval ve = ((RefEval) arg).getInnerValueEval();
- tempVe = OperandResolver.coerceValueToBoolean(ve, true);
- } else if (arg == MissingArgEval.instance) {
+ if (arg instanceof RefEval) {
+ RefEval re = (RefEval) arg;
+ for (int sIx = re.getFirstSheetIndex(); sIx <= re.getLastSheetIndex(); sIx++) {
+ ValueEval ve = re.getInnerValueEval(sIx);
+ tempVe = OperandResolver.coerceValueToBoolean(ve, true);
+ if (tempVe != null) {
+ result = partialEvaluate(result, tempVe.booleanValue());
+ atleastOneNonBlank = true;
+ }
+ }
+ continue;
+ }
+
+ if (arg == MissingArgEval.instance) {
tempVe = null; // you can leave out parameters, they are simply ignored
} else {
tempVe = OperandResolver.coerceValueToBoolean(arg, false);
}
-
if (tempVe != null) {
result = partialEvaluate(result, tempVe.booleanValue());
atleastOneNonBlank = true;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/CountUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/CountUtils.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/CountUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/CountUtils.java Fri Jul 25 15:46:05 2014
@@ -17,9 +17,9 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.RefEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
/**
* Common logic for COUNT, COUNTA and COUNTIF
@@ -67,13 +67,18 @@ final class CountUtils {
return result;
}
/**
- * @return 1 if the evaluated cell matches the specified criteria
+ * @return the number of evaluated cells in the range that match the specified criteria
*/
- public static int countMatchingCell(RefEval refEval, I_MatchPredicate criteriaPredicate) {
- if(criteriaPredicate.matches(refEval.getInnerValueEval())) {
- return 1;
- }
- return 0;
+ public static int countMatchingCellsInRef(RefEval refEval, I_MatchPredicate criteriaPredicate) {
+ int result = 0;
+
+ for (int sIx = refEval.getFirstSheetIndex(); sIx <= refEval.getLastSheetIndex(); sIx++) {
+ ValueEval ve = refEval.getInnerValueEval(sIx);
+ if(criteriaPredicate.matches(ve)) {
+ result++;
+ }
+ }
+ return result;
}
public static int countArg(ValueEval eval, I_MatchPredicate criteriaPredicate) {
if (eval == null) {
@@ -83,7 +88,7 @@ final class CountUtils {
return countMatchingCellsInArea((TwoDEval) eval, criteriaPredicate);
}
if (eval instanceof RefEval) {
- return CountUtils.countMatchingCell((RefEval) eval, criteriaPredicate);
+ return CountUtils.countMatchingCellsInRef((RefEval) eval, criteriaPredicate);
}
return criteriaPredicate.matches(eval) ? 1 : 0;
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countblank.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countblank.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countblank.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countblank.java Fri Jul 25 15:46:05 2014
@@ -17,12 +17,12 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.RefEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-import org.apache.poi.ss.formula.TwoDEval;
/**
* Implementation for the function COUNTBLANK
@@ -41,7 +41,7 @@ public final class Countblank extends Fi
double result;
if (arg0 instanceof RefEval) {
- result = CountUtils.countMatchingCell((RefEval) arg0, predicate);
+ result = CountUtils.countMatchingCellsInRef((RefEval) arg0, predicate);
} else if (arg0 instanceof TwoDEval) {
result = CountUtils.countMatchingCellsInArea((TwoDEval) arg0, predicate);
} else {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countif.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countif.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countif.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Countif.java Fri Jul 25 15:46:05 2014
@@ -19,6 +19,7 @@ package org.apache.poi.ss.formula.functi
import java.util.regex.Pattern;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
@@ -29,7 +30,6 @@ import org.apache.poi.ss.formula.eval.Re
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
-import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.usermodel.ErrorConstants;
/**
@@ -444,7 +444,7 @@ public final class Countif extends Fixed
private double countMatchingCellsInArea(ValueEval rangeArg, I_MatchPredicate criteriaPredicate) {
if (rangeArg instanceof RefEval) {
- return CountUtils.countMatchingCell((RefEval) rangeArg, criteriaPredicate);
+ return CountUtils.countMatchingCellsInRef((RefEval) rangeArg, criteriaPredicate);
} else if (rangeArg instanceof TwoDEval) {
return CountUtils.countMatchingCellsInArea((TwoDEval) rangeArg, criteriaPredicate);
} else {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/EDate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/EDate.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/EDate.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/EDate.java Fri Jul 25 15:46:05 2014
@@ -17,13 +17,18 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.*;
-import org.apache.poi.ss.usermodel.DateUtil;
-
import java.util.Calendar;
import java.util.Date;
+import org.apache.poi.ss.formula.OperationEvaluationContext;
+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.RefEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
+import org.apache.poi.ss.usermodel.DateUtil;
+
/**
* Implementation for Excel EDATE () function.
*/
@@ -56,7 +61,13 @@ public class EDate implements FreeRefFun
return 0;
}
if (arg instanceof RefEval) {
- ValueEval innerValueEval = ((RefEval) arg).getInnerValueEval();
+ RefEval refEval = (RefEval)arg;
+ if (refEval.getNumberOfSheets() > 1) {
+ // Multi-Sheet references are not supported
+ throw new EvaluationException(ErrorEval.VALUE_INVALID);
+ }
+
+ ValueEval innerValueEval = refEval.getInnerValueEval(refEval.getFirstSheetIndex());
if(innerValueEval instanceof NumberEval) {
return ((NumberEval) innerValueEval).getNumberValue();
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java Fri Jul 25 15:46:05 2014
@@ -76,13 +76,16 @@ public final class LinearRegressionFunct
private static final class RefValueArray extends ValueArray {
private final RefEval _ref;
+ private final int _width;
public RefValueArray(RefEval ref) {
- super(1);
+ super(ref.getNumberOfSheets());
_ref = ref;
+ _width = ref.getNumberOfSheets();
}
protected ValueEval getItemInternal(int index) {
- return _ref.getInnerValueEval();
+ int sIx = (index % _width) + _ref.getFirstSheetIndex();
+ return _ref.getInnerValueEval(sIx);
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java Fri Jul 25 15:46:05 2014
@@ -17,6 +17,10 @@
package org.apache.poi.ss.formula.functions;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
@@ -27,10 +31,6 @@ import org.apache.poi.ss.formula.eval.Op
import org.apache.poi.ss.formula.eval.RefEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* Common functionality used by VLOOKUP, HLOOKUP, LOOKUP and MATCH
@@ -104,6 +104,28 @@ final class LookupUtils {
}
}
+ private static final class SheetVector implements ValueVector {
+ private final RefEval _re;
+ private final int _size;
+
+ public SheetVector(RefEval re) {
+ _size = re.getNumberOfSheets();
+ _re = re;
+ }
+
+ public ValueEval getItem(int index) {
+ if(index >= _size) {
+ throw new ArrayIndexOutOfBoundsException("Specified index (" + index
+ + ") is outside the allowed range (0.." + (_size-1) + ")");
+ }
+ int sheetIndex = _re.getFirstSheetIndex() + index;
+ return _re.getInnerValueEval(sheetIndex);
+ }
+ public int getSize() {
+ return _size;
+ }
+ }
+
public static ValueVector createRowVector(TwoDEval tableArray, int relativeRowIndex) {
return new RowVector(tableArray, relativeRowIndex);
}
@@ -122,6 +144,10 @@ final class LookupUtils {
}
return null;
}
+
+ public static ValueVector createVector(RefEval re) {
+ return new SheetVector(re);
+ }
/**
* Enumeration to support <b>4</b> valued comparison results.<p/>
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java Fri Jul 25 15:46:05 2014
@@ -17,6 +17,7 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.NumberEval;
@@ -28,7 +29,6 @@ import org.apache.poi.ss.formula.eval.Va
import org.apache.poi.ss.formula.functions.LookupUtils.CompareResult;
import org.apache.poi.ss.formula.functions.LookupUtils.LookupValueComparer;
import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
-import org.apache.poi.ss.formula.TwoDEval;
/**
* Implementation for the MATCH() Excel function.<p/>
@@ -125,7 +125,11 @@ public final class Match extends Var2or3
private static ValueVector evaluateLookupRange(ValueEval eval) throws EvaluationException {
if (eval instanceof RefEval) {
RefEval re = (RefEval) eval;
- return new SingleValueVector(re.getInnerValueEval());
+ if (re.getNumberOfSheets() == 1) {
+ return new SingleValueVector(re.getInnerValueEval(re.getFirstSheetIndex()));
+ } else {
+ return LookupUtils.createVector(re);
+ }
}
if (eval instanceof TwoDEval) {
ValueVector result = LookupUtils.createVector((TwoDEval)eval);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Mode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Mode.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Mode.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Mode.java Fri Jul 25 15:46:05 2014
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
@@ -29,7 +30,6 @@ import org.apache.poi.ss.formula.eval.Nu
import org.apache.poi.ss.formula.eval.RefEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
@@ -106,7 +106,9 @@ public final class Mode implements Funct
}
if (arg instanceof RefEval) {
RefEval re = (RefEval) arg;
- collectValue(re.getInnerValueEval(), temp, true);
+ for (int sIx = re.getFirstSheetIndex(); sIx <= re.getLastSheetIndex(); sIx++) {
+ collectValue(re.getInnerValueEval(sIx), temp, true);
+ }
return;
}
collectValue(arg, temp, true);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java Fri Jul 25 15:46:05 2014
@@ -17,6 +17,7 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
@@ -27,7 +28,6 @@ import org.apache.poi.ss.formula.eval.Op
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 org.apache.poi.ss.formula.TwoDEval;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
@@ -157,7 +157,9 @@ public abstract class MultiOperandNumeri
}
if (operand instanceof RefEval) {
RefEval re = (RefEval) operand;
- collectValue(re.getInnerValueEval(), true, temp);
+ for (int sIx = re.getFirstSheetIndex(); sIx <= re.getLastSheetIndex(); sIx++) {
+ collectValue(re.getInnerValueEval(sIx), true, temp);
+ }
return;
}
collectValue(operand, false, temp);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java Fri Jul 25 15:46:05 2014
@@ -17,6 +17,7 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.AreaEval;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
@@ -26,7 +27,6 @@ import org.apache.poi.ss.formula.eval.Nu
import org.apache.poi.ss.formula.eval.RefEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
/**
@@ -99,7 +99,10 @@ public final class Sumproduct implements
ValueEval eval;
if (arg instanceof RefEval) {
RefEval re = (RefEval) arg;
- eval = re.getInnerValueEval();
+ if (re.getNumberOfSheets() > 1) {
+ throw new EvaluationException(ErrorEval.VALUE_INVALID);
+ }
+ eval = re.getInnerValueEval(re.getFirstSheetIndex());
} else {
eval = arg;
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/T.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/T.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/T.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/T.java Fri Jul 25 15:46:05 2014
@@ -35,7 +35,9 @@ public final class T extends Fixed1ArgFu
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) {
ValueEval arg = arg0;
if (arg instanceof RefEval) {
- arg = ((RefEval) arg).getInnerValueEval();
+ // always use the first sheet
+ RefEval re = (RefEval)arg;
+ arg = re.getInnerValueEval(re.getFirstSheetIndex());
} else if (arg instanceof AreaEval) {
// when the arg is an area, choose the top left cell
arg = ((AreaEval) arg).getRelativeValue(0, 0);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java Fri Jul 25 15:46:05 2014
@@ -17,13 +17,13 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.TwoDEval;
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.RefEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.LookupUtils.ValueVector;
-import org.apache.poi.ss.formula.TwoDEval;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
@@ -61,12 +61,16 @@ public abstract class XYNumericFunction
private static final class RefValueArray extends ValueArray {
private final RefEval _ref;
+ private final int _width;
+
public RefValueArray(RefEval ref) {
- super(1);
+ super(ref.getNumberOfSheets());
_ref = ref;
+ _width = ref.getNumberOfSheets();
}
protected ValueEval getItemInternal(int index) {
- return _ref.getInnerValueEval();
+ int sIx = (index % _width) + _ref.getFirstSheetIndex();
+ return _ref.getInnerValueEval(sIx);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java Fri Jul 25 15:46:05 2014
@@ -20,8 +20,6 @@ package org.apache.poi.ss.formula.eval;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import org.apache.poi.ss.formula.ptg.AreaI;
-import org.apache.poi.ss.formula.ptg.AreaI.OffsetArea;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -29,6 +27,8 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
import org.apache.poi.ss.formula.TwoDEval;
+import org.apache.poi.ss.formula.ptg.AreaI;
+import org.apache.poi.ss.formula.ptg.AreaI.OffsetArea;
import org.apache.poi.ss.usermodel.CellValue;
/**
@@ -71,11 +71,10 @@ public final class TestRangeEval extends
}
private static final class MockRefEval extends RefEvalBase {
-
public MockRefEval(int rowIndex, int columnIndex) {
- super(rowIndex, columnIndex);
+ super(-1, -1, rowIndex, columnIndex);
}
- public ValueEval getInnerValueEval() {
+ public ValueEval getInnerValueEval(int sheetIndex) {
throw new RuntimeException("not expected to be called during this test");
}
public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx,
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java Fri Jul 25 15:46:05 2014
@@ -17,17 +17,17 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.ss.formula.ptg.AreaI;
-import org.apache.poi.ss.formula.ptg.AreaPtg;
-import org.apache.poi.ss.formula.ptg.Ref3DPtg;
-import org.apache.poi.ss.formula.ptg.RefPtg;
+import org.apache.poi.ss.formula.TwoDEval;
import org.apache.poi.ss.formula.eval.AreaEval;
import org.apache.poi.ss.formula.eval.AreaEvalBase;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.RefEval;
import org.apache.poi.ss.formula.eval.RefEvalBase;
import org.apache.poi.ss.formula.eval.ValueEval;
-import org.apache.poi.ss.formula.TwoDEval;
+import org.apache.poi.ss.formula.ptg.AreaI;
+import org.apache.poi.ss.formula.ptg.AreaPtg;
+import org.apache.poi.ss.formula.ptg.Ref3DPtg;
+import org.apache.poi.ss.formula.ptg.RefPtg;
/**
* Test helper class for creating mock <code>Eval</code> objects
@@ -157,14 +157,14 @@ public final class EvalFactory {
private static final class MockRefEval extends RefEvalBase {
private final ValueEval _value;
public MockRefEval(RefPtg ptg, ValueEval value) {
- super(ptg.getRow(), ptg.getColumn());
+ super(-1, -1, ptg.getRow(), ptg.getColumn());
_value = value;
}
public MockRefEval(Ref3DPtg ptg, ValueEval value) {
- super(ptg.getRow(), ptg.getColumn());
+ super(-1, -1, ptg.getRow(), ptg.getColumn());
_value = value;
}
- public ValueEval getInnerValueEval() {
+ public ValueEval getInnerValueEval(int sheetIndex) {
return _value;
}
public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java?rev=1613453&r1=1613452&r2=1613453&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java Fri Jul 25 15:46:05 2014
@@ -46,14 +46,23 @@ public class TestEDate extends TestCase{
throw new UnsupportedOperationException();
}
+ public ValueEval getInnerValueEval(int sheetIndex) {
+ return value;
+ }
+
+ public int getNumberOfSheets() {
+ return 1;
+ }
+ public int getFirstSheetIndex() {
+ return 0;
+ }
+ public int getLastSheetIndex() {
+ return 0;
+ }
+
public int getRow() {
throw new UnsupportedOperationException();
}
-
- public ValueEval getInnerValueEval() {
- return value;
- }
-
public int getColumn() {
throw new UnsupportedOperationException();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org