evo/EvoCalculator.Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change length of nmperDeprecation+2 columns

Browse Source
This commit is contained in:
Chika 2020-12-01 19:39:11 +03:00
parent 505b08fdf6
commit bcede53490
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
EvoCalculator.Core/Controllers/v1/CalculationController.cs
View File

@ -46,7 +46,7 @@ namespace EvoCalculator.Core.Controllers.V1
var maxColumnLength = preparedValues.Nmper > preparedValues.NmperDeprecation var maxColumnLength = preparedValues.Nmper > preparedValues.NmperDeprecation
? preparedValues.Nmper + 1 ? preparedValues.Nmper + 1
: preparedValues.NmperDeprecation + 2; : preparedValues.NmperDeprecation + 2;
try try
{ {
var dateColumn = new DateColumn(preparedValues.Nmper + 1); var dateColumn = new DateColumn(preparedValues.Nmper + 1);
@ -107,10 +107,10 @@ namespace EvoCalculator.Core.Controllers.V1
var deprecationLpColumn = new DeprecationLPColumn(preparedValues.Nmper + 1); var deprecationLpColumn = new DeprecationLPColumn(preparedValues.Nmper + 1);
deprecationLpColumn.ComputeValues(preparedValues, acceptSumColumn); deprecationLpColumn.ComputeValues(preparedValues, acceptSumColumn);
var deprecationLdColumn = new DeprecationLDColumn(preparedValues.NmperDeprecation + 2); var deprecationLdColumn = new DeprecationLDColumn(maxColumnLength);
deprecationLdColumn.ComputeValues(preparedValues); deprecationLdColumn.ComputeValues(preparedValues);
var deprecationColumn = new DeprecationColumn(preparedValues.NmperDeprecation + 2); var deprecationColumn = new DeprecationColumn(maxColumnLength);
deprecationColumn.ComputeValues(deprecationLpColumn, deprecationLdColumn); deprecationColumn.ComputeValues(deprecationLpColumn, deprecationLdColumn);
var kaskoBonusGrSumColumn = new KaskoBonusGrSumColumn(preparedValues.Nmper + 1); var kaskoBonusGrSumColumn = new KaskoBonusGrSumColumn(preparedValues.Nmper + 1);
@ -159,7 +159,7 @@ namespace EvoCalculator.Core.Controllers.V1
var nsibBruttoGrColumn = new NSIBBruttoGrColumn(preparedValues.Nmper + 1); var nsibBruttoGrColumn = new NSIBBruttoGrColumn(preparedValues.Nmper + 1);
nsibBruttoGrColumn.ComputeValues(preparedValues); nsibBruttoGrColumn.ComputeValues(preparedValues);
var taxColumn = new TaxColumn(preparedValues.NmperDeprecation + 2); var taxColumn = new TaxColumn(maxColumnLength);
taxColumn.ComputeValues(constants, sumColumn, acceptInsuranceColumn, deprecationColumn, taxColumn.ComputeValues(constants, sumColumn, acceptInsuranceColumn, deprecationColumn,
ratExpensesColumn, ratExpensesColumn,
registrExpensesColumn, comissionBonusExpensesColumn, transExprensesColumn, npvBonusExpensesColumn, registrExpensesColumn, comissionBonusExpensesColumn, transExprensesColumn, npvBonusExpensesColumn,
@ -178,7 +178,7 @@ namespace EvoCalculator.Core.Controllers.V1
tlmGrColumn, gpsGrColumn, npvBonusExpensesColumn, agentComissionExpensesColumn); tlmGrColumn, gpsGrColumn, npvBonusExpensesColumn, agentComissionExpensesColumn);
cashflowMsfoColumn.PostCheck(additionalData); cashflowMsfoColumn.PostCheck(additionalData);
var cashflowNpvColumn = new CashflowNPVColumn(preparedValues.NmperDeprecation + 2); var cashflowNpvColumn = new CashflowNPVColumn(maxColumnLength);
cashflowNpvColumn.ComputeValues(preparedValues, sumColumn, npvBonusExpensesColumn, cashflowNpvColumn.ComputeValues(preparedValues, sumColumn, npvBonusExpensesColumn,
agentComissionExpensesColumn, taxColumn, nsibExpensesColumn, negativeCashflowColumn, agentComissionExpensesColumn, taxColumn, nsibExpensesColumn, negativeCashflowColumn,
ratExpensesColumn, ratExpensesColumn,
@ -187,7 +187,7 @@ namespace EvoCalculator.Core.Controllers.V1
var npvWeightColumn = new NPVWeightColumn(maxColumnLength); var npvWeightColumn = new NPVWeightColumn(maxColumnLength);
npvWeightColumn.ComputeValues(preparedValues, dateTempColumn); npvWeightColumn.ComputeValues(preparedValues, dateTempColumn);
var npvColumn = new NPVColumn(preparedValues.NmperDeprecation + 2, dateTempColumn); var npvColumn = new NPVColumn(maxColumnLength, dateTempColumn);
npvColumn.ComputeValues(cashflowNpvColumn, npvWeightColumn); npvColumn.ComputeValues(cashflowNpvColumn, npvWeightColumn);
var irrGrColumn = new IRRGrColumn(preparedValues.Nmper + 1); var irrGrColumn = new IRRGrColumn(preparedValues.Nmper + 1);
@ -232,10 +232,10 @@ namespace EvoCalculator.Core.Controllers.V1
var cashflowMsfoFinalColumn = new CashflowMSFOFinalColumn(preparedValues.Nmper + 1, dateTempColumn); var cashflowMsfoFinalColumn = new CashflowMSFOFinalColumn(preparedValues.Nmper + 1, dateTempColumn);
cashflowMsfoFinalColumn.ComputeValues(preparedValues, cashflowMsfoColumn, extraBonusSumColumn); cashflowMsfoFinalColumn.ComputeValues(preparedValues, cashflowMsfoColumn, extraBonusSumColumn);
var cashflowNpvFinalColumn = new CashflowNPVFinalColumn(preparedValues.NmperDeprecation + 2); var cashflowNpvFinalColumn = new CashflowNPVFinalColumn(maxColumnLength);
cashflowNpvFinalColumn.ComputeValues(preparedValues, extraBonusSumColumn, cashflowNpvColumn); cashflowNpvFinalColumn.ComputeValues(preparedValues, extraBonusSumColumn, cashflowNpvColumn);
var npvFinalColumn = new NPVFinalColumn(preparedValues.NmperDeprecation + 2, dateTempColumn); var npvFinalColumn = new NPVFinalColumn(maxColumnLength, dateTempColumn);
npvFinalColumn.ComputeValues(cashflowNpvFinalColumn, npvWeightColumn); npvFinalColumn.ComputeValues(cashflowNpvFinalColumn, npvWeightColumn);
var directorBonusSumColumn = new DirectorBonusSumColumn(preparedValues.Nmper + 1); var directorBonusSumColumn = new DirectorBonusSumColumn(preparedValues.Nmper + 1);
@ -244,10 +244,10 @@ namespace EvoCalculator.Core.Controllers.V1
var cashflowMsfoFinal2Column = new CashflowMSFOFinal2Column(preparedValues.Nmper + 1, dateTempColumn); var cashflowMsfoFinal2Column = new CashflowMSFOFinal2Column(preparedValues.Nmper + 1, dateTempColumn);
cashflowMsfoFinal2Column.ComputeValues(preparedValues, directorBonusSumColumn, cashflowMsfoFinalColumn); cashflowMsfoFinal2Column.ComputeValues(preparedValues, directorBonusSumColumn, cashflowMsfoFinalColumn);
var cashflowNpvFinal2Column = new CashflowNPVFinal2Column(preparedValues.NmperDeprecation + 2); var cashflowNpvFinal2Column = new CashflowNPVFinal2Column(maxColumnLength);
cashflowNpvFinal2Column.ComputeValues(preparedValues, cashflowNpvFinalColumn, directorBonusSumColumn); cashflowNpvFinal2Column.ComputeValues(preparedValues, cashflowNpvFinalColumn, directorBonusSumColumn);
var npvFinal2Column = new NPVFinal2Column(preparedValues.NmperDeprecation + 2, dateTempColumn); var npvFinal2Column = new NPVFinal2Column(maxColumnLength, dateTempColumn);
npvFinal2Column.ComputeValues(cashflowNpvFinal2Column, npvWeightColumn); npvFinal2Column.ComputeValues(cashflowNpvFinal2Column, npvWeightColumn);
postValues.PriceUP.ComputeValue(preparedValues, sumColumn); postValues.PriceUP.ComputeValue(preparedValues, sumColumn);