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

merge branch release/extra-bonus-coefficient

Browse Source
This commit is contained in:
vchikalkin 2024-01-14 23:58:01 +03:00
parent 35f10248d9
commit 62aa578ba1
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EvoCalculator.Core.Calculation/v3/Columns/ExtraBonusSumColumn.cs
View File

@ -16,9 +16,9 @@ public class ExtraBonusSumColumn : BaseColumnWithSum
{
Values[2] = cashflowMsfoColumn.Nominal >= postValues.PlanIRRMSFO && preparedValues.BonusCoefficient == 1.0
? -1 * postValues.BonusBase *
(decimal) (cashflowMsfoColumn.Nominal / postValues.PlanIRRMSFO - 1) *
(decimal) preparedValues.ExtraBonus * (decimal) (1 + preparedValues.SalaryRate) *
(decimal) preparedValues.MarketRate * (decimal) preparedValues.DistrictRate
(decimal)((cashflowMsfoColumn.Nominal - postValues.PlanIRRMSFO) * constants.EXTRA_BONUS_COEFFICIENT) *
(decimal)preparedValues.ExtraBonus * (decimal)(1 + preparedValues.SalaryRate) *
(decimal)preparedValues.MarketRate * (decimal)preparedValues.DistrictRate
: 0;
if (Math.Abs(Values[2]) < constants.MinBonus)
Values[2] = 0;

5
EvoCalculator.Core.Calculation/v3/PostValues.cs
View File

@ -58,7 +58,8 @@ public class PostValues : v2.PostValues
if (cashflowMSFOColumn.Nominal >= this.PlanIRRMSFO && _preparedValues.BonusCoefficient == 1.0)
{
DirectorExtraBonus = this.BonusBase *
(decimal)(cashflowMSFOColumn.Nominal / this.PlanIRRMSFO - 1) *
(decimal)((cashflowMSFOColumn.Nominal - this.PlanIRRMSFO) *
_constants.EXTRA_BONUS_COEFFICIENT) *
(decimal)_preparedValues.DirectorExtraBonus * (decimal)_preparedValues.MarketRate *
(decimal)_preparedValues.DistrictRate;
@ -87,7 +88,7 @@ public class PostValues : v2.PostValues
if (cashflowMSFOColumn.Nominal >= this.PlanIRRMSFO && _preparedValues.BonusCoefficient == 1.0)
{
RegionalDirectorExtraBonus = this.BonusBase *
(decimal)(cashflowMSFOColumn.Nominal / this.PlanIRRMSFO - 1) *
(decimal)((cashflowMSFOColumn.Nominal - this.PlanIRRMSFO) * _constants.EXTRA_BONUS_COEFFICIENT) *
(decimal)_preparedValues.RegionalDirectorExtraBonus *
(decimal)_preparedValues.MarketRate *
(decimal)_preparedValues.DistrictRate;

1
EvoCalculator.Core.Constants/Calculation.cs
View File

@ -14,4 +14,5 @@ public class Calculation
public decimal MinBonus = 100;
public double DeltaIRR = 0.02;
public double ESN = 1.3;
public double EXTRA_BONUS_COEFFICIENT = 5;
}