Correct FREQUENCY output and simplify implementation (#2286)

- Removed the incorrect `c[1], c[2] = c[2], c[1]` swapping logic so results match Excel
- Use row-major traversal and ensure output order
- Replaced the redundant allocation and assignment loops with a single `make` allocation for the output matrix.
- Added comprehensive test cases in `calc_test.go` using `INDEX` and array constants to verify the correct distribution of counts across all buckets, ensuring the removal of the swap logic maintains accurate behavior
- Update dependencies modules and documentation

Author: shcabin

calc.go

@@ -8255,29 +8255,35 @@ func (fn *formulaFuncs) FORECASTdotLINEAR(argsList *list.List) formulaArg {
 	return fn.pearsonProduct("FORECAST.LINEAR", 3, argsList)
 }
 
-// matrixToSortedColumnList convert matrix formula arguments to a ascending
-// order list by column.
-func matrixToSortedColumnList(arg formulaArg) formulaArg {
+type sortedItem struct {
+	idx    int
+	number float64
+}
+
+// matrixToSortedColumnList flattens matrix formula arguments into a slice of
+// numeric values, then sorts that slice in ascending order by number. Matrix
+// traversal is row-major.
+func matrixToSortedColumnList(arg formulaArg) ([]sortedItem, *formulaArg) {
 	var (
-		mtx  []formulaArg
+		mtx  []sortedItem
 		cols = len(arg.Matrix[0])
 	)
-	for colIdx := 0; colIdx < cols; colIdx++ {
-		for _, row := range arg.Matrix {
+	for _, row := range arg.Matrix {
+		for colIdx := 0; colIdx < cols; colIdx++ {
 			cell := row[colIdx]
 			if cell.Type == ArgError {
-				return cell
+				return nil, &cell
 			}
 			if cell.Type == ArgNumber {
-				mtx = append(mtx, cell)
+				mtx = append(mtx, sortedItem{idx: len(mtx), number: cell.Number})
 			}
 		}
 	}
-	argsList := newListFormulaArg(mtx)
-	sort.Slice(argsList.List, func(i, j int) bool {
-		return argsList.List[i].Number < argsList.List[j].Number
+
+	sort.Slice(mtx, func(i, j int) bool {
+		return mtx[i].number < mtx[j].number
 	})
-	return argsList
+	return mtx, nil
 }
 
 // FREQUENCY function to count how many children fall into different age
@@ -8295,37 +8301,27 @@ func (fn *formulaFuncs) FREQUENCY(argsList *list.List) formulaArg {
 	if len(bins.Matrix) == 0 {
 		bins.Matrix = [][]formulaArg{{bins}}
 	}
-	var (
-		dataMtx, binsMtx formulaArg
-		c                [][]formulaArg
-		i, j             int
-	)
-	if dataMtx = matrixToSortedColumnList(data); dataMtx.Type != ArgList {
-		return dataMtx
-	}
-	if binsMtx = matrixToSortedColumnList(bins); binsMtx.Type != ArgList {
-		return binsMtx
+
+	dataMtx, argErr := matrixToSortedColumnList(data)
+	if argErr != nil {
+		return *argErr
 	}
-	for row := 0; row < len(binsMtx.List)+1; row++ {
-		var rows []formulaArg
-		for col := 0; col < 1; col++ {
-			rows = append(rows, newNumberFormulaArg(0))
-		}
-		c = append(c, rows)
+	binsMtx, argErr := matrixToSortedColumnList(bins)
+	if argErr != nil {
+		return *argErr
 	}
-	for j = 0; j < len(binsMtx.List); j++ {
+	out := make([][]formulaArg, len(binsMtx)+1)
+	var i int
+	for j := range len(binsMtx) {
 		n := 0.0
-		for i < len(dataMtx.List) && dataMtx.List[i].Number <= binsMtx.List[j].Number {
+		for i < len(dataMtx) && dataMtx[i].number <= binsMtx[j].number {
 			n++
 			i++
 		}
-		c[j] = []formulaArg{newNumberFormulaArg(n)}
-	}
-	c[j] = []formulaArg{newNumberFormulaArg(float64(len(dataMtx.List) - i))}
-	if len(c) > 2 {
-		c[1], c[2] = c[2], c[1]
+		out[binsMtx[j].idx] = []formulaArg{newNumberFormulaArg(n)}
 	}
-	return newMatrixFormulaArg(c)
+	out[len(binsMtx)] = []formulaArg{newNumberFormulaArg(float64(len(dataMtx) - i))}
+	return newMatrixFormulaArg(out)
 }
 
 // GAMMA function returns the value of the Gamma Function, Γ(n), for a

calc_test.go

@@ -25,8 +25,8 @@ func prepareCalcData(cellData [][]interface{}) *File {
 func TestCalcCellValue(t *testing.T) {
 	cellData := [][]interface{}{
 		{1, 4, nil, "Month", "Team", "Sales"},
-		{2, 5, nil, "Jan", "North 1", 36693},
-		{3, nil, nil, "Jan", "North 2", 22100},
+		{2, 5, nil, "Jan", "North 1", 36693, 4},
+		{3, nil, nil, "Jan", "North 2", 22100, 2},
 		{0, nil, nil, "Jan", "South 1", 53321},
 		{nil, nil, nil, "Jan", "South 2", 34440},
 		{nil, nil, nil, "Feb", "North 1", 29889},
@@ -1110,8 +1110,20 @@ func TestCalcCellValue(t *testing.T) {
 		// FORECAST.LINEAR
 		"FORECAST.LINEAR(7,A1:A7,B1:B7)": "4",
 		// FREQUENCY
-		"SUM(FREQUENCY(A2,B2))":       "1",
-		"SUM(FREQUENCY(A1:A5,B1:B2))": "4",
+		"SUM(FREQUENCY(A2,B2))":                            "1",
+		"SUM(FREQUENCY(A1:A5,B1:B2))":                      "4",
+		"INDEX(FREQUENCY(A1:A4,G2:G3),1,1)":                "1",
+		"INDEX(FREQUENCY(A1:A4,G2:G3),2,1)":                "3",
+		"INDEX(FREQUENCY(A1:A4,G2:G3),3,1)":                "0",
+		"INDEX(FREQUENCY(A1:B4,F2:G3),1,1)":                "0",
+		"INDEX(FREQUENCY(A1:B4,F2:G3),2,1)":                "2",
+		"INDEX(FREQUENCY(A1:B4,F2:G3),3,1)":                "1",
+		"INDEX(FREQUENCY(A1:B4,F2:G3),4,1)":                "3",
+		"INDEX(FREQUENCY(A1:B4,F2:G3),5,1)":                "0",
+		"INDEX(FREQUENCY({0,1,4,5,11,10,6},{2,4,10}),1,1)": "2",
+		"INDEX(FREQUENCY({0,1,4,5,11,10,6},{2,4,10}),2,1)": "1",
+		"INDEX(FREQUENCY({0,1,4,5,11,10,6},{2,4,10}),3,1)": "3",
+		"INDEX(FREQUENCY({0,1,4,5,11,10,6},{2,4,10}),4,1)": "1",
 		// GAMMA
 		"GAMMA(0.1)":     "9.51350769866873",
 		"GAMMA(INT(1))":  "1",

go.mod

@@ -8,10 +8,10 @@ require (
 	github.com/tiendc/go-deepcopy v1.7.2
 	github.com/xuri/efp v0.0.1
 	github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9
-	golang.org/x/crypto v0.49.0
+	golang.org/x/crypto v0.50.0
 	golang.org/x/image v0.38.0
-	golang.org/x/net v0.52.0
-	golang.org/x/text v0.35.0
+	golang.org/x/net v0.53.0
+	golang.org/x/text v0.36.0
 )
 
 require (

go.sum

@@ -14,14 +14,14 @@ github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
 github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
 github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE=
 github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
+golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
+golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
 golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE=
 golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
+golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
+golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

pivotTable.go

@@ -111,7 +111,7 @@ type PivotTableField struct {
 // options. Note that the same fields can not in Columns, Rows and Filter
 // fields at the same time.
 //
-// For example, create a pivot table on the range reference Sheet1!G4:M31 with
+// For example, create a pivot table on the range reference Sheet1!G4:M30 with
 // the range reference Sheet1!A1:E31 as the data source, summarize by sum for
 // revenue:
 //