p30928647
/
excelize
1
0
Fork 1
Code Issues Pull Requests Projects Releases 23 Wiki Activity

This closes #997, fix LOOKUP function to find nearest match (#1001)

This commit is contained in:
Stani 2021-08-21 05:58:15 +02:00 committed by GitHub
parent 935af2e356
commit f280c03345
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calc.go
View File

@ -7572,7 +7572,7 @@ func (fn *formulaFuncs) LOOKUP(argsList *list.List) formulaArg {
if arrayForm && len(lookupVector.Matrix) == 0 {
return newErrorFormulaArg(formulaErrorVALUE, "LOOKUP requires not empty range as second argument")
}
cols, matchIdx := lookupCol(lookupVector, 0), -1
cols, matchIdx, ok := lookupCol(lookupVector, 0), -1, false
for idx, col := range cols {
lhs := lookupValue
switch col.Type {
@ -7584,10 +7584,21 @@ func (fn *formulaFuncs) LOOKUP(argsList *list.List) formulaArg {
}
}
}
if compareFormulaArg(lhs, col, false, false) == criteriaEq {
compare := compareFormulaArg(lhs, col, false, false)
// Find exact match
if compare == criteriaEq {
matchIdx = idx
break
}
// Find nearest match if lookup value is more than or equal to the first value in lookup vector
if idx == 0 {
ok = compare == criteriaG
} else if ok && compare == criteriaL && matchIdx == -1 {
matchIdx = idx - 1
}
}
if ok && matchIdx == -1 {
matchIdx = len(cols) - 1
}
var column []formulaArg
if argsList.Len() == 3 {

2
calc_test.go
View File

@ -1151,6 +1151,8 @@ func TestCalcCellValue(t *testing.T) {
"=LOOKUP(F8,F8:F9,D8:D9)": "Feb",
"=LOOKUP(E3,E2:E5,F2:F5)": "22100",
"=LOOKUP(E3,E2:F5)": "22100",
"=LOOKUP(F3+1,F3:F4,F3:F4)": "22100",
"=LOOKUP(F4+1,F3:F4,F3:F4)": "53321",
"=LOOKUP(1,MUNIT(1))": "1",
"=LOOKUP(1,MUNIT(1),MUNIT(1))": "1",
// ROW