Commit 35ebdc68 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov

добавлены функции

LOGINV, LOGNORMDIST, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERCENTILE, PERCENTRANK, PERMUT, POISSON, PROB, QUARTILE, RSQ, SKEW, SLOPE, STANDARDIZE, STDEVA, VAR
поправлены функции 
AVEDEV, AVERAGE, CORREL, FESHER, FISHERINV

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48959 954022d7-b5bf-4e40-9824-e11837661b57
parent 7c250b67
This diff is collapsed.
......@@ -462,10 +462,10 @@ cFormulaFunction.Mathematic = {
}
else {
arg0.foreach( function ( elem, r, c ) {
var a = elem;
b = arg1.getElementRowCol( r, c );
var a = elem,
b = arg1.getElementRowCol( r, c );
if ( a instanceof cNumber && b instanceof cNumber ) {
this.array[r][c] = new cNumber( Math.fact( a.getValue() ) / (Math.fact( b.getValue() ) * Math.fact( a.getValue() - b.getValue() )) );
this.array[r][c] = new cNumber( Math.binomCoeff( a.getValue(), b.getValue() ) );
}
else
this.array[r][c] = new cError( cErrorType.wrong_value_type );
......@@ -498,7 +498,7 @@ cFormulaFunction.Mathematic = {
if ( a.getValue() <= 0 || b.getValue() <= 0 || a.getValue() < b.getValue() )
this.array[r][c] = new cError( cErrorType.not_numeric );
this.array[r][c] = new cNumber( Math.fact( a.getValue() ) / (Math.fact( b.getValue() ) * Math.fact( a.getValue() - b.getValue() )) );
this.array[r][c] = new cNumber( Math.binomCoeff( a.getValue(), b.getValue() ) );
}
else
this.array[r][c] = new cError( cErrorType.wrong_value_type );
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment