From 25f3f16cf4458441b03f921b2e10f56b423b0c5a Mon Sep 17 00:00:00 2001 From: Chika Date: Tue, 1 Dec 2020 19:02:30 +0300 Subject: [PATCH] =?UTF-8?q?fix=20calculation=20sum=20column=20(=D1=82?= =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=82=D0=BE=D1=87=D0=BD=D0=BE?= =?UTF-8?q?=20=D0=B2=D1=81=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=B5=D1=82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EvoCalculator.Core.Calculation/Columns/SumColumn.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/EvoCalculator.Core.Calculation/Columns/SumColumn.cs b/EvoCalculator.Core.Calculation/Columns/SumColumn.cs index 05cb037..d21bfd3 100644 --- a/EvoCalculator.Core.Calculation/Columns/SumColumn.cs +++ b/EvoCalculator.Core.Calculation/Columns/SumColumn.cs @@ -53,14 +53,16 @@ namespace EvoCalculator.Core.Calculation.Columns var DIFFICULT_CASE = _percentPaymentColumn.Values.Take(_percentPaymentColumn.Values.Length - 1) .Any(x => x < 3 && x > 0); + var NUMBER_OF_RATHER_50 = _percentPaymentColumn.Values + .Skip(2) + .Take(_percentPaymentColumn.Values.Length - 1) + .Where(x => x >= 10).ToArray().Length; + var goalSeek = new GoalSeek(this); goalSeek.SeekResult(requiredValue, new GoalSeekOptions( startingStabPoint: - (_postValues.BaseCost.Value - _preparedValues.FirstPaymentSum) / - (_preparedValues.Nmper - 3) * (DIFFICULT_CASE - ? 0.1m - : 1m) + (_postValues.BaseCost.Value - _preparedValues.FirstPaymentSum) / NUMBER_OF_RATHER_50 , maximumAttempts: 1000 , initialTineSpacing: DIFFICULT_CASE ? 10000m : 1000m // , focusPercentage: 50