Skip to content

S
sdkjs
Commit 6feaf098 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov
Browse files
Options

поправлен конструктор класса ошибка для формул. 

fixed:
Bug 24926 - Аргументы Frequency/Basis при вычислении в формуле YIELD не усекаются до целого
Bug 24918 - Функция XNPV рассчитывается без обязательных аргументов Rate, Values, Dates

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56870 954022d7-b5bf-4e40-9824-e11837661b57
parent 19d1f017
Show whitespace changes
Inline Side-by-side
Showing with 166 additions and 108 deletions
Excel/model/FormulaObjects/financialFunctions.js
View file @ 6feaf098
......@@ -604,8 +604,8 @@ cACCRINT.prototype.Calculate = function ( arg ) {
settlement = settlement.getValue();
rate = rate.getValue();
par = par.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
calcMethod = calcMethod.toBool();
if ( issue >= settlement || rate <= 0 || par <= 0 ||
......@@ -750,7 +750,7 @@ cACCRINTM.prototype.Calculate = function ( arg ) {
settlement = settlement.getValue();
rate = rate.getValue();
par = par.getValue();
basis = basis.getValue();
basis = Math.floor(basis.getValue());
if ( issue >= settlement || rate <= 0 || par <= 0 || basis < 0 || basis > 4 ) {
return this.value = new cError( cErrorType.not_numeric );
......@@ -865,9 +865,9 @@ cAMORDEGRC.prototype.Calculate = function ( arg ) {
cost = cost.getValue();
salvage = salvage.getValue();
period = period.getValue();
basis = basis.getValue();
basis = Math.floor(basis.getValue());
if( cost < 0 || salvage < 0 || period < 0 || rate <= 0 || basis == 2 ){
if( cost < 0 || salvage < 0 || period < 0 || rate <= 0 || basis == 2 || basis < 0 || basis > 4 ){
return this.value = new cError( cErrorType.not_numeric );
}
......@@ -1020,9 +1020,9 @@ cAMORLINC.prototype.Calculate = function ( arg ) {
salvage = salvage.getValue();
period = period.getValue();
rate = rate.getValue();
basis = basis.getValue();
basis = Math.floor(basis.getValue());
if ( cost < 0 || salvage < 0 || period < 0 || rate <= 0 || basis == 2 ){
if ( cost < 0 || salvage < 0 || period < 0 || rate <= 0 || basis == 2 || basis < 0 || basis > 4 ){
return this.value = new cError( cErrorType.not_numeric );
}
......@@ -1117,13 +1117,16 @@ cCOUPDAYBS.prototype.Calculate = function ( arg ) {
if ( frequency instanceof cError ) return this.value = frequency;
if ( basis instanceof cError ) return this.value = basis;
if ( settlement.getValue() >= maturity.getValue() || basis.getValue() < 0 || basis.getValue() > 4 || ( frequency.getValue() != 1 && frequency.getValue() != 2 && frequency.getValue() != 4 ) )
basis = Math.floor(basis.getValue());
frequency = Math.floor(frequency.getValue())
if ( settlement.getValue() >= maturity.getValue() || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) )
return this.value = new cError( cErrorType.not_numeric );
var settl = Date.prototype.getDateFromExcel( settlement.getValue() ),
matur = Date.prototype.getDateFromExcel( maturity.getValue() );
return this.value = new cNumber( getcoupdaybs( settl, matur, frequency.getValue(), basis.getValue() ) );
return this.value = new cNumber( getcoupdaybs( settl, matur, frequency, basis ) );
};
cCOUPDAYBS.prototype.getInfo = function () {
......@@ -1197,8 +1200,8 @@ cCOUPDAYS.prototype.Calculate = function ( arg ) {
settlement = settlement.getValue();
maturity = maturity.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement >= maturity || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) )
return this.value = new cError( cErrorType.not_numeric );
......@@ -1278,15 +1281,15 @@ cCOUPDAYSNC.prototype.Calculate = function ( arg ) {
if ( frequency instanceof cError ) return this.value = frequency;
if ( basis instanceof cError ) return this.value = basis;
if ( settlement.getValue() >= maturity.getValue() || basis.getValue() < 0 || basis.getValue() > 4 || ( frequency.getValue() != 1 && frequency.getValue() != 2 && frequency.getValue() != 4 ) )
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement.getValue() >= maturity.getValue() || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) )
return this.value = new cError( cErrorType.not_numeric );
var settl = Date.prototype.getDateFromExcel( settlement.getValue() ),
matur = Date.prototype.getDateFromExcel( maturity.getValue() );
frequency = frequency.getValue();
basis = basis.getValue();
return this.value = new cNumber( getcoupdaysnc( new Date( settl ), new Date( matur ), frequency, basis ) );
};
......@@ -1359,14 +1362,15 @@ cCOUPNCD.prototype.Calculate = function ( arg ) {
if ( frequency instanceof cError ) return this.value = frequency;
if ( basis instanceof cError ) return this.value = basis;
if ( settlement.getValue() >= maturity.getValue() || basis.getValue() < 0 || basis.getValue() > 4 || ( frequency.getValue() != 1 && frequency.getValue() != 2 && frequency.getValue() != 4 ) )
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement.getValue() >= maturity.getValue() || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) )
return this.value = new cError( cErrorType.not_numeric );
var settl = Date.prototype.getDateFromExcel( settlement.getValue() ),
matur = Date.prototype.getDateFromExcel( maturity.getValue() );
frequency = frequency.getValue();
this.value = new cNumber( getcoupncd( settl, matur, frequency ).getExcelDate() );
this.value.numFormat = 14;
return this.value;
......@@ -1441,14 +1445,15 @@ cCOUPNUM.prototype.Calculate = function ( arg ) {
if ( frequency instanceof cError ) return this.value = frequency;
if ( basis instanceof cError ) return this.value = basis;
if ( settlement.getValue() >= maturity.getValue() || basis.getValue() < 0 || basis.getValue() > 4 || ( frequency.getValue() != 1 && frequency.getValue() != 2 && frequency.getValue() != 4 ) )
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement.getValue() >= maturity.getValue() || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) )
return this.value = new cError( cErrorType.not_numeric );
var settl = Date.prototype.getDateFromExcel( settlement.getValue() ),
matur = Date.prototype.getDateFromExcel( maturity.getValue() );
frequency = frequency.getValue();
var res = getcoupnum( settl, matur, frequency );
return this.value = new cNumber( res );
......@@ -1522,14 +1527,15 @@ cCOUPPCD.prototype.Calculate = function ( arg ) {
if ( frequency instanceof cError ) return this.value = frequency;
if ( basis instanceof cError ) return this.value = basis;
if ( settlement.getValue() >= maturity.getValue() || basis.getValue() < 0 || basis.getValue() > 4 || ( frequency.getValue() != 1 && frequency.getValue() != 2 && frequency.getValue() != 4 ) )
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement.getValue() >= maturity.getValue() || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) )
return this.value = new cError( cErrorType.not_numeric );
var settl = Date.prototype.getDateFromExcel( settlement.getValue() ),
matur = Date.prototype.getDateFromExcel( maturity.getValue() );
frequency = frequency.getValue();
var n = lcl_GetCouppcd( settl, matur, frequency );
this.value = new cNumber( n.getExcelDate() );
......@@ -2066,10 +2072,12 @@ cDISC.prototype.Calculate = function ( arg ) {
if ( redemption instanceof cError ) return this.value = redemption;
if ( basis instanceof cError ) return this.value = basis;
if ( settlement.getValue() >= maturity.getValue() || pr.getValue() <= 0 || redemption.getValue() <= 0 || basis.getValue() < 0 || basis.getValue() > 4 )
basis = Math.floor(basis.getValue());
if ( settlement.getValue() >= maturity.getValue() || pr.getValue() <= 0 || redemption.getValue() <= 0 || basis < 0 || basis > 4 )
return this.value = new cError( cErrorType.not_numeric );
var res = ( 1 - pr.getValue() / redemption.getValue() ) / yearFrac( Date.prototype.getDateFromExcel( settlement.getValue() ), Date.prototype.getDateFromExcel( maturity.getValue() ), basis.getValue() );
var res = ( 1 - pr.getValue() / redemption.getValue() ) / yearFrac( Date.prototype.getDateFromExcel( settlement.getValue() ), Date.prototype.getDateFromExcel( maturity.getValue() ), basis );
this.value = new cNumber( res );
this.value.numFormat = 9;
......@@ -2309,8 +2317,8 @@ cDURATION.prototype.Calculate = function ( arg ) {
maturity = maturity.getValue();
coupon = coupon.getValue();
yld = yld.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement >= maturity || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) || yld < 0 || coupon < 0 ){
return this.value = new cError( cErrorType.not_numeric );
......@@ -2618,11 +2626,17 @@ cINTRATE.prototype.Calculate = function ( arg ) {
if ( redemption instanceof cError ) return this.value = redemption;
if ( basis instanceof cError ) return this.value = basis;
if ( settlement.getValue() >= maturity.getValue() || investment.getValue() <= 0 || redemption.getValue() <= 0 || basis.getValue() < 0 || basis.getValue() > 4 )
return this.value = new cError( cErrorType.not_numeric );
settlement = settlement.getValue();
maturity = maturity.getValue();
investment = investment.getValue();
redemption = redemption.getValue();
basis = Math.floor(basis.getValue());
if ( settlement >= maturity || investment <= 0 || redemption <= 0 || basis < 0 || basis > 4 ){
return this.value = new cError( cErrorType.not_numeric );
}
var res = ( ( redemption.getValue() / investment.getValue() ) - 1 ) / yearFrac( Date.prototype.getDateFromExcel( settlement.getValue() ), Date.prototype.getDateFromExcel( maturity.getValue() ), basis.getValue() );
var res = ( ( redemption / investment ) - 1 ) / yearFrac( Date.prototype.getDateFromExcel( settlement ), Date.prototype.getDateFromExcel( maturity ), basis );
this.value = new cNumber( res );
this.value.numFormat = 9;
......@@ -3041,8 +3055,8 @@ cMDURATION.prototype.Calculate = function ( arg ) {
maturity = maturity.getValue();
coupon = coupon.getValue();
yld = yld.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement >= maturity || basis < 0 || basis > 4 || ( frequency != 1 && frequency != 2 && frequency != 4 ) || yld < 0 || coupon < 0 ){
return this.value = new cError( cErrorType.not_numeric );
......@@ -3541,16 +3555,17 @@ cODDFPRICE.prototype.Calculate = function ( arg ) {
rate = rate.getValue();
yld = yld.getValue();
redemption = redemption.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( maturity <= first_coupon || first_coupon <= settlement ||
settlement <= issue ||
basis < 0 || basis > 4 ||
yld < 0 || rate < 0 ||
redemption < 0 ||
frequency != 1 && frequency != 2 && frequency != 4 )
frequency != 1 && frequency != 2 && frequency != 4 ){
return this.value = new cError( cErrorType.not_numeric );
}
var settl = Date.prototype.getDateFromExcel( settlement ),
matur = Date.prototype.getDateFromExcel( maturity ),
......@@ -3686,8 +3701,8 @@ cODDFYIELD.prototype.Calculate = function ( arg ) {
rate = rate.getValue();
pr = pr.getValue();
redemption = redemption.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( maturity <= first_coupon || first_coupon <= settlement ||
settlement <= issue ||
......@@ -3892,8 +3907,8 @@ cODDLPRICE.prototype.Calculate = function ( arg ) {
rate = rate.getValue();
yld = yld.getValue();
redemption = redemption.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( maturity <= settlement || settlement <= last_interest || basis < 0 || basis > 4 || yld < 0 || rate < 0 ||
frequency != 1 && frequency != 2 && frequency != 4 || redemption <= 0 ){
......@@ -4031,8 +4046,8 @@ cODDLYIELD.prototype.Calculate = function ( arg ) {
rate = rate.getValue();
pr = pr.getValue();
redemption = redemption.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( maturity <= settlement || settlement <= last_interest || basis < 0 || basis > 4 || pr < 0 || rate < 0 ||
frequency != 1 && frequency != 2 && frequency != 4 || redemption <= 0 ){
......@@ -4365,8 +4380,8 @@ cPRICE.prototype.Calculate = function ( arg ) {
rate = rate.getValue();
yld = yld.getValue();
redemption = redemption.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement >= maturity ||
basis < 0 || basis > 4 ||
......@@ -4464,7 +4479,7 @@ cPRICEDISC.prototype.Calculate = function ( arg ) {
maturity = maturity.getValue();
discount = discount.getValue();
redemption = redemption.getValue();
basis = basis.getValue();
basis = Math.floor(basis.getValue());
if ( settlement >= maturity ||
basis < 0 || basis > 4 ||
......@@ -4573,7 +4588,7 @@ cPRICEMAT.prototype.Calculate = function ( arg ) {
issue = issue.getValue();
rate = rate.getValue();
yld = yld.getValue();
basis = basis.getValue();
basis = Math.floor(basis.getValue());
if ( settlement >= maturity ||
basis < 0 || basis > 4 ||
......@@ -4870,7 +4885,7 @@ cRECEIVED.prototype.Calculate = function ( arg ) {
maturity = maturity.getValue();
investment = investment.getValue();
discount = discount.getValue();
basis = basis.getValue();
basis = Math.floor(basis.getValue());
if ( settlement >= maturity || investment <= 0 || discount <= 0 || basis < 0 || basis > 4 ){
return this.value = new cError( cErrorType.not_numeric );
......@@ -5651,18 +5666,24 @@ cXNPV.prototype.Calculate = function ( arg ) {
function xnpv( rate, valueArray, dateArray ) {
var res = 0, vaTmp, daTmp, r = rate.getValue();
if ( dateArray.length != valueArray.length )
if ( dateArray.length != valueArray.length ){
return new cError( cErrorType.not_numeric );
}
var d1 = dateArray[0].tocNumber();
if( !( dateArray[0] instanceof cNumber ) || !( valueArray[0] instanceof cNumber ) ){
return new cError( cErrorType.wrong_value_type );
}
var d1 = Math.floor(dateArray[0].getValue()), wasNeg = false, wasPos = false;
for ( var i = 0; i < dateArray.length; i++ ) {
vaTmp = valueArray[i].tocNumber();
daTmp = dateArray[i].tocNumber();
if ( vaTmp instanceof cError || daTmp instanceof cError )
if ( vaTmp instanceof cError || daTmp instanceof cError ){
return new cError( cErrorType.not_numeric );
}
res += valueArray[i].getValue() / ( Math.pow( ( 1 + r ), ( dateArray[i].getValue() - d1.getValue() ) / 365 ) );
res += vaTmp.getValue() / ( Math.pow( ( 1 + r ), ( Math.floor(daTmp.getValue()) - d1 ) / 365 ) );
}
return new cNumber( res );
......@@ -5672,6 +5693,10 @@ cXNPV.prototype.Calculate = function ( arg ) {
arg0 = arg0.cross( arguments[1].first );
}
if( !(arg0 instanceof cNumber) ){
return this.value = new cError( cErrorType.not_available );
}
arg0 = arg0.tocNumber();
if ( arg0 instanceof cArray ) {
......@@ -5685,58 +5710,82 @@ cXNPV.prototype.Calculate = function ( arg ) {
if ( arg1 instanceof cArea ) {
arg1.foreach2( function ( c ) {
valueArray.push( c )
if( c instanceof cNumber ){
valueArray.push( c );
}
else{
valueArray.push( new cError( cErrorType.not_numeric ) );
}
} );
// valueArray = arg1.getMatrix();
}
else if ( arg1 instanceof cArray ) {
arg1.foreach( function ( c ) {
valueArray.push( c )
if( c instanceof cNumber ){
valueArray.push( c );
}
else{
valueArray.push( new cError( cErrorType.not_numeric ) );
}
} )
}
else if ( arg1 instanceof cArea3D ) {
if ( arg1.wsFrom == arg1.wsTo ) {
valueArray = arg1.getMatrix()[0];
}
else
else{
return this.value = new cError( cErrorType.wrong_value_type );
}
}
else {
arg1 = arg1.tocNumber();
if ( arg1 instanceof cError ) {
return this.value = new cError( cErrorType.not_numeric )
}
else
else{
valueArray[0] = arg1;
}
}
if ( arg2 instanceof cArea ) {
arg2.foreach2( function ( c ) {
dateArray.push( c )
if( c instanceof cNumber ){
dateArray.push( c );
}
else{
dateArray.push( new cError( cErrorType.not_numeric ) );
}
} );
// dateArray = arg2.getMatrix();
}
else if ( arg2 instanceof cArray ) {
// dateArray = arg2.getMatrix();
arg2.foreach( function ( c ) {
dateArray.push( c )
if( c instanceof cNumber ){
dateArray.push( c );
}
else{
dateArray.push( new cError( cErrorType.not_numeric ) );
}
} )
// dateArray = arg2.getMatrix();
}
else if ( arg2 instanceof cArea3D ) {
if ( arg2.wsFrom == arg2.wsTo ) {
dateArray = arg2.getMatrix()[0];
}
else
else{
return this.value = new cError( cErrorType.wrong_value_type );
}
}
else {
arg2 = arg2.tocNumber();
if ( arg2 instanceof cError ) {
return this.value = new cError( cErrorType.not_numeric )
}
else
else{
dateArray[0] = arg2;
}
}
return this.value = xnpv( arg0, valueArray, dateArray );
......@@ -5845,8 +5894,8 @@ cYIELD.prototype.Calculate = function ( arg ) {
rate = rate.getValue();
pr = pr.getValue();
redemption = redemption.getValue();
frequency = frequency.getValue();
basis = basis.getValue();
frequency = Math.floor(frequency.getValue());
basis = Math.floor(basis.getValue());
if ( settlement >= maturity ||
basis < 0 || basis > 4 ||
......@@ -5946,7 +5995,7 @@ cYIELDDISC.prototype.Calculate = function ( arg ) {
maturity = maturity.getValue();
pr = pr.getValue();
redemption = redemption.getValue();
basis = basis.getValue();
basis = Math.floor(basis.getValue());
if ( settlement >= maturity ||
basis < 0 || basis > 4 ||
......@@ -6058,7 +6107,7 @@ cYIELDMAT.prototype.Calculate = function ( arg ) {
issue = issue.getValue();
rate = rate.getValue();
pr = pr.getValue();
basis = basis.getValue();
basis = Math.floor(basis.getValue());
if ( settlement >= maturity ||
basis < 0 || basis > 4 ||
......
Excel/model/FormulaObjects/parserFormula.js
View file @ 6feaf098
......@@ -356,14 +356,8 @@ cString.prototype.tryConvert = function () {
function cBool( val ) {
cBaseType.call( this, val );
this.needRecalc = false;
this.numFormat = null;
this.ca = false;
this.node = undefined;
this.type = cElementType.bool;
var v = val.toString().toUpperCase();
this.value = v === "TRUE";
this.value = val.toString().toUpperCase() === "TRUE";
}
cBool.prototype = Object.create( cBaseType.prototype );
......@@ -410,6 +404,8 @@ function cError( val ) {
case "#NULL!":
case cErrorType.null_value:
{
this.value = "#NULL!";
this.errorType = cErrorType.null_value;
break;
}
case "#DIV/0!":
......@@ -660,19 +656,24 @@ cArea.prototype.foreach2 = function ( action ) {
var val, cellType;
if ( cell ) {
cellType = cell.getType();
if ( cellType === CellValueType.Number ) {
switch( cellType ){
case CellValueType.Number:{
cell.getValueWithoutFormat() === "" ? val = new cEmpty() : val = new cNumber( cell.getValueWithoutFormat() );
break;
}
else if ( cellType === CellValueType.Bool ) {
case CellValueType.Bool:{
val = new cBool( cell.getValueWithoutFormat() );
break;
}
else if ( cellType === CellValueType.Error ) {
case CellValueType.Error:{
val = new cError( cell.getValueWithoutFormat() );
break;
}
else if ( cellType === CellValueType.String ) {
case CellValueType.String:{
val = new cString( cell.getValueWithoutFormat() );
break;
}
else {
default:{
if ( cell.getValueWithoutFormat() && cell.getValueWithoutFormat() !== "" ) {
val = new cNumber( cell.getValueWithoutFormat() );
}
......@@ -681,6 +682,7 @@ cArea.prototype.foreach2 = function ( action ) {
}
}
}
}
else {
val = new cEmpty();
}
......@@ -1043,30 +1045,37 @@ cArea3D.prototype.foreach2 = function ( action ) {
var val;
if ( _cell ) {
var cellType = _cell.getType();
if ( cellType === CellValueType.Number ) {
switch( cellType ){
case CellValueType.Number:{
if ( _cell.getValueWithoutFormat() === "" ) {
val = new cEmpty();
}
else {
val = new cNumber( _cell.getValueWithoutFormat() );
}
break;
}
else if ( cellType === CellValueType.Bool ) {
case CellValueType.Bool:{
val = new cBool( _cell.getValueWithoutFormat() );
break;
}
else if ( cellType === CellValueType.Error ) {
case CellValueType.Error:{
val = new cError( _cell.getValueWithoutFormat() );
break;
}
else if ( cellType === CellValueType.String ) {
case CellValueType.String:{
val = new cString( _cell.getValueWithoutFormat() );
break;
}
else {
default:{
if ( _cell.getValueWithoutFormat() && _cell.getValueWithoutFormat() !== "" ) {
val = new cNumber( _cell.getValueWithoutFormat() );
}
else {
val = checkTypeCell( "" + _cell.getValueWithoutFormat() );
}
break;
}
}
}
else {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7