add COT/COTH formulas

cell/model/FormulaObjects/_xlfnFunctions.js

@@ -69,7 +69,7 @@
 	cFormulaFunctionGroup['Financial'].push(cPDURATION, cRRI);
 	cFormulaFunctionGroup['Mathematic'] = cFormulaFunctionGroup['Mathematic'] || [];
 	cFormulaFunctionGroup['Mathematic'].push(cAGGREGATE, cBASE, cCEILING_MATH, cCEILING_PRECISE,
-		cCOMBINA, cCOT, cCOTH, cCSC, cCSCH, cDECIMAL, cFLOOR_MATH, cFLOOR_PRECISE, cMUNIT, cSEC, cSECH);
+		cCOMBINA, cCSC, cCSCH, cDECIMAL, cFLOOR_MATH, cFLOOR_PRECISE, cMUNIT, cSEC, cSECH);
 	cFormulaFunctionGroup['LookupAndReference'] = cFormulaFunctionGroup['LookupAndReference'] || [];
 	cFormulaFunctionGroup['LookupAndReference'].push(cFORMULATEXT);
 	cFormulaFunctionGroup['Information'] = cFormulaFunctionGroup['Information'] || [];
@@ -341,30 +341,6 @@
 	cCONFIDENCE_T.prototype = Object.create(cBaseFunction.prototype);
 	cCONFIDENCE_T.prototype.constructor = cCONFIDENCE_T;
 
-	/**
-	 * @constructor
-	 * @extends {AscCommonExcel.cBaseFunction}
-	 */
-	function cCOT() {
-		cBaseFunction.call(this, "COT");
-		this.isXLFN = true;
-	}
-
-	cCOT.prototype = Object.create(cBaseFunction.prototype);
-	cCOT.prototype.constructor = cCOT;
-
-	/**
-	 * @constructor
-	 * @extends {AscCommonExcel.cBaseFunction}
-	 */
-	function cCOTH() {
-		cBaseFunction.call(this, "COTH");
-		this.isXLFN = true;
-	}
-
-	cCOTH.prototype = Object.create(cBaseFunction.prototype);
-	cCOTH.prototype.constructor = cCOTH;
-
 	/**
 	 * @constructor
 	 * @extends {AscCommonExcel.cBaseFunction}

cell/model/FormulaObjects/mathematicFunctions.js

@@ -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, cDEGREES, cECMA_CEILING, cEVEN, cEXP, cFACT, cFACTDOUBLE, cFLOOR, cGCD, cINT,
+		cCOMBIN, cCOS, cCOSH, cCOT, cCOTH, cDEGREES, 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,
@@ -890,6 +890,121 @@
 		};
 	};
 
+	/**
+	 * @constructor
+	 * @extends {AscCommonExcel.cBaseFunction}
+	 */
+	function cCOT() {
+		this.name = "COT";
+		this.value = null;
+		this.argumentsCurrent = 0;
+	}
+	cCOT.prototype = Object.create(cBaseFunction.prototype);
+	cCOT.prototype.constructor = cCOT;
+	cCOT.prototype.argumentsMin = 1;
+	cCOT.prototype.argumentsMax = 1;
+	cCOT.prototype.isXLFN = true;
+	cCOT.prototype.numFormat = AscCommonExcel.cNumFormatNone;
+	cCOT.prototype.Calculate = function (arg) {
+		var arg0 = arg[0];
+		var maxVal = Math.pow(2, 27);
+		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 if (Math.abs(elem.getValue()) >= maxVal) {
+						this.array[r][c] = new cError(cErrorType.not_numeric);
+					}
+					else{
+						var a = 1 / Math.tan(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);
+			}
+			else if (Math.abs(arg0.getValue()) >= maxVal) {
+				return this.value = new cError(cErrorType.not_numeric);
+			}
+
+			var a = 1 / Math.tan(arg0.getValue());
+			return this.value = isNaN(a) ? new cError(cErrorType.not_numeric) : new cNumber(a);
+		}
+	};
+	cCOT.prototype.getInfo = function () {
+		return {
+			name: this.name, args: "( x )"
+		};
+	};
+
+	/**
+	 * @constructor
+	 * @extends {AscCommonExcel.cBaseFunction}
+	 */
+	function cCOTH() {
+		this.name = "COTH";
+		this.value = null;
+		this.argumentsCurrent = 0;
+	}
+	cCOTH.prototype = Object.create(cBaseFunction.prototype);
+	cCOTH.prototype.constructor = cCOTH;
+	cCOTH.prototype.argumentsMin = 1;
+	cCOTH.prototype.argumentsMax = 1;
+	cCOTH.prototype.isXLFN = true;
+	cCOTH.prototype.numFormat = AscCommonExcel.cNumFormatNone;
+	cCOTH.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.tanh(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.tanh(arg0.getValue());
+			return this.value = isNaN(a) ? new cError(cErrorType.not_numeric) : new cNumber(a);
+		}
+	};
+	cCOTH.prototype.getInfo = function () {
+		return {
+			name: this.name, args: "( x )"
+		};
+	};
+
 	/**
 	 * @constructor
 	 * @extends {AscCommonExcel.cBaseFunction}

cell/model/FormulaObjects/parserFormula.js

@@ -537,8 +537,20 @@ Math.cosh = function ( arg ) {
     return (this.pow( this.E, arg ) + this.pow( this.E, -arg )) / 2;
 };
 
-Math.tanh = function ( arg ) {
-    return this.sinh( arg ) / this.cosh( arg );
+Math.tanh = Math.tanh || function(x) {
+	if (x === Infinity) {
+		return 1;
+	} else if (x === -Infinity) {
+		return -1;
+	} else {
+		var y = Math.exp(2 * x);
+		if (y === Infinity) {
+			return 1;
+		} else if (y === -Infinity) {
+			return -1;
+		}
+		return (y - 1) / (y + 1);
+	}
 };
 
 Math.asinh = function ( arg ) {