From 9b9a22efa72669a8e076869fcccea2ca315021ca Mon Sep 17 00:00:00 2001 From: Chika Date: Tue, 21 Sep 2021 16:10:16 +0300 Subject: [PATCH] IRRGrColumn: replace cashflowColumn with cashflowMSFOColumn --- EvoCalculator.Core.Calculation/v1/Columns/IRRGrColumn.cs | 4 ++-- .../v1/Managers/Calculation/CalculateByTotalExpected.cs | 2 +- .../v1/Managers/Calculation/CalculateDefault.cs | 2 +- .../v2/Managers/Calculation/CalculateByTotalExpected.cs | 2 +- .../v2/Managers/Calculation/CalculateDefault.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EvoCalculator.Core.Calculation/v1/Columns/IRRGrColumn.cs b/EvoCalculator.Core.Calculation/v1/Columns/IRRGrColumn.cs index d9cf628..5da6bc7 100644 --- a/EvoCalculator.Core.Calculation/v1/Columns/IRRGrColumn.cs +++ b/EvoCalculator.Core.Calculation/v1/Columns/IRRGrColumn.cs @@ -9,10 +9,10 @@ namespace EvoCalculator.Core.Calculation.v1.Columns { } - public void ComputeValues(DateTempColumn dateTempColumn, BaseColumnWithXIRR cashflowColumn) + public void ComputeValues(DateTempColumn dateTempColumn, BaseColumnWithXIRR cashflowMSFOColumn) { for (var i = 1; i < Values.Length; i++) - Values[i] = Math.Pow(1 + cashflowColumn.IRR, + Values[i] = Math.Pow(1 + cashflowMSFOColumn.IRR, (double)(dateTempColumn.Values[i] - dateTempColumn.Values[i - 1]).Days / 365) - 1; } } diff --git a/EvoCalculator.Core.Calculation/v1/Managers/Calculation/CalculateByTotalExpected.cs b/EvoCalculator.Core.Calculation/v1/Managers/Calculation/CalculateByTotalExpected.cs index ae56458..931cec5 100644 --- a/EvoCalculator.Core.Calculation/v1/Managers/Calculation/CalculateByTotalExpected.cs +++ b/EvoCalculator.Core.Calculation/v1/Managers/Calculation/CalculateByTotalExpected.cs @@ -175,7 +175,7 @@ namespace EvoCalculator.Core.Calculation.v1.Managers.Calculation npvColumn.ComputeValues(cashflowNpvColumn, npvWeightColumn); var irrGrColumn = new IRRGrColumn(preparedValues.Nmper + 1); - irrGrColumn.ComputeValues(dateTempColumn, cashflowColumn); + irrGrColumn.ComputeValues(dateTempColumn, cashflowMsfoColumn); var niColumn = new NIColumn(preparedValues.Nmper + 1); niColumn.ComputeValues(preparedValues, cashflowColumn, irrGrColumn); diff --git a/EvoCalculator.Core.Calculation/v1/Managers/Calculation/CalculateDefault.cs b/EvoCalculator.Core.Calculation/v1/Managers/Calculation/CalculateDefault.cs index 9b66d06..3577f88 100644 --- a/EvoCalculator.Core.Calculation/v1/Managers/Calculation/CalculateDefault.cs +++ b/EvoCalculator.Core.Calculation/v1/Managers/Calculation/CalculateDefault.cs @@ -175,7 +175,7 @@ namespace EvoCalculator.Core.Calculation.v1.Managers.Calculation npvColumn.ComputeValues(cashflowNpvColumn, npvWeightColumn); var irrGrColumn = new IRRGrColumn(preparedValues.Nmper + 1); - irrGrColumn.ComputeValues(dateTempColumn, cashflowColumn); + irrGrColumn.ComputeValues(dateTempColumn, cashflowMsfoColumn); var niColumn = new NIColumn(preparedValues.Nmper + 1); niColumn.ComputeValues(preparedValues, cashflowColumn, irrGrColumn); diff --git a/EvoCalculator.Core.Calculation/v2/Managers/Calculation/CalculateByTotalExpected.cs b/EvoCalculator.Core.Calculation/v2/Managers/Calculation/CalculateByTotalExpected.cs index c355bd5..f198443 100644 --- a/EvoCalculator.Core.Calculation/v2/Managers/Calculation/CalculateByTotalExpected.cs +++ b/EvoCalculator.Core.Calculation/v2/Managers/Calculation/CalculateByTotalExpected.cs @@ -189,7 +189,7 @@ namespace EvoCalculator.Core.Calculation.v2.Managers.Calculation npvColumn.ComputeValues(cashflowNpvColumn, npvWeightColumn); var irrGrColumn = new IRRGrColumn(preparedValues.Nmper + 1); - irrGrColumn.ComputeValues(dateTempColumn, cashflowColumn); + irrGrColumn.ComputeValues(dateTempColumn, cashflowMsfoColumn); var niColumn = new NIColumn(preparedValues.Nmper + 1); niColumn.ComputeValues(preparedValues, cashflowColumn, irrGrColumn); diff --git a/EvoCalculator.Core.Calculation/v2/Managers/Calculation/CalculateDefault.cs b/EvoCalculator.Core.Calculation/v2/Managers/Calculation/CalculateDefault.cs index 348c25e..c709ab0 100644 --- a/EvoCalculator.Core.Calculation/v2/Managers/Calculation/CalculateDefault.cs +++ b/EvoCalculator.Core.Calculation/v2/Managers/Calculation/CalculateDefault.cs @@ -188,7 +188,7 @@ namespace EvoCalculator.Core.Calculation.v2.Managers.Calculation npvColumn.ComputeValues(cashflowNpvColumn, npvWeightColumn); var irrGrColumn = new IRRGrColumn(preparedValues.Nmper + 1); - irrGrColumn.ComputeValues(dateTempColumn, cashflowColumn); + irrGrColumn.ComputeValues(dateTempColumn, cashflowMsfoColumn); var niColumn = new NIColumn(preparedValues.Nmper + 1); niColumn.ComputeValues(preparedValues, cashflowColumn, irrGrColumn);