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

ref #65, new formula function: DAVERAGE

This commit is contained in:
xuri 2022-07-01 00:43:27 +08:00
parent eee6607e47
commit dd6c3905e0
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
3 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ test/excelize-*
*.out *.out
*.test *.test
.idea .idea
.DS_Store

85
calc.go
View File

@ -418,6 +418,7 @@ type formulaFuncs struct {
// DATE // DATE
// DATEDIF // DATEDIF
// DATEVALUE // DATEVALUE
// DAVERAGE
// DAY // DAY
// DAYS // DAYS
// DAYS360 // DAYS360
@ -6008,7 +6009,7 @@ func (fn *formulaFuncs) AVERAGE(argsList *list.List) formulaArg {
} }
count, sum := fn.countSum(false, args) count, sum := fn.countSum(false, args)
if count == 0 { if count == 0 {
return newErrorFormulaArg(formulaErrorDIV, "AVERAGE divide by zero") return newErrorFormulaArg(formulaErrorDIV, formulaErrorDIV)
} }
return newNumberFormulaArg(sum / count) return newNumberFormulaArg(sum / count)
} }
@ -6025,7 +6026,7 @@ func (fn *formulaFuncs) AVERAGEA(argsList *list.List) formulaArg {
} }
count, sum := fn.countSum(true, args) count, sum := fn.countSum(true, args)
if count == 0 { if count == 0 {
return newErrorFormulaArg(formulaErrorDIV, "AVERAGEA divide by zero") return newErrorFormulaArg(formulaErrorDIV, formulaErrorDIV)
} }
return newNumberFormulaArg(sum / count) return newNumberFormulaArg(sum / count)
} }
@ -6075,7 +6076,7 @@ func (fn *formulaFuncs) AVERAGEIF(argsList *list.List) formulaArg {
} }
count, sum := fn.countSum(false, args) count, sum := fn.countSum(false, args)
if count == 0 { if count == 0 {
return newErrorFormulaArg(formulaErrorDIV, "AVERAGEIF divide by zero") return newErrorFormulaArg(formulaErrorDIV, formulaErrorDIV)
} }
return newNumberFormulaArg(sum / count) return newNumberFormulaArg(sum / count)
} }
@ -18068,6 +18069,42 @@ func (db *calcDatabase) next() bool {
return matched return matched
} }
// database is an implementation of the formula functions DAVERAGE, DMAX and DMIN.
func (fn *formulaFuncs) database(name string, argsList *list.List) formulaArg {
if argsList.Len() != 3 {
return newErrorFormulaArg(formulaErrorVALUE, fmt.Sprintf("%s requires 3 arguments", name))
}
database := argsList.Front().Value.(formulaArg)
field := argsList.Front().Next().Value.(formulaArg)
criteria := argsList.Back().Value.(formulaArg)
db := newCalcDatabase(database, field, criteria)
if db == nil {
return newErrorFormulaArg(formulaErrorVALUE, formulaErrorVALUE)
}
args := list.New()
for db.next() {
args.PushBack(db.value())
}
switch name {
case "DMAX":
return fn.MAX(args)
case "DMIN":
return fn.MIN(args)
default:
return fn.AVERAGE(args)
}
}
// DAVERAGE function calculates the average (statistical mean) of values in a
// field (column) in a database for selected records, that satisfy
// user-specified criteria. The syntax of the Excel Daverage function is:
//
// DAVERAGE(database,field,criteria)
//
func (fn *formulaFuncs) DAVERAGE(argsList *list.List) formulaArg {
return fn.database("DAVERAGE", argsList)
}
// dcount is an implementation of the formula functions DCOUNT and DCOUNTA. // dcount is an implementation of the formula functions DCOUNT and DCOUNTA.
func (fn *formulaFuncs) dcount(name string, argsList *list.List) formulaArg { func (fn *formulaFuncs) dcount(name string, argsList *list.List) formulaArg {
if argsList.Len() < 2 { if argsList.Len() < 2 {
@ -18081,23 +18118,19 @@ func (fn *formulaFuncs) dcount(name string, argsList *list.List) formulaArg {
if argsList.Len() > 2 { if argsList.Len() > 2 {
field = argsList.Front().Next().Value.(formulaArg) field = argsList.Front().Next().Value.(formulaArg)
} }
var count float64
database := argsList.Front().Value.(formulaArg) database := argsList.Front().Value.(formulaArg)
db := newCalcDatabase(database, field, criteria) db := newCalcDatabase(database, field, criteria)
if db == nil { if db == nil {
return newErrorFormulaArg(formulaErrorVALUE, formulaErrorVALUE) return newErrorFormulaArg(formulaErrorVALUE, formulaErrorVALUE)
} }
args := list.New()
for db.next() { for db.next() {
cell := db.value() args.PushBack(db.value())
if cell.Value() == "" {
continue
}
if num := cell.ToNumber(); name == "DCOUNT" && num.Type != ArgNumber {
continue
}
count++
} }
return newNumberFormulaArg(count) if name == "DCOUNT" {
return fn.COUNT(args)
}
return fn.COUNTA(args)
} }
// DCOUNT function returns the number of cells containing numeric values, in a // DCOUNT function returns the number of cells containing numeric values, in a
@ -18122,28 +18155,6 @@ func (fn *formulaFuncs) DCOUNTA(argsList *list.List) formulaArg {
return fn.dcount("DCOUNTA", argsList) return fn.dcount("DCOUNTA", argsList)
} }
// dmaxmin is an implementation of the formula functions DMAX and DMIN.
func (fn *formulaFuncs) dmaxmin(name string, argsList *list.List) formulaArg {
if argsList.Len() != 3 {
return newErrorFormulaArg(formulaErrorVALUE, fmt.Sprintf("%s requires 3 arguments", name))
}
database := argsList.Front().Value.(formulaArg)
field := argsList.Front().Next().Value.(formulaArg)
criteria := argsList.Back().Value.(formulaArg)
db := newCalcDatabase(database, field, criteria)
if db == nil {
return newErrorFormulaArg(formulaErrorVALUE, formulaErrorVALUE)
}
args := list.New()
for db.next() {
args.PushBack(db.value())
}
if name == "DMAX" {
return fn.MAX(args)
}
return fn.MIN(args)
}
// DMAX function finds the maximum value in a field (column) in a database for // DMAX function finds the maximum value in a field (column) in a database for
// selected records only. The records to be included in the calculation are // selected records only. The records to be included in the calculation are
// defined by a set of one or more user-specified criteria. The syntax of the // defined by a set of one or more user-specified criteria. The syntax of the
@ -18152,7 +18163,7 @@ func (fn *formulaFuncs) dmaxmin(name string, argsList *list.List) formulaArg {
// DMAX(database,field,criteria) // DMAX(database,field,criteria)
// //
func (fn *formulaFuncs) DMAX(argsList *list.List) formulaArg { func (fn *formulaFuncs) DMAX(argsList *list.List) formulaArg {
return fn.dmaxmin("DMAX", argsList) return fn.database("DMAX", argsList)
} }
// DMIN function finds the minimum value in a field (column) in a database for // DMIN function finds the minimum value in a field (column) in a database for
@ -18163,5 +18174,5 @@ func (fn *formulaFuncs) DMAX(argsList *list.List) formulaArg {
// DMIN(database,field,criteria) // DMIN(database,field,criteria)
// //
func (fn *formulaFuncs) DMIN(argsList *list.List) formulaArg { func (fn *formulaFuncs) DMIN(argsList *list.List) formulaArg {
return fn.dmaxmin("DMIN", argsList) return fn.database("DMIN", argsList)
} }

44
calc_test.go
View File

@ -2655,14 +2655,14 @@ func TestCalcCellValue(t *testing.T) {
"=AVEDEV(\"\")": "#VALUE!", "=AVEDEV(\"\")": "#VALUE!",
"=AVEDEV(1,\"\")": "#VALUE!", "=AVEDEV(1,\"\")": "#VALUE!",
// AVERAGE // AVERAGE
"=AVERAGE(H1)": "AVERAGE divide by zero", "=AVERAGE(H1)": "#DIV/0!",
// AVERAGEA // AVERAGEA
"=AVERAGEA(H1)": "AVERAGEA divide by zero", "=AVERAGEA(H1)": "#DIV/0!",
// AVERAGEIF // AVERAGEIF
"=AVERAGEIF()": "AVERAGEIF requires at least 2 arguments", "=AVERAGEIF()": "AVERAGEIF requires at least 2 arguments",
"=AVERAGEIF(H1,\"\")": "AVERAGEIF divide by zero", "=AVERAGEIF(H1,\"\")": "#DIV/0!",
"=AVERAGEIF(D1:D3,\"Month\",D1:D3)": "AVERAGEIF divide by zero", "=AVERAGEIF(D1:D3,\"Month\",D1:D3)": "#DIV/0!",
"=AVERAGEIF(C1:C3,\"Month\",D1:D3)": "AVERAGEIF divide by zero", "=AVERAGEIF(C1:C3,\"Month\",D1:D3)": "#DIV/0!",
// BETA.DIST // BETA.DIST
"=BETA.DIST()": "BETA.DIST requires at least 4 arguments", "=BETA.DIST()": "BETA.DIST requires at least 4 arguments",
"=BETA.DIST(0.4,4,5,TRUE,0,1,0)": "BETA.DIST requires at most 6 arguments", "=BETA.DIST(0.4,4,5,TRUE,0,1,0)": "BETA.DIST requires at most 6 arguments",
@ -4603,7 +4603,7 @@ func TestCalcCOVAR(t *testing.T) {
} }
} }
func TestCalcDCOUNTandDCOUNTAandDMAXandDMIN(t *testing.T) { func TestCalcDatabase(t *testing.T) {
cellData := [][]interface{}{ cellData := [][]interface{}{
{"Tree", "Height", "Age", "Yield", "Profit", "Height"}, {"Tree", "Height", "Age", "Yield", "Profit", "Height"},
{"=Apple", ">1000%", nil, nil, nil, "<16"}, {"=Apple", ">1000%", nil, nil, nil, "<16"},
@ -4621,20 +4621,21 @@ func TestCalcDCOUNTandDCOUNTAandDMAXandDMIN(t *testing.T) {
assert.NoError(t, f.SetCellFormula("Sheet1", "A3", "=\"=Pear\"")) assert.NoError(t, f.SetCellFormula("Sheet1", "A3", "=\"=Pear\""))
assert.NoError(t, f.SetCellFormula("Sheet1", "C8", "=NA()")) assert.NoError(t, f.SetCellFormula("Sheet1", "C8", "=NA()"))
formulaList := map[string]string{ formulaList := map[string]string{
"=DCOUNT(A4:E10,\"Age\",A1:F2)": "1", "=DCOUNT(A4:E10,\"Age\",A1:F2)": "1",
"=DCOUNT(A4:E10,,A1:F2)": "2", "=DCOUNT(A4:E10,,A1:F2)": "2",
"=DCOUNT(A4:E10,\"Profit\",A1:F2)": "2", "=DCOUNT(A4:E10,\"Profit\",A1:F2)": "2",
"=DCOUNT(A4:E10,\"Tree\",A1:F2)": "0", "=DCOUNT(A4:E10,\"Tree\",A1:F2)": "0",
"=DCOUNT(A4:E10,\"Age\",A2:F3)": "0", "=DCOUNT(A4:E10,\"Age\",A2:F3)": "0",
"=DCOUNTA(A4:E10,\"Age\",A1:F2)": "1", "=DCOUNTA(A4:E10,\"Age\",A1:F2)": "1",
"=DCOUNTA(A4:E10,,A1:F2)": "2", "=DCOUNTA(A4:E10,,A1:F2)": "2",
"=DCOUNTA(A4:E10,\"Profit\",A1:F2)": "2", "=DCOUNTA(A4:E10,\"Profit\",A1:F2)": "2",
"=DCOUNTA(A4:E10,\"Tree\",A1:F2)": "2", "=DCOUNTA(A4:E10,\"Tree\",A1:F2)": "2",
"=DCOUNTA(A4:E10,\"Age\",A2:F3)": "0", "=DCOUNTA(A4:E10,\"Age\",A2:F3)": "0",
"=DMAX(A4:E10,\"Tree\",A1:F3)": "0", "=DMAX(A4:E10,\"Tree\",A1:F3)": "0",
"=DMAX(A4:E10,\"Profit\",A1:F3)": "96", "=DMAX(A4:E10,\"Profit\",A1:F3)": "96",
"=DMIN(A4:E10,\"Tree\",A1:F3)": "0", "=DMIN(A4:E10,\"Tree\",A1:F3)": "0",
"=DMIN(A4:E10,\"Profit\",A1:F3)": "45", "=DMIN(A4:E10,\"Profit\",A1:F3)": "45",
"=DAVERAGE(A4:E10,\"Profit\",A1:F3)": "73.25",
} }
for formula, expected := range formulaList { for formula, expected := range formulaList {
assert.NoError(t, f.SetCellFormula("Sheet1", "A11", formula)) assert.NoError(t, f.SetCellFormula("Sheet1", "A11", formula))
@ -4659,6 +4660,9 @@ func TestCalcDCOUNTandDCOUNTAandDMAXandDMIN(t *testing.T) {
"=DMAX(A4:E10,\"x\",A1:F3)": "#VALUE!", "=DMAX(A4:E10,\"x\",A1:F3)": "#VALUE!",
"=DMIN()": "DMIN requires 3 arguments", "=DMIN()": "DMIN requires 3 arguments",
"=DMIN(A4:E10,\"x\",A1:F3)": "#VALUE!", "=DMIN(A4:E10,\"x\",A1:F3)": "#VALUE!",
"=DAVERAGE()": "DAVERAGE requires 3 arguments",
"=DAVERAGE(A4:E10,\"x\",A1:F3)": "#VALUE!",
"=DAVERAGE(A4:E10,\"Tree\",A1:F3)": "#DIV/0!",
} }
for formula, expected := range calcError { for formula, expected := range calcError {
assert.NoError(t, f.SetCellFormula("Sheet1", "A11", formula)) assert.NoError(t, f.SetCellFormula("Sheet1", "A11", formula))