Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
c24db624
Commit
c24db624
authored
Jun 09, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add GAMMA.INV formula
parent
09de444e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
174 additions
and
5 deletions
+174
-5
cell/.unit-tests/FormulaTests.js
cell/.unit-tests/FormulaTests.js
+10
-0
cell/model/FormulaObjects/statisticalFunctions.js
cell/model/FormulaObjects/statisticalFunctions.js
+164
-5
No files found.
cell/.unit-tests/FormulaTests.js
View file @
c24db624
...
...
@@ -1041,6 +1041,16 @@ $( function () {
ok
(
oParser
.
parse
(),
"
GAMMA.DIST(A2,A3,A4,TRUE)
"
);
strictEqual
(
oParser
.
calculate
().
getValue
().
toFixed
(
6
)
-
0
,
0.068094
,
"
GAMMA.DIST(A2,A3,A4,TRUE)
"
);
}
);
test
(
"
Test:
\"
GAMMA.INV
\"
"
,
function
()
{
ws
.
getRange2
(
"
A2
"
).
setValue
(
"
0.068094
"
);
ws
.
getRange2
(
"
A3
"
).
setValue
(
"
9
"
);
ws
.
getRange2
(
"
A4
"
).
setValue
(
"
2
"
);
oParser
=
new
parserFormula
(
"
GAMMA.INV(A2,A3,A4)
"
,
"
A1
"
,
ws
);
ok
(
oParser
.
parse
(),
"
GAMMA.INV(A2,A3,A4)
"
);
strictEqual
(
oParser
.
calculate
().
getValue
().
toFixed
(
7
)
-
0
,
10.0000112
,
"
GAMMA.INV(A2,A3,A4)
"
);
}
);
test
(
"
Test:
\"
SUM(1,2,3)
\"
"
,
function
()
{
oParser
=
new
parserFormula
(
'
SUM(1,2,3)
'
,
"
A1
"
,
ws
);
...
...
cell/model/FormulaObjects/statisticalFunctions.js
View file @
c24db624
...
...
@@ -63,7 +63,7 @@
cFormulaFunctionGroup
[
'
Statistical
'
].
push
(
cAVEDEV
,
cAVERAGE
,
cAVERAGEA
,
cAVERAGEIF
,
cAVERAGEIFS
,
cBETADIST
,
cBETAINV
,
cBINOMDIST
,
cCHIDIST
,
cCHIINV
,
cCHITEST
,
cCONFIDENCE
,
cCORREL
,
cCOUNT
,
cCOUNTA
,
cCOUNTBLANK
,
cCOUNTIF
,
cCOUNTIFS
,
cCOVAR
,
cCRITBINOM
,
cDEVSQ
,
cEXPONDIST
,
cFDIST
,
cF_DIST
,
cF_DIST_RT
,
cFINV
,
cFISHER
,
cFISHERINV
,
cFORECAST
,
cFREQUENCY
,
cFTEST
,
cGAMMA
,
cGAMMA_DIST
,
cGAMMAINV
,
cGAMMALN
,
cGEOMEAN
,
cGROWTH
,
cHARMEAN
,
cHYPGEOMDIST
,
cINTERCEPT
,
cKURT
,
cLARGE
,
cFTEST
,
cGAMMA
,
cGAMMA_DIST
,
cGAMMA
_
INV
,
cGAMMALN
,
cGEOMEAN
,
cGROWTH
,
cHARMEAN
,
cHYPGEOMDIST
,
cINTERCEPT
,
cKURT
,
cLARGE
,
cLINEST
,
cLOGEST
,
cLOGINV
,
cLOGNORMDIST
,
cMAX
,
cMAXA
,
cMEDIAN
,
cMIN
,
cMINA
,
cMODE
,
cNEGBINOMDIST
,
cNORMDIST
,
cNORMINV
,
cNORMSDIST
,
cNORMSINV
,
cPEARSON
,
cPERCENTILE
,
cPERCENTRANK
,
cPERMUT
,
cPOISSON
,
cPROB
,
cQUARTILE
,
cRANK
,
cRSQ
,
cSKEW
,
cSLOPE
,
cSMALL
,
cSTANDARDIZE
,
cSTDEV
,
cSTDEVA
,
cSTDEVP
,
cSTDEVPA
,
cSTEYX
,
cTDIST
,
cT_DIST
,
...
...
@@ -753,6 +753,114 @@
return
getBetaDist
(
arg
,
alpha
,
beta
);
}
function
iterateInverse
(
rFunction
,
fAx
,
fBx
)
{
var
rConvError
=
false
;
var
fYEps
=
1.0
E
-
307
;
var
fXEps
=
2.22045
e
-
016
;
var
fAy
=
rFunction
.
GetValue
(
fAx
);
var
fBy
=
rFunction
.
GetValue
(
fBx
);
var
fTemp
;
var
nCount
;
for
(
nCount
=
0
;
nCount
<
1000
&&
!
hasChangeOfSign
(
fAy
,
fBy
);
nCount
++
)
{
if
(
Math
.
abs
(
fAy
)
<=
Math
.
abs
(
fBy
))
{
fTemp
=
fAx
;
fAx
+=
2
*
(
fAx
-
fBx
);
if
(
fAx
<
0
){
fAx
=
0
;
}
fBx
=
fTemp
;
fBy
=
fAy
;
fAy
=
rFunction
.
GetValue
(
fAx
);
}
else
{
fTemp
=
fBx
;
fBx
+=
2
*
(
fBx
-
fAx
);
fAx
=
fTemp
;
fAy
=
fBy
;
fBy
=
rFunction
.
GetValue
(
fBx
);
}
}
if
(
fAy
===
0
){
return
fAx
;
}
if
(
fBy
===
0
){
return
fBx
;
}
if
(
!
hasChangeOfSign
(
fAy
,
fBy
)){
rConvError
=
true
;
return
0.0
;
}
// inverse quadric interpolation with additional brackets
// set three points
var
fPx
=
fAx
;
var
fPy
=
fAy
;
var
fQx
=
fBx
;
var
fQy
=
fBy
;
var
fRx
=
fAx
;
var
fRy
=
fAy
;
var
fSx
=
0.5
*
(
fAx
+
fBx
);
var
bHasToInterpolate
=
true
;
nCount
=
0
;
while
(
nCount
<
500
&&
Math
.
abs
(
fRy
)
>
fYEps
&&
(
fBx
-
fAx
)
>
Math
.
max
(
Math
.
abs
(
fAx
),
Math
.
abs
(
fBx
))
*
fXEps
){
if
(
bHasToInterpolate
){
if
(
fPy
!==
fQy
&&
fQy
!==
fRy
&&
fRy
!==
fPy
){
fSx
=
fPx
*
fRy
*
fQy
/
(
fRy
-
fPy
)
/
(
fQy
-
fPy
)
+
fRx
*
fQy
*
fPy
/
(
fQy
-
fRy
)
/
(
fPy
-
fRy
)
+
fQx
*
fPy
*
fRy
/
(
fPy
-
fQy
)
/
(
fRy
-
fQy
);
bHasToInterpolate
=
(
fAx
<
fSx
)
&&
(
fSx
<
fBx
);
// inside the brackets?
}
else
{
bHasToInterpolate
=
false
;
}
}
if
(
!
bHasToInterpolate
){
fSx
=
0.5
*
(
fAx
+
fBx
);
fQx
=
fBx
;
fQy
=
fBy
;
bHasToInterpolate
=
true
;
}
fPx
=
fQx
;
fQx
=
fRx
;
fRx
=
fSx
;
fPy
=
fQy
;
fQy
=
fRy
;
fRy
=
rFunction
.
GetValue
(
fSx
);
if
(
hasChangeOfSign
(
fAy
,
fRy
))
{
fBx
=
fRx
;
fBy
=
fRy
;
}
else
{
fAx
=
fRx
;
fAy
=
fRy
;
}
bHasToInterpolate
=
bHasToInterpolate
&&
(
Math
.
abs
(
fRy
)
*
2
<=
Math
.
abs
(
fQy
));
++
nCount
;
}
return
{
val
:
fRx
,
bError
:
rConvError
};
}
function
hasChangeOfSign
(
u
,
w
)
{
return
(
u
<
0
&&
w
>
0
)
||
(
u
>
0
&&
w
<
0
);
}
function
cGammaDistFunction
(
fp
,
fAlpha
,
fBeta
){
this
.
fp
=
fp
;
this
.
fAlpha
=
fAlpha
;
this
.
fBeta
=
fBeta
;
}
cGammaDistFunction
.
prototype
.
constructor
=
cGammaDistFunction
;
cGammaDistFunction
.
prototype
.
GetValue
=
function
(
x
){
return
this
.
fp
-
getGammaDist
(
x
,
this
.
fAlpha
,
this
.
fBeta
);
};
function
getLowRegIGamma
(
fA
,
fX
){
var
fLnFactor
=
fA
*
Math
.
log
(
fX
)
-
fX
-
getLogGamma
(
fA
);
var
fFactor
=
Math
.
exp
(
fLnFactor
);
if
(
fX
>
fA
+
1
){
return
1
-
fFactor
*
getGammaContFraction
(
fA
,
fX
);
}
else
{
return
fFactor
*
getGammaSeries
(
fA
,
fX
);
}
}
/**
* @constructor
...
...
@@ -2527,16 +2635,67 @@
cGAMMA_DIST
.
prototype
.
getInfo
=
function
()
{
return
{
name
:
this
.
name
,
args
:
"
(x, alpha, beta, cumulative )
"
}
};
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function
cGAMMAINV
()
{
cBaseFunction
.
call
(
this
,
"
GAMMAINV
"
);
function
cGAMMA_INV
()
{
this
.
name
=
"
GAMMA.INV
"
;
this
.
value
=
null
;
this
.
argumentsCurrent
=
0
;
}
cGAMMAINV
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
);
cGAMMAINV
.
prototype
.
constructor
=
cGAMMAINV
;
cGAMMA_INV
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
);
cGAMMA_INV
.
prototype
.
constructor
=
cGAMMA_INV
;
cGAMMA_INV
.
prototype
.
argumentsMin
=
3
;
cGAMMA_INV
.
prototype
.
argumentsMax
=
3
;
cGAMMA_INV
.
prototype
.
Calculate
=
function
(
arg
)
{
var
oArguments
=
this
.
_prepareArguments
(
arg
,
arguments
[
1
],
true
);
var
argClone
=
oArguments
.
args
;
argClone
[
0
]
=
argClone
[
0
].
tocNumber
();
argClone
[
1
]
=
argClone
[
1
].
tocNumber
();
argClone
[
2
]
=
argClone
[
2
].
tocNumber
();
var
argError
;
if
(
argError
=
this
.
_checkErrorArg
(
argClone
))
{
return
this
.
value
=
argError
;
}
var
calcGamma
=
function
(
argArray
){
var
fP
=
argArray
[
0
];
var
fAlpha
=
argArray
[
1
];
var
fBeta
=
argArray
[
2
];
if
(
fAlpha
<=
0
||
fBeta
<=
0
||
fP
<
0
||
fP
>=
1
){
return
new
cError
(
cErrorType
.
not_numeric
);
}
var
res
=
null
;
if
(
fP
===
0
){
res
=
0
;
}
else
{
var
aFunc
=
new
cGammaDistFunction
(
fP
,
fAlpha
,
fBeta
);
var
fStart
=
fAlpha
*
fBeta
;
var
oVal
=
iterateInverse
(
aFunc
,
fStart
*
0.5
,
fStart
);
var
bConvError
=
oVal
.
bError
;
if
(
bConvError
){
return
new
cError
(
cErrorType
.
not_numeric
);
//SetError(FormulaError::NoConvergence);
}
res
=
oVal
.
val
;
}
return
null
!==
res
&&
!
isNaN
(
res
)
?
new
cNumber
(
res
)
:
new
cError
(
cErrorType
.
wrong_value_type
);
};
return
this
.
value
=
this
.
_findArrayInNumberArguments
(
oArguments
,
calcGamma
);
};
cGAMMA_INV
.
prototype
.
getInfo
=
function
()
{
return
{
name
:
this
.
name
,
args
:
"
(probability, alpha, beta )
"
}
};
/**
* @constructor
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment