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
ada61c72
Commit
ada61c72
authored
May 26, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add CSCH formula
parent
9528c948
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
95 additions
and
14 deletions
+95
-14
cell/.unit-tests/FormulaTests.js
cell/.unit-tests/FormulaTests.js
+38
-0
cell/model/FormulaObjects/_xlfnFunctions.js
cell/model/FormulaObjects/_xlfnFunctions.js
+1
-13
cell/model/FormulaObjects/mathematicFunctions.js
cell/model/FormulaObjects/mathematicFunctions.js
+56
-1
No files found.
cell/.unit-tests/FormulaTests.js
View file @
ada61c72
...
...
@@ -726,6 +726,44 @@ $( function () {
strictEqual
(
oParser
.
calculate
().
getValue
(),
"
#VALUE!
"
);
}
);
test
(
"
Test:
\"
CSCH(1.5)
\"
"
,
function
()
{
oParser
=
new
parserFormula
(
'
CSCH(1.5)
'
,
"
A1
"
,
ws
);
ok
(
oParser
.
parse
()
);
strictEqual
(
oParser
.
calculate
().
getValue
().
toFixed
(
4
)
-
0
,
0.4696
);
}
);
test
(
"
Test:
\"
CSCH(0)
\"
"
,
function
()
{
oParser
=
new
parserFormula
(
'
CSCH(0)
'
,
"
A1
"
,
ws
);
ok
(
oParser
.
parse
()
);
strictEqual
(
oParser
.
calculate
().
getValue
(),
"
#DIV/0!
"
);
}
);
//> Math.pow(2, 27)
test
(
"
Test:
\"
CSCH(1000000000)
\"
"
,
function
()
{
oParser
=
new
parserFormula
(
'
CSCH(1000000000)
'
,
"
A1
"
,
ws
);
ok
(
oParser
.
parse
()
);
strictEqual
(
oParser
.
calculate
().
getValue
(),
0
);
}
);
//ABS > Math.pow(2, 27)
test
(
"
Test:
\"
CSCH(-1000000000)
\"
"
,
function
()
{
oParser
=
new
parserFormula
(
'
CSCH(-1000000000)
'
,
"
A1
"
,
ws
);
ok
(
oParser
.
parse
()
);
strictEqual
(
oParser
.
calculate
().
getValue
(),
0
);
}
);
test
(
"
Test:
\"
CSCH(test)
\"
"
,
function
()
{
oParser
=
new
parserFormula
(
'
CSCH(test)
'
,
"
A1
"
,
ws
);
ok
(
oParser
.
parse
()
);
strictEqual
(
oParser
.
calculate
().
getValue
(),
"
#NAME?
"
);
}
);
test
(
"
Test:
\"
CSCH('test')
\"
"
,
function
()
{
oParser
=
new
parserFormula
(
'
CSCH("test")
'
,
"
A1
"
,
ws
);
ok
(
oParser
.
parse
()
);
strictEqual
(
oParser
.
calculate
().
getValue
(),
"
#VALUE!
"
);
}
);
test
(
"
Test:
\"
ARABIC('LVII')
\"
"
,
function
()
{
oParser
=
new
parserFormula
(
'
ARABIC("LVII")
'
,
"
A1
"
,
ws
);
ok
(
oParser
.
parse
()
);
...
...
cell/model/FormulaObjects/_xlfnFunctions.js
View file @
ada61c72
...
...
@@ -69,7 +69,7 @@
cFormulaFunctionGroup
[
'
Financial
'
].
push
(
cPDURATION
,
cRRI
);
cFormulaFunctionGroup
[
'
Mathematic
'
]
=
cFormulaFunctionGroup
[
'
Mathematic
'
]
||
[];
cFormulaFunctionGroup
[
'
Mathematic
'
].
push
(
cAGGREGATE
,
cBASE
,
cCEILING_MATH
,
cCEILING_PRECISE
,
cCOMBINA
,
c
CSCH
,
c
DECIMAL
,
cFLOOR_MATH
,
cFLOOR_PRECISE
,
cMUNIT
,
cSEC
,
cSECH
);
cCOMBINA
,
cDECIMAL
,
cFLOOR_MATH
,
cFLOOR_PRECISE
,
cMUNIT
,
cSEC
,
cSECH
);
cFormulaFunctionGroup
[
'
LookupAndReference
'
]
=
cFormulaFunctionGroup
[
'
LookupAndReference
'
]
||
[];
cFormulaFunctionGroup
[
'
LookupAndReference
'
].
push
(
cFORMULATEXT
);
cFormulaFunctionGroup
[
'
Information
'
]
=
cFormulaFunctionGroup
[
'
Information
'
]
||
[];
...
...
@@ -365,18 +365,6 @@
cCOVARIANCE_S
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
);
cCOVARIANCE_S
.
prototype
.
constructor
=
cCOVARIANCE_S
;
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function
cCSCH
()
{
cBaseFunction
.
call
(
this
,
"
CSCH
"
);
this
.
isXLFN
=
true
;
}
cCSCH
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
);
cCSCH
.
prototype
.
constructor
=
cCSCH
;
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
...
...
cell/model/FormulaObjects/mathematicFunctions.js
View file @
ada61c72
...
...
@@ -57,7 +57,7 @@
cFormulaFunctionGroup
[
'
Mathematic
'
]
=
cFormulaFunctionGroup
[
'
Mathematic
'
]
||
[];
cFormulaFunctionGroup
[
'
Mathematic
'
].
push
(
cABS
,
cACOS
,
cACOSH
,
cACOT
,
cACOTH
,
cARABIC
,
cASIN
,
cASINH
,
cATAN
,
cATAN2
,
cATANH
,
cCEILING
,
cCOMBIN
,
cCOS
,
cCOSH
,
cCOT
,
cCOTH
,
cCSC
,
cDEGREES
,
cECMA_CEILING
,
cEVEN
,
cEXP
,
cFACT
,
cFACTDOUBLE
,
cFLOOR
,
cGCD
,
cINT
,
cCOMBIN
,
cCOS
,
cCOSH
,
cCOT
,
cCOTH
,
cCSC
,
c
CSCH
,
c
DEGREES
,
cECMA_CEILING
,
cEVEN
,
cEXP
,
cFACT
,
cFACTDOUBLE
,
cFLOOR
,
cGCD
,
cINT
,
cISO_CEILING
,
cLCM
,
cLN
,
cLOG
,
cLOG10
,
cMDETERM
,
cMINVERSE
,
cMMULT
,
cMOD
,
cMROUND
,
cMULTINOMIAL
,
cODD
,
cPI
,
cPOWER
,
cPRODUCT
,
cQUOTIENT
,
cRADIANS
,
cRAND
,
cRANDBETWEEN
,
cROMAN
,
cROUND
,
cROUNDDOWN
,
cROUNDUP
,
cSERIESSUM
,
cSIGN
,
cSIN
,
cSINH
,
cSQRT
,
cSQRTPI
,
cSUBTOTAL
,
cSUM
,
cSUMIF
,
cSUMIFS
,
cSUMPRODUCT
,
cSUMSQ
,
cSUMX2MY2
,
cSUMX2PY2
,
...
...
@@ -1065,6 +1065,61 @@
};
};
/**
* @constructor
* @extends {AscCommonExcel.cBaseFunction}
*/
function
cCSCH
()
{
this
.
name
=
"
CSCH
"
;
this
.
value
=
null
;
this
.
argumentsCurrent
=
0
;
}
cCSCH
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
);
cCSCH
.
prototype
.
constructor
=
cCSCH
;
cCSCH
.
prototype
.
argumentsMin
=
1
;
cCSCH
.
prototype
.
argumentsMax
=
1
;
cCSCH
.
prototype
.
isXLFN
=
true
;
cCSCH
.
prototype
.
numFormat
=
AscCommonExcel
.
cNumFormatNone
;
cCSCH
.
prototype
.
Calculate
=
function
(
arg
)
{
var
arg0
=
arg
[
0
];
//TODO в документации к COTH написано максимальное значение - Math.pow(2, 27), но MS EXCEL в данном случае не выдает ошибку
//проверку на максиимальное значение убрал
if
(
cElementType
.
cellsRange
===
arg0
.
type
||
cElementType
.
cellsRange3D
===
arg0
.
type
)
{
arg0
=
arg0
.
cross
(
arguments
[
1
]);
}
arg0
=
arg0
.
tocNumber
();
if
(
cElementType
.
error
===
arg0
.
type
)
{
return
this
.
value
=
arg0
;
}
else
if
(
cElementType
.
array
===
arg0
.
type
)
{
arg0
.
foreach
(
function
(
elem
,
r
,
c
)
{
if
(
cElementType
.
number
===
elem
.
type
)
{
if
(
0
===
elem
.
getValue
()){
this
.
array
[
r
][
c
]
=
new
cError
(
cErrorType
.
division_by_zero
);
}
else
{
var
a
=
1
/
Math
.
sinh
(
elem
.
getValue
());
this
.
array
[
r
][
c
]
=
isNaN
(
a
)
?
new
cError
(
cErrorType
.
not_numeric
)
:
new
cNumber
(
a
);
}
}
else
{
this
.
array
[
r
][
c
]
=
new
cError
(
cErrorType
.
wrong_value_type
);
}
});
return
this
.
value
=
arg0
;
}
else
{
if
(
0
===
arg0
.
getValue
()){
return
this
.
value
=
new
cError
(
cErrorType
.
division_by_zero
);
}
var
a
=
1
/
Math
.
sinh
(
arg0
.
getValue
());
return
this
.
value
=
isNaN
(
a
)
?
new
cError
(
cErrorType
.
not_numeric
)
:
new
cNumber
(
a
);
}
};
cCSCH
.
prototype
.
getInfo
=
function
()
{
return
{
name
:
this
.
name
,
args
:
"
( x )
"
};
};
/**
* @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