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

Post/v2/SumIRRColumn: fix FillValues

Browse Source
This commit is contained in:
vchikalkin 2024-02-14 16:45:46 +03:00
parent ff6ae4fe36
commit ab6a724424
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
EvoCalculator.Core.PostCalculation/v2/Columns/Next/SumIRRColumn/SumIRRColumnVT2.cs
View File

@ -39,7 +39,7 @@ namespace EvoCalculator.Core.PostCalculation.v2.Columns.Next
_currentDateTempColumn = currentDateTempColumn; _currentDateTempColumn = currentDateTempColumn;
_currentSumColumn = currentSumColumn; _currentSumColumn = currentSumColumn;
} }
private void FillValues() private void FillValues()
{ {
var costInsurances = Array.Empty<decimal>(); var costInsurances = Array.Empty<decimal>();
@ -92,17 +92,21 @@ namespace EvoCalculator.Core.PostCalculation.v2.Columns.Next
var xnpvValues = Array<decimal>.Concat( var xnpvValues = Array<decimal>.Concat(
new[] { 0m, }, new[] { 0m, },
_sumColumn.GetValues(_preparedValues.EditPaymentNumber), _currentSumColumn.GetValues(_preparedValues.EditPaymentNumber)
costInsurances,
new[] { evoKaskoSum }
); );
var xnpvDates = Array<DateTime>.Concat( var xnpvDates = Array<DateTime>.Concat(
new[] { _dateTempColumn.GetValue(_preparedValues.EditPaymentNumber - 1) }, new[] { _dateTempColumn.GetValue(_preparedValues.EditPaymentNumber - 1) },
_dateTempColumn.GetValues(_preparedValues.EditPaymentNumber), _currentDateTempColumn.GetValues(_preparedValues.EditPaymentNumber),
dateStartPeriodInsurances, dateStartPeriodInsurances
new[] { evoKaskoDate }
); );
if (evoKasko != null)
{
xnpvValues = xnpvValues.Append(evoKaskoSum).ToArray();
xnpvDates = xnpvDates.Append(evoKaskoDate).ToArray();
}
var xnpvColumn = var xnpvColumn =
new BaseColumnWithXNPV(0, new DateTempColumn(0) { Values = xnpvDates }, _currentSumColumn.IRR) new BaseColumnWithXNPV(0, new DateTempColumn(0) { Values = xnpvDates }, _currentSumColumn.IRR)
{ {
@ -112,10 +116,14 @@ namespace EvoCalculator.Core.PostCalculation.v2.Columns.Next
Values = Array<decimal>.Concat( Values = Array<decimal>.Concat(
new[] { -xnpvColumn.XNPV }, new[] { -xnpvColumn.XNPV },
_sumColumn.Values.Skip(_preparedValues.EditPaymentNumber), _sumColumn.Values.Skip(_preparedValues.EditPaymentNumber),
costInsurances, costInsurances
new[] { evoKaskoSum }
); );
if (evoKasko != null)
{
Values = Values.Append(evoKaskoSum).ToArray();
}
Dates = xnpvDates; Dates = xnpvDates;
} }