Skip to content

Commit c1940c2

Browse files
xurixuri
committed
This includes new formula functions support, dependencies upgrade, and bug fix
- Fix page setup fields parsing issue - Go Modules dependencies upgrade - Ref qax-os#65, CONFIDENCE.T and PHI - Ref qax-os#1198, Fix the issue that the chart axis maximum and minimum didn't work when the value is 0
1 parent 9b8f1a1 commit c1940c2

File tree

7 files changed

+126
-52
lines changed

7 files changed

+126
-52
lines changed

‎calc.go

+57-3
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ type formulaFuncs struct {
374374
// CONCATENATE
375375
// CONFIDENCE
376376
// CONFIDENCE.NORM
377+
// CONFIDENCE.T
377378
// CORREL
378379
// COS
379380
// COSH
@@ -588,6 +589,7 @@ type formulaFuncs struct {
588589
// PERCENTRANK
589590
// PERMUT
590591
// PERMUTATIONA
592+
// PHI
591593
// PI
592594
// PMT
593595
// POISSON.DIST
@@ -6805,14 +6807,50 @@ func (fn *formulaFuncs) CONFIDENCE(argsList *list.List) formulaArg {
68056807
// confidence value that can be used to construct the confidence interval for
68066808
// a population mean, for a supplied probability and sample size. It is
68076809
// assumed that the standard deviation of the population is known. The syntax
6808-
// of the Confidence.Norm function is:
6810+
// of the function is:
68096811
//
68106812
// CONFIDENCE.NORM(alpha,standard_dev,size)
68116813
//
68126814
func (fn *formulaFuncs) CONFIDENCEdotNORM(argsList *list.List) formulaArg {
68136815
return fn.confidence("CONFIDENCE.NORM", argsList)
68146816
}
68156817

6818+
// CONFIDENCEdotT function uses a Student's T-Distribution to calculate a
6819+
// confidence value that can be used to construct the confidence interval for
6820+
// a population mean, for a supplied probablity and supplied sample size. It
6821+
// is assumed that the standard deviation of the population is known. The
6822+
// syntax of the function is:
6823+
//
6824+
// CONFIDENCE.T(alpha,standard_dev,size)
6825+
//
6826+
func (fn *formulaFuncs) CONFIDENCEdotT(argsList *list.List) formulaArg {
6827+
if argsList.Len() != 3 {
6828+
return newErrorFormulaArg(formulaErrorVALUE, "CONFIDENCE.T requires 3 arguments")
6829+
}
6830+
var alpha, standardDev, size formulaArg
6831+
if alpha = argsList.Front().Value.(formulaArg).ToNumber(); alpha.Type != ArgNumber {
6832+
return alpha
6833+
}
6834+
if standardDev = argsList.Front().Next().Value.(formulaArg).ToNumber(); standardDev.Type != ArgNumber {
6835+
return standardDev
6836+
}
6837+
if size = argsList.Back().Value.(formulaArg).ToNumber(); size.Type != ArgNumber {
6838+
return size
6839+
}
6840+
if alpha.Number <= 0 || alpha.Number >= 1 || standardDev.Number <= 0 || size.Number < 1 {
6841+
return newErrorFormulaArg(formulaErrorNUM, formulaErrorNUM)
6842+
}
6843+
if size.Number == 1 {
6844+
return newErrorFormulaArg(formulaErrorDIV, formulaErrorDIV)
6845+
}
6846+
return newNumberFormulaArg(standardDev.Number * calcIterateInverse(calcInverseIterator{
6847+
name: "CONFIDENCE.T",
6848+
fp: alpha.Number,
6849+
fDF: size.Number - 1,
6850+
nT: 2,
6851+
}, size.Number/2, size.Number) / math.Sqrt(size.Number))
6852+
}
6853+
68166854
// COVAR function calculates the covariance of two supplied sets of values. The
68176855
// syntax of the function is:
68186856
//
@@ -8891,6 +8929,22 @@ func (fn *formulaFuncs) PERMUTATIONA(argsList *list.List) formulaArg {
88918929
return newNumberFormulaArg(math.Pow(num, numChosen))
88928930
}
88938931

8932+
// PHI function returns the value of the density function for a standard normal
8933+
// distribution for a supplied number. The syntax of the function is:
8934+
//
8935+
// PHI(x)
8936+
//
8937+
func (fn *formulaFuncs) PHI(argsList *list.List) formulaArg {
8938+
if argsList.Len() != 1 {
8939+
return newErrorFormulaArg(formulaErrorVALUE, "PHI requires 1 argument")
8940+
}
8941+
x := argsList.Front().Value.(formulaArg).ToNumber()
8942+
if x.Type != ArgNumber {
8943+
return x
8944+
}
8945+
return newNumberFormulaArg(0.39894228040143268 * math.Exp(-(x.Number*x.Number)/2))
8946+
}
8947+
88948948
// QUARTILE function returns a requested quartile of a supplied range of
88958949
// values. The syntax of the function is:
88968950
//
@@ -13122,7 +13176,7 @@ func validateFrequency(freq float64) bool {
1312213176
return freq == 1 || freq == 2 || freq == 4
1312313177
}
1312413178

13125-
// ACCRINT function returns the accrued interest for a security that pays
13179+
// ACCRINT function returns the accrued interest in a security that pays
1312613180
// periodic interest. The syntax of the function is:
1312713181
//
1312813182
// ACCRINT(issue,first_interest,settlement,rate,par,frequency,[basis],[calc_method])
@@ -13166,7 +13220,7 @@ func (fn *formulaFuncs) ACCRINT(argsList *list.List) formulaArg {
1316613220
return newNumberFormulaArg(par.Number * rate.Number * frac1.Number)
1316713221
}
1316813222

13169-
// ACCRINTM function returns the accrued interest for a security that pays
13223+
// ACCRINTM function returns the accrued interest in a security that pays
1317013224
// interest at maturity. The syntax of the function is:
1317113225
//
1317213226
// ACCRINTM(issue,settlement,rate,[par],[basis])

‎calc_test.go

+20
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,8 @@ func TestCalcCellValue(t *testing.T) {
879879
"=CONFIDENCE(0.05,0.07,100)": "0.0137197479028414",
880880
// CONFIDENCE.NORM
881881
"=CONFIDENCE.NORM(0.05,0.07,100)": "0.0137197479028414",
882+
// CONFIDENCE.T
883+
"=CONFIDENCE.T(0.05,0.07,100)": "0.0138895186611049",
882884
// CORREL
883885
"=CORREL(A1:A5,B1:B5)": "1",
884886
// COUNT
@@ -1122,6 +1124,11 @@ func TestCalcCellValue(t *testing.T) {
11221124
// PERMUTATIONA
11231125
"=PERMUTATIONA(6,6)": "46656",
11241126
"=PERMUTATIONA(7,6)": "117649",
1127+
// PHI
1128+
"=PHI(-1.5)": "0.129517595665892",
1129+
"=PHI(0)": "0.398942280401433",
1130+
"=PHI(0.1)": "0.396952547477012",
1131+
"=PHI(1)": "0.241970724519143",
11251132
// QUARTILE
11261133
"=QUARTILE(A1:A4,2)": "1.5",
11271134
// QUARTILE.EXC
@@ -2643,6 +2650,16 @@ func TestCalcCellValue(t *testing.T) {
26432650
"=CORREL()": "CORREL requires 2 arguments",
26442651
"=CORREL(A1:A3,B1:B5)": "#N/A",
26452652
"=CORREL(A1:A1,B1:B1)": "#DIV/0!",
2653+
// CONFIDENCE.T
2654+
"=CONFIDENCE.T()": "CONFIDENCE.T requires 3 arguments",
2655+
"=CONFIDENCE.T(\"\",0.07,100)": "strconv.ParseFloat: parsing \"\": invalid syntax",
2656+
"=CONFIDENCE.T(0.05,\"\",100)": "strconv.ParseFloat: parsing \"\": invalid syntax",
2657+
"=CONFIDENCE.T(0.05,0.07,\"\")": "strconv.ParseFloat: parsing \"\": invalid syntax",
2658+
"=CONFIDENCE.T(0,0.07,100)": "#NUM!",
2659+
"=CONFIDENCE.T(1,0.07,100)": "#NUM!",
2660+
"=CONFIDENCE.T(0.05,0,100)": "#NUM!",
2661+
"=CONFIDENCE.T(0.05,0.07,0)": "#NUM!",
2662+
"=CONFIDENCE.T(0.05,0.07,1)": "#DIV/0!",
26462663
// COUNTBLANK
26472664
"=COUNTBLANK()": "COUNTBLANK requires 1 argument",
26482665
"=COUNTBLANK(1,2)": "COUNTBLANK requires 1 argument",
@@ -2985,6 +3002,9 @@ func TestCalcCellValue(t *testing.T) {
29853002
"=PERMUTATIONA(0,\"\")": "strconv.ParseFloat: parsing \"\": invalid syntax",
29863003
"=PERMUTATIONA(-1,0)": "#N/A",
29873004
"=PERMUTATIONA(0,-1)": "#N/A",
3005+
// PHI
3006+
"=PHI()": "PHI requires 1 argument",
3007+
"=PHI(\"\")": "strconv.ParseFloat: parsing \"\": invalid syntax",
29883008
// QUARTILE
29893009
"=QUARTILE()": "QUARTILE requires 2 arguments",
29903010
"=QUARTILE(A1:A4,\"\")": "strconv.ParseFloat: parsing \"\": invalid syntax",

‎drawing.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -957,14 +957,14 @@ func (f *File) drawChartSeriesDLbls(formatSet *formatChart) *cDLbls {
957957

958958
// drawPlotAreaCatAx provides a function to draw the c:catAx element.
959959
func (f *File) drawPlotAreaCatAx(formatSet *formatChart) []*cAxs {
960-
min := &attrValFloat{Val: float64Ptr(formatSet.XAxis.Minimum)}
961-
max := &attrValFloat{Val: float64Ptr(formatSet.XAxis.Maximum)}
962-
if formatSet.XAxis.Minimum == 0 {
963-
min = nil
964-
}
965-
if formatSet.XAxis.Maximum == 0 {
960+
max := &attrValFloat{Val: formatSet.XAxis.Maximum}
961+
min := &attrValFloat{Val: formatSet.XAxis.Minimum}
962+
if formatSet.XAxis.Maximum == nil {
966963
max = nil
967964
}
965+
if formatSet.XAxis.Minimum == nil {
966+
min = nil
967+
}
968968
axs := []*cAxs{
969969
{
970970
AxID: &attrValInt{Val: intPtr(754001152)},
@@ -1006,14 +1006,14 @@ func (f *File) drawPlotAreaCatAx(formatSet *formatChart) []*cAxs {
10061006

10071007
// drawPlotAreaValAx provides a function to draw the c:valAx element.
10081008
func (f *File) drawPlotAreaValAx(formatSet *formatChart) []*cAxs {
1009-
min := &attrValFloat{Val: float64Ptr(formatSet.YAxis.Minimum)}
1010-
max := &attrValFloat{Val: float64Ptr(formatSet.YAxis.Maximum)}
1011-
if formatSet.YAxis.Minimum == 0 {
1012-
min = nil
1013-
}
1014-
if formatSet.YAxis.Maximum == 0 {
1009+
max := &attrValFloat{Val: formatSet.YAxis.Maximum}
1010+
min := &attrValFloat{Val: formatSet.YAxis.Minimum}
1011+
if formatSet.YAxis.Maximum == nil {
10151012
max = nil
10161013
}
1014+
if formatSet.YAxis.Minimum == nil {
1015+
min = nil
1016+
}
10171017
var logBase *attrValFloat
10181018
if formatSet.YAxis.LogBase >= 2 && formatSet.YAxis.LogBase <= 1000 {
10191019
logBase = &attrValFloat{Val: float64Ptr(formatSet.YAxis.LogBase)}
@@ -1060,14 +1060,14 @@ func (f *File) drawPlotAreaValAx(formatSet *formatChart) []*cAxs {
10601060

10611061
// drawPlotAreaSerAx provides a function to draw the c:serAx element.
10621062
func (f *File) drawPlotAreaSerAx(formatSet *formatChart) []*cAxs {
1063-
min := &attrValFloat{Val: float64Ptr(formatSet.YAxis.Minimum)}
1064-
max := &attrValFloat{Val: float64Ptr(formatSet.YAxis.Maximum)}
1065-
if formatSet.YAxis.Minimum == 0 {
1066-
min = nil
1067-
}
1068-
if formatSet.YAxis.Maximum == 0 {
1063+
max := &attrValFloat{Val: formatSet.YAxis.Maximum}
1064+
min := &attrValFloat{Val: formatSet.YAxis.Minimum}
1065+
if formatSet.YAxis.Maximum == nil {
10691066
max = nil
10701067
}
1068+
if formatSet.YAxis.Minimum == nil {
1069+
min = nil
1070+
}
10711071
return []*cAxs{
10721072
{
10731073
AxID: &attrValInt{Val: intPtr(832256642)},

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ require (
66
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
77
github.com/richardlehane/mscfb v1.0.4
88
github.com/stretchr/testify v1.7.0
9-
github.com/xuri/efp v0.0.0-20220216053911-6d8731f62184
10-
github.com/xuri/nfp v0.0.0-20220215121256-71f1502108b5
11-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
9+
github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8
10+
github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22
11+
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921
1212
golang.org/x/image v0.0.0-20211028202545-6944b10bf410
13-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
13+
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3
1414
golang.org/x/text v0.3.7
1515
)

‎go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTK
1111
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1212
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
1313
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
14-
github.com/xuri/efp v0.0.0-20220216053911-6d8731f62184 h1:9nchVQT/GVLRvOnXzx+wUvSublH/jG/ANV4MxBnGhUA=
15-
github.com/xuri/efp v0.0.0-20220216053911-6d8731f62184/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
16-
github.com/xuri/nfp v0.0.0-20220215121256-71f1502108b5 h1:Pg6lKJe2FUZTalbUygJxgW1ke2re9lY3YW5TKb+Pxe4=
17-
github.com/xuri/nfp v0.0.0-20220215121256-71f1502108b5/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
18-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
19-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
14+
github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8 h1:3X7aE0iLKJ5j+tz58BpvIZkXNV7Yq4jC93Z/rbN2Fxk=
15+
github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
16+
github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 h1:OAmKAfT06//esDdpi/DZ8Qsdt4+M5+ltca05dA5bG2M=
17+
github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
18+
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 h1:iU7T1X1J6yxDr0rda54sWGkHgOp5XJrqm79gcNlC2VM=
19+
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
2020
golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
2121
golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
2222
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
23-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
24-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
23+
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 h1:EN5+DfgmRMvRUrMGERW2gQl3Vc+Z7ZMnI/xdEpPSf0c=
24+
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
2525
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2626
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2727
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

‎xmlChart.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -520,23 +520,23 @@ type cPageMargins struct {
520520

521521
// formatChartAxis directly maps the format settings of the chart axis.
522522
type formatChartAxis struct {
523-
None bool `json:"none"`
524-
Crossing string `json:"crossing"`
525-
MajorGridlines bool `json:"major_grid_lines"`
526-
MinorGridlines bool `json:"minor_grid_lines"`
527-
MajorTickMark string `json:"major_tick_mark"`
528-
MinorTickMark string `json:"minor_tick_mark"`
529-
MinorUnitType string `json:"minor_unit_type"`
530-
MajorUnit float64 `json:"major_unit"`
531-
MajorUnitType string `json:"major_unit_type"`
532-
TickLabelSkip int `json:"tick_label_skip"`
533-
DisplayUnits string `json:"display_units"`
534-
DisplayUnitsVisible bool `json:"display_units_visible"`
535-
DateAxis bool `json:"date_axis"`
536-
ReverseOrder bool `json:"reverse_order"`
537-
Maximum float64 `json:"maximum"`
538-
Minimum float64 `json:"minimum"`
539-
NumFormat string `json:"num_format"`
523+
None bool `json:"none"`
524+
Crossing string `json:"crossing"`
525+
MajorGridlines bool `json:"major_grid_lines"`
526+
MinorGridlines bool `json:"minor_grid_lines"`
527+
MajorTickMark string `json:"major_tick_mark"`
528+
MinorTickMark string `json:"minor_tick_mark"`
529+
MinorUnitType string `json:"minor_unit_type"`
530+
MajorUnit float64 `json:"major_unit"`
531+
MajorUnitType string `json:"major_unit_type"`
532+
TickLabelSkip int `json:"tick_label_skip"`
533+
DisplayUnits string `json:"display_units"`
534+
DisplayUnitsVisible bool `json:"display_units_visible"`
535+
DateAxis bool `json:"date_axis"`
536+
ReverseOrder bool `json:"reverse_order"`
537+
Maximum *float64 `json:"maximum"`
538+
Minimum *float64 `json:"minimum"`
539+
NumFormat string `json:"num_format"`
540540
NumFont struct {
541541
Color string `json:"color"`
542542
Bold bool `json:"bold"`

‎xmlWorksheet.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ type xlsxPageSetUp struct {
116116
FirstPageNumber string `xml:"firstPageNumber,attr,omitempty"`
117117
FitToHeight *int `xml:"fitToHeight,attr"`
118118
FitToWidth *int `xml:"fitToWidth,attr"`
119-
HorizontalDPI float64 `xml:"horizontalDpi,attr,omitempty"`
119+
HorizontalDPI string `xml:"horizontalDpi,attr,omitempty"`
120120
RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"`
121121
Orientation string `xml:"orientation,attr,omitempty"`
122122
PageOrder string `xml:"pageOrder,attr,omitempty"`
@@ -126,7 +126,7 @@ type xlsxPageSetUp struct {
126126
Scale int `xml:"scale,attr,omitempty"`
127127
UseFirstPageNumber bool `xml:"useFirstPageNumber,attr,omitempty"`
128128
UsePrinterDefaults bool `xml:"usePrinterDefaults,attr,omitempty"`
129-
VerticalDPI float64 `xml:"verticalDpi,attr,omitempty"`
129+
VerticalDPI string `xml:"verticalDpi,attr,omitempty"`
130130
}
131131

132132
// xlsxPrintOptions directly maps the printOptions element in the namespace

0 commit comments

Comments
 (0)