diff --git a/.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml b/.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml
index b60cf60..d8347fc 100644
--- a/.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml
+++ b/.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml
@@ -20,7 +20,6 @@
-
@@ -137,15 +136,10 @@
-
-
-
-
-
-
+
@@ -189,7 +183,6 @@
-
diff --git a/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml b/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml
index a9432a4..4574f2f 100644
--- a/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml
+++ b/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml
@@ -14,52 +14,60 @@
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
@@ -70,89 +78,82 @@
-
-
-
-
-
-
-
+
+
-
+
+
-
-
-
-
+
@@ -226,7 +227,8 @@
-
+
+
1602593830686
@@ -242,7 +244,14 @@
1603291353749
-
+
+ 1603451457395
+
+
+
+ 1603451457395
+
+
@@ -267,7 +276,8 @@
-
+
+
@@ -374,10 +384,10 @@
-
+
-
+
@@ -386,26 +396,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs b/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs
index eef9dc4..58afc35 100644
--- a/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs
+++ b/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs
@@ -2,13 +2,13 @@
namespace EvoCalculator.Core.Calculation.Columns
{
- public class BaseColumnWithSum : BaseColumn
+ public class BaseColumnWithSum : BaseColumn
{
- public BaseColumnWithSum(int count) : base(count)
+ protected BaseColumnWithSum(int count) : base(count)
{
}
- protected double Sum
+ protected decimal Sum
{
get { return Values.Skip(1).Sum(x => x); }
}
diff --git a/EvoCalculator.Core.Calculation/Columns/BaseColumnWithXIRR.cs b/EvoCalculator.Core.Calculation/Columns/BaseColumnWithXIRR.cs
index 5bbced0..890cc75 100644
--- a/EvoCalculator.Core.Calculation/Columns/BaseColumnWithXIRR.cs
+++ b/EvoCalculator.Core.Calculation/Columns/BaseColumnWithXIRR.cs
@@ -4,7 +4,7 @@ using EvoCalculator.Core.Models.Calculation.Models;
namespace EvoCalculator.Core.Calculation.Columns
{
- public class BaseColumnWithXIRR : BaseColumn
+ public class BaseColumnWithXIRR : BaseColumn
{
protected BaseColumnWithXIRR(int count, DateTempColumn dateTempColumn) : base(count)
{
diff --git a/EvoCalculator.Core.Calculation/Columns/BaseColumnWithXNPV.cs b/EvoCalculator.Core.Calculation/Columns/BaseColumnWithXNPV.cs
index 527c83b..4b7de86 100644
--- a/EvoCalculator.Core.Calculation/Columns/BaseColumnWithXNPV.cs
+++ b/EvoCalculator.Core.Calculation/Columns/BaseColumnWithXNPV.cs
@@ -4,11 +4,11 @@ using EvoCalculator.Core.Models.Calculation.Models;
namespace EvoCalculator.Core.Calculation.Columns
{
- public class BaseColumnWithXNPV : BaseColumn
+ public class BaseColumnWithXNPV : BaseColumn
{
private readonly double rate;
- public BaseColumnWithXNPV(int count, DateTempColumn dateTempColumn, double rate) : base(count)
+ protected BaseColumnWithXNPV(int count, DateTempColumn dateTempColumn, double rate) : base(count)
{
Dates = dateTempColumn.Values;
this.rate = rate;
@@ -32,12 +32,12 @@ namespace EvoCalculator.Core.Calculation.Columns
}
}
- public double XNPV
+ public decimal XNPV
{
get
{
var XNPV = new XNPV(Flows, rate);
- return XNPV.GetResult();
+ return Convert.ToDecimal(XNPV.GetResult());
}
}
}
diff --git a/EvoCalculator.Core.Calculation/Columns/DeprecationLDColumn.cs b/EvoCalculator.Core.Calculation/Columns/DeprecationLDColumn.cs
index d4f583d..a9300ee 100644
--- a/EvoCalculator.Core.Calculation/Columns/DeprecationLDColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/DeprecationLDColumn.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
using EvoCalculator.Core.Models.Calculation.Models.Prepared;
namespace EvoCalculator.Core.Calculation.Columns
@@ -14,7 +15,7 @@ namespace EvoCalculator.Core.Calculation.Columns
Values[1] = 0;
for (var i = 2; i < Values.Length - 1; i++)
Values[i] = preparedValues.BalanceHolder == 100000001
- ? preparedValues.DeprecationTime *
+ ? (decimal) preparedValues.DeprecationTime *
(preparedValues.AcceptSum - Values.Skip(2).Take(i - 1).Sum(x => x)) / 100
: 0;
diff --git a/EvoCalculator.Core.Calculation/Columns/KaskoBonusGrSumColumn.cs b/EvoCalculator.Core.Calculation/Columns/KaskoBonusGrSumColumn.cs
index af9ab31..ba6ba0c 100644
--- a/EvoCalculator.Core.Calculation/Columns/KaskoBonusGrSumColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/KaskoBonusGrSumColumn.cs
@@ -14,9 +14,9 @@ namespace EvoCalculator.Core.Calculation.Columns
if (i < 13)
Values[i] = kaskoNmperGrColumn.Values[i] * 1;
else if (i <= 24)
- Values[i] = kaskoNmperGrColumn.Values[i] * 0.7;
+ Values[i] = kaskoNmperGrColumn.Values[i] * (decimal) 0.7;
else
- Values[i] = kaskoNmperGrColumn.Values[i] * 0.5;
+ Values[i] = kaskoNmperGrColumn.Values[i] * (decimal) 0.5;
Values[0] = Sum;
}
diff --git a/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs b/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs
index 2252d8d..a3f24f4 100644
--- a/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs
@@ -1,4 +1,5 @@
-using EvoCalculator.Core.Models.Calculation.Models.Prepared;
+using System;
+using EvoCalculator.Core.Models.Calculation.Models.Prepared;
namespace EvoCalculator.Core.Calculation.Columns
{
@@ -11,13 +12,14 @@ namespace EvoCalculator.Core.Calculation.Columns
public void ComputeValues(PreparedValues preparedValues)
{
Values[1] = -1 * (preparedValues.RatBonus + preparedValues.NsBonus + preparedValues.NsibBonus) *
- (1 + preparedValues.SalaryRate) *
- (1 + preparedValues.MarketRate + preparedValues.DistrictRate);
+ (decimal) (1 + preparedValues.SalaryRate) *
+ (decimal) (1 + preparedValues.MarketRate + preparedValues.DistrictRate);
Values[2] = preparedValues.BonusFix > 0
? -preparedValues.BonusFix
- : -1 * preparedValues.BonusBase * preparedValues.Bonus * (1 + preparedValues.SalaryRate) *
- (1 + preparedValues.MarketRate + preparedValues.DistrictRate);
+ : -1 * preparedValues.BonusBase * Convert.ToDecimal(preparedValues.Bonus) *
+ (decimal) (1 + preparedValues.SalaryRate) *
+ (decimal) (1 + preparedValues.MarketRate + preparedValues.DistrictRate);
for (var i = 3; i < Values.Length; i++) Values[i] = 0;
diff --git a/EvoCalculator.Core.Calculation/Columns/NSIBBruttoGrColumn.cs b/EvoCalculator.Core.Calculation/Columns/NSIBBruttoGrColumn.cs
index 7d1638f..770595e 100644
--- a/EvoCalculator.Core.Calculation/Columns/NSIBBruttoGrColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/NSIBBruttoGrColumn.cs
@@ -11,7 +11,8 @@ namespace EvoCalculator.Core.Calculation.Columns
public void ComputeValues(PreparedValues preparedValues)
{
Values[1] = 0;
- for (var i = 2; i < Values.Length; i++) Values[i] = preparedValues.NsibBrutto / (preparedValues.Nmper - 1);
+ for (var i = 2; i < Values.Length; i++)
+ Values[i] = (decimal) preparedValues.NsibBrutto / (preparedValues.Nmper - 1);
Values[0] = Sum;
}
diff --git a/EvoCalculator.Core.Calculation/Columns/NSIBExpensesColumn.cs b/EvoCalculator.Core.Calculation/Columns/NSIBExpensesColumn.cs
index d4675e0..e13ffbb 100644
--- a/EvoCalculator.Core.Calculation/Columns/NSIBExpensesColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/NSIBExpensesColumn.cs
@@ -18,10 +18,10 @@ namespace EvoCalculator.Core.Calculation.Columns
if (preparedValues.Nmper - i >= 3)
{
if (preparedValues.Nmper - i < 16 - 1)
- Values[i] = -preparedValues.NsibNetto / preparedValues.Nmper *
+ Values[i] = -(decimal) preparedValues.NsibNetto / preparedValues.Nmper *
(preparedValues.Nmper - i + 1);
else
- Values[i] = -preparedValues.NsibNetto / preparedValues.Nmper * 12;
+ Values[i] = -(decimal) preparedValues.NsibNetto / preparedValues.Nmper * 12;
}
else
{
diff --git a/EvoCalculator.Core.Calculation/Columns/PercentPaymentColumn.cs b/EvoCalculator.Core.Calculation/Columns/PercentPaymentColumn.cs
index 1899862..5afc858 100644
--- a/EvoCalculator.Core.Calculation/Columns/PercentPaymentColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/PercentPaymentColumn.cs
@@ -12,7 +12,10 @@ namespace EvoCalculator.Core.Calculation.Columns
{
Values[0] = 0;
Values[1] = 0;
- for (var i = 2; i < Values.Length - 1; i++) Values[i] = preparedPayments.Rows[i - 1].PercentPayment;
+ for (var i = 2; i < Values.Length - 1; i++)
+ {
+ Values[i] = preparedPayments.Rows[i - 1].PercentPayment;
+ }
Values[^1] = 0;
}
diff --git a/EvoCalculator.Core.Calculation/Columns/SumColumn.cs b/EvoCalculator.Core.Calculation/Columns/SumColumn.cs
index 8ecf2dc..d3ccd9a 100644
--- a/EvoCalculator.Core.Calculation/Columns/SumColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/SumColumn.cs
@@ -19,17 +19,19 @@ namespace EvoCalculator.Core.Calculation.Columns
public decimal Calculate(decimal inputVariable)
{
- var x = Convert.ToDouble(inputVariable);
- ComputeValues(x);
+ FillValues(inputVariable);
return Convert.ToDecimal(IRR);
}
- public void ComputeValues(double x)
+ private void FillValues(decimal x)
{
Values[0] = -_preparedValues.BaseCost;
Values[1] = _preparedValues.FirstPaymentSum;
- for (var i = 2; i < Values.Length - 1; i++) Values[i] = x * _percentPaymentColumn.Values[i] / 100;
+ for (var i = 2; i < Values.Length - 1; i++)
+ {
+ Values[i] = x * (decimal) _percentPaymentColumn.Values[i] / 100;
+ }
Values[^1] = _preparedValues.LastPaymentSum;
}
diff --git a/EvoCalculator.Core.Calculation/Columns/SumWithVATColumn.cs b/EvoCalculator.Core.Calculation/Columns/SumWithVATColumn.cs
index ff8fb99..40dfe80 100644
--- a/EvoCalculator.Core.Calculation/Columns/SumWithVATColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/SumWithVATColumn.cs
@@ -13,8 +13,9 @@ namespace EvoCalculator.Core.Calculation.Columns
Values[0] = 0;
Values[1] = preparedValues.FirstPaymentWithNdsAbs > 0
? preparedValues.FirstPaymentWithNdsAbs
- : (1 + constants.VatValue) * sumColumn.Values[1];
- for (var i = 2; i < Values.Length; i++) Values[i] = (1 + constants.VatValue) * sumColumn.Values[i];
+ : (decimal) (1 + constants.VatValue) * sumColumn.Values[1];
+ for (var i = 2; i < Values.Length; i++)
+ Values[i] = (decimal) (1 + constants.VatValue) * sumColumn.Values[i];
Values[0] = Sum;
}
diff --git a/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs b/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs
index 0520828..ceff258 100644
--- a/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs
@@ -15,18 +15,18 @@
GPSExpensesColumn gpsExpensesColumn)
{
for (var i = 1; i < Values.Length; i++)
- Values[i] = constants.IncomeTaxValue * (sumColumn.Values[i]
- - acceptInsuranceColumn.Values[i]
- - deprecationColumn.Values[i]
- + ratExpensesColumn.Values[i]
- + registrExpensesColumn.Values[i]
- + comissionBonusExpensesColumn.Values[i]
- + transExprensesColumn.Values[i]
- + npvBonusExpensesColumn.Values[i]
- + agentComissionExpensesColumn.Values[i]
- + insuranceBonusExpensesColumn.Values[i]
- + tlmExpensesColumn.Values[i]
- + gpsExpensesColumn.Values[i]
+ Values[i] = (decimal) constants.IncomeTaxValue * (sumColumn.Values[i]
+ - acceptInsuranceColumn.Values[i]
+ - deprecationColumn.Values[i]
+ + ratExpensesColumn.Values[i]
+ + registrExpensesColumn.Values[i]
+ + comissionBonusExpensesColumn.Values[i]
+ + transExprensesColumn.Values[i]
+ + npvBonusExpensesColumn.Values[i]
+ + agentComissionExpensesColumn.Values[i]
+ + insuranceBonusExpensesColumn.Values[i]
+ + tlmExpensesColumn.Values[i]
+ + gpsExpensesColumn.Values[i]
);
diff --git a/EvoCalculator.Core.Calculation/Columns/VATColumn.cs b/EvoCalculator.Core.Calculation/Columns/VATColumn.cs
index 246f347..065d481 100644
--- a/EvoCalculator.Core.Calculation/Columns/VATColumn.cs
+++ b/EvoCalculator.Core.Calculation/Columns/VATColumn.cs
@@ -13,8 +13,8 @@ namespace EvoCalculator.Core.Calculation.Columns
Values[0] = 0;
Values[1] = preparedValues.FirstPaymentNdsAbs > 0
? preparedValues.FirstPaymentNdsAbs
- : constants.VatValue * sumColumn.Values[1];
- for (var i = 2; i < Values.Length; i++) Values[i] = constants.VatValue * sumColumn.Values[i];
+ : (decimal) constants.VatValue * sumColumn.Values[1];
+ for (var i = 2; i < Values.Length; i++) Values[i] = (decimal) constants.VatValue * sumColumn.Values[i];
Values[0] = Sum;
}
diff --git a/EvoCalculator.Core.FinanceFormulas/XNPV.cs b/EvoCalculator.Core.FinanceFormulas/XNPV.cs
index 3c4e483..d73e749 100644
--- a/EvoCalculator.Core.FinanceFormulas/XNPV.cs
+++ b/EvoCalculator.Core.FinanceFormulas/XNPV.cs
@@ -20,7 +20,7 @@ namespace EvoCalculator.Core.FinanceFormulas
{
var firstDate = _flows[0].Date;
return _flows.Sum(flow =>
- flow.Value / Math.Pow(1 + _rate, (flow.Date - firstDate).TotalDays / 365));
+ Convert.ToDouble(flow.Value) / Math.Pow(1 + _rate, (flow.Date - firstDate).TotalDays / 365));
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Models/Calculation/Models/Flow.cs b/EvoCalculator.Core.Models/Calculation/Models/Flow.cs
index b5ac82b..996afa5 100644
--- a/EvoCalculator.Core.Models/Calculation/Models/Flow.cs
+++ b/EvoCalculator.Core.Models/Calculation/Models/Flow.cs
@@ -5,6 +5,6 @@ namespace EvoCalculator.Core.Models.Calculation.Models
public class Flow
{
public DateTime Date;
- public double Value;
+ public decimal Value;
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedParams.cs b/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedParams.cs
index db1b38e..3e360be 100644
--- a/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedParams.cs
+++ b/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedParams.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Models.Calculation.Models.Prepared
public double IrrExpected { get; set; }
public double NpvniExpected { get; set; }
public double TotalExpected { get; set; }
- public double Leasing0K { get; set; }
+ public bool Leasing0K { get; set; }
public double LoanRate { get; set; }
public int BalanceHolder { get; set; }
public DateTime DogDate { get; set; }
@@ -18,17 +18,17 @@ namespace EvoCalculator.Core.Models.Calculation.Models.Prepared
public string Cityc { get; set; }
public int Nmper { get; set; }
public double FirstPayment { get; set; }
- public double FirstPaymentSum { get; set; }
- public double FirstPaymentAbs { get; set; }
- public double FirstPaymentNdsAbs { get; set; }
- public double FirstPaymentWithNdsAbs { get; set; }
+ public decimal FirstPaymentSum { get; set; }
+ public decimal FirstPaymentAbs { get; set; }
+ public decimal FirstPaymentNdsAbs { get; set; }
+ public decimal FirstPaymentWithNdsAbs { get; set; }
public double LastPayment { get; set; }
- public double LastPaymentSum { get; set; }
+ public decimal LastPaymentSum { get; set; }
public int ScheduleOfPayments { get; set; }
- public double ComissionRub { get; set; }
- public double PlPrice { get; set; }
- public double Discount { get; set; }
- public double AcceptSum { get; set; }
+ public decimal ComissionRub { get; set; }
+ public decimal PlPrice { get; set; }
+ public decimal Discount { get; set; }
+ public decimal AcceptSum { get; set; }
public string PlTypeId { get; set; }
public string BrandId { get; set; }
public string ModelId { get; set; }
@@ -40,55 +40,55 @@ namespace EvoCalculator.Core.Models.Calculation.Models.Prepared
public double CarCarrying { get; set; }
public int CarSeats { get; set; }
public double Bonus { get; set; }
- public double BonusFix { get; set; }
+ public decimal BonusFix { get; set; }
public double MarketRate { get; set; }
public double DistrictRate { get; set; }
public double SalaryRate { get; set; }
public double BonusRatPr { get; set; }
public double BonusNsPr { get; set; }
public double BonusNsibPr { get; set; }
- public double Rats { get; set; }
- public double BaseRatCost { get; set; }
- public double RetroBonus { get; set; }
- public double Registration { get; set; }
- public double BaseRegistration { get; set; }
- public double TransTax { get; set; }
+ public decimal Rats { get; set; }
+ public decimal BaseRatCost { get; set; }
+ public decimal RetroBonus { get; set; }
+ public decimal Registration { get; set; }
+ public decimal BaseRegistration { get; set; }
+ public decimal TransTax { get; set; }
public bool TransIncludeGr { get; set; }
- public double TrackerCost { get; set; }
- public double InsuranceKasko { get; set; }
+ public decimal TrackerCost { get; set; }
+ public decimal InsuranceKasko { get; set; }
public int NmperInsurance { get; set; }
- public double InsuranceOsago { get; set; }
- public double Insurance { get; set; }
- public double InsuranceKaskoNmper { get; set; }
- public double InsuranceContract { get; set; }
- public double InsuranceBonus { get; set; }
+ public decimal InsuranceOsago { get; set; }
+ public decimal Insurance { get; set; }
+ public decimal InsuranceKaskoNmper { get; set; }
+ public decimal InsuranceContract { get; set; }
+ public decimal InsuranceBonus { get; set; }
public double NsibBruttoPr { get; set; }
public double NsibNettoPr { get; set; }
- public double NsibBase { get; set; }
+ public decimal NsibBase { get; set; }
public double Repayment { get; set; }
- public double TransportTaxGrYear { get; set; }
- public double TransportTaxGr { get; set; }
- public double NsibBrutto { get; set; }
- public double NsibNetto { get; set; }
+ public decimal TransportTaxGrYear { get; set; }
+ public decimal TransportTaxGr { get; set; }
+ public decimal NsibBrutto { get; set; }
+ public decimal NsibNetto { get; set; }
public int NmperDeprecation { get; set; }
public double DeprecationTime { get; set; }
- public double RatBonus { get; set; }
- public double NsBonus { get; set; }
- public double NsibBonus { get; set; }
- public double NiAtInception { get; set; }
- public double AgentsSum { get; set; }
- public double DoubleAgentsSum { get; set; }
- public double DeliverySum { get; set; }
- public double BrokerSum { get; set; }
- public double BrokerOfDeliverySum { get; set; }
- public double FinancialDeptOfDeliverySum { get; set; }
- public double ImporterSum { get; set; }
- public double CalculationCost { get; set; }
- public double PriceUpTotal { get; set; }
- public double BaseCost { get; set; }
- public double AcquisitionExpenses { get; set; }
- public double BonusBase { get; set; }
- public double NpvBase { get; set; }
- public double TLMCost { get; set; }
+ public decimal RatBonus { get; set; }
+ public decimal NsBonus { get; set; }
+ public decimal NsibBonus { get; set; }
+ public decimal NiAtInception { get; set; }
+ public decimal AgentsSum { get; set; }
+ public decimal DoubleAgentsSum { get; set; }
+ public decimal DeliverySum { get; set; }
+ public decimal BrokerSum { get; set; }
+ public decimal BrokerOfDeliverySum { get; set; }
+ public decimal FinancialDeptOfDeliverySum { get; set; }
+ public decimal ImporterSum { get; set; }
+ public decimal CalculationCost { get; set; }
+ public decimal PriceUpTotal { get; set; }
+ public decimal BaseCost { get; set; }
+ public decimal AcquisitionExpenses { get; set; }
+ public decimal BonusBase { get; set; }
+ public decimal NpvBase { get; set; }
+ public decimal TLMCost { get; set; }
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedPayments.cs b/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedPayments.cs
index ef66f55..fe3f805 100644
--- a/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedPayments.cs
+++ b/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedPayments.cs
@@ -4,11 +4,11 @@
{
public int NumberPayment { get; set; }
public double PercentPayment { get; set; }
- public double SumPayment { get; set; }
- public double GpsBasePayment { get; set; }
- public double GpsCostPayment { get; set; }
- public double TlmBasePayment { get; set; }
- public double TlmCostPayment { get; set; }
+ public decimal SumPayment { get; set; }
+ public decimal GpsBasePayment { get; set; }
+ public decimal GpsCostPayment { get; set; }
+ public decimal TlmBasePayment { get; set; }
+ public decimal TlmCostPayment { get; set; }
}
public class PreparedPayments
diff --git a/EvoCalculator.Core.Models/Weather/Interfaces/IWeatherForecast.cs b/EvoCalculator.Core.Models/Weather/Interfaces/IWeatherForecast.cs
deleted file mode 100644
index 228f14b..0000000
--- a/EvoCalculator.Core.Models/Weather/Interfaces/IWeatherForecast.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace EvoCalculator.Core.Models.Weather.Interfaces
-{
- public interface IWeatherForecast
- {
- public DateTime Date { get; set; }
- public int TemperatureC { get; set; }
- public int TemperatureF { get; }
- public string Summary { get; set; }
- }
-}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Models/Weather/WeatherForecast.cs b/EvoCalculator.Core.Models/Weather/WeatherForecast.cs
deleted file mode 100644
index 6fcaaae..0000000
--- a/EvoCalculator.Core.Models/Weather/WeatherForecast.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using EvoCalculator.Core.Models.Weather.Interfaces;
-
-namespace EvoCalculator.Core.Models.Weather
-{
- public class WeatherForecast:IWeatherForecast
- {
- public DateTime Date { get; set; }
-
- public int TemperatureC { get; set; }
-
- public int TemperatureF => 32 + (int) (TemperatureC / 0.5556);
-
- public string Summary { get; set; }
- }
-}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/ArrayComparer.cs b/EvoCalculator.Core.Tests/ArrayComparer.cs
new file mode 100644
index 0000000..7099749
--- /dev/null
+++ b/EvoCalculator.Core.Tests/ArrayComparer.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+
+namespace EvoCalculator.Core.Tests
+{
+ public class DoubleArrayComparer : IEqualityComparer
+ {
+ private readonly double _tolerance = 0.001;
+
+ public DoubleArrayComparer(double tolerance)
+ {
+ this._tolerance = tolerance;
+ }
+
+ public DoubleArrayComparer()
+ {
+ }
+
+ public bool Equals(double x, double y)
+ {
+ return Math.Abs(x - y) < _tolerance;
+ }
+
+ public int GetHashCode(double obj)
+ {
+ return obj.GetHashCode();
+ }
+ }
+
+ public class DecimalArrayComparer : IEqualityComparer
+ {
+ private readonly double _tolerance = 0.001;
+
+ public DecimalArrayComparer(double tolerance)
+ {
+ this._tolerance = tolerance;
+ }
+
+ public DecimalArrayComparer()
+ {
+ }
+
+ public bool Equals(decimal x, decimal y)
+ {
+ return Math.Abs(x - y) < (decimal) _tolerance;
+ }
+
+ public int GetHashCode(decimal obj)
+ {
+ return obj.GetHashCode();
+ }
+ }
+}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/AcceptInsuranceTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/AcceptInsuranceTests.cs
index 0a76579..b7efb4c 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/AcceptInsuranceTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/AcceptInsuranceTests.cs
@@ -9,46 +9,46 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void AcceptInsuranceTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- Nmper = 30,
+ Nmper = 30
};
var acceptKaskoColumn = new AcceptKaskoColumn(preparedValues.Nmper + 1)
{
Values = new[]
{
- 123666.666666667,
- 0.00,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
+ 123666.666666667m,
+ 0.00m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m
}
};
@@ -57,80 +57,80 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 30000,
- 0.00,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 2727.27272727273,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 30000m,
+ 0.00m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 2727.27272727273m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
var acceptInsuranceColumn = new AcceptInsuranceColumn(preparedValues.Nmper + 1);
acceptInsuranceColumn.ComputeValues(acceptKaskoColumn, acceptOsagoColumn);
-
+
var expected = new[]
{
- 153666.6666666666,
- 0.00,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 6991.64054336468,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
- 4264.36781609195,
+ 153666.6666666666m,
+ 0.00m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 6991.64054336468m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m,
+ 4264.36781609195m
};
- Assert.Equal(expected, acceptInsuranceColumn.Values);
+ Assert.Equal(expected, acceptInsuranceColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/AcceptKaskoTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/AcceptKaskoTests.cs
index bf5d101..08e9edd 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/AcceptKaskoTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/AcceptKaskoTests.cs
@@ -9,53 +9,53 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void AcceptKaskoTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 30,
- InsuranceKaskoNmper = 123666.666666667
+ InsuranceKaskoNmper = 123666.666666667m
};
var expected = new[]
{
- 123666.666666667,
- 0.00,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
- 4264.367816091965,
+ 123666.666666667m,
+ 0.00m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m,
+ 4264.367816091965m
};
var acceptKaskoColumn = new AcceptKaskoColumn(preparedValues.Nmper + 1);
acceptKaskoColumn.ComputeValues(preparedValues);
- Assert.Equal(expected, acceptKaskoColumn.Values);
+ Assert.Equal(expected, acceptKaskoColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/AcceptOsagoTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/AcceptOsagoTests.cs
index 5f9d51f..96b3bb6 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/AcceptOsagoTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/AcceptOsagoTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void AcceptOsagoTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 30,
InsuranceOsago = 30000
@@ -18,44 +18,44 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 30000.000000000004,
- 0.00,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 2727.2727272727275,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 30000.000000000004m,
+ 0.00m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 2727.2727272727275m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
var acceptOsagoColumn = new AcceptOsagoColumn(preparedValues.Nmper + 1);
acceptOsagoColumn.ComputeValues(preparedValues);
- Assert.Equal(expected, acceptOsagoColumn.Values);
+ Assert.Equal(expected, acceptOsagoColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/AcceptSumTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/AcceptSumTests.cs
index dba17af..f6f4190 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/AcceptSumTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/AcceptSumTests.cs
@@ -11,7 +11,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void AcceptSumTest1()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
Nmper = 30,
AcceptSum = 2500000
@@ -87,7 +87,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2025, 12, 12),
new DateTime(2026, 1, 12),
new DateTime(2026, 2, 12),
- new DateTime(2026, 3, 12),
+ new DateTime(2026, 3, 12)
}
};
@@ -95,37 +95,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -2542903.66268442,
- 625000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 108000.00,
- 96000.00,
- 96000.00,
- 96000.00,
- 96000.00,
- 96000.00,
- 96000.00,
- 96000.00,
- 25000.00,
+ -2542903.66268442m,
+ 625000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 108000.00m,
+ 96000.00m,
+ 96000.00m,
+ 96000.00m,
+ 96000.00m,
+ 96000.00m,
+ 96000.00m,
+ 96000.00m,
+ 25000.00m
}
};
@@ -133,37 +133,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 742000.00,
- 125000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 21600.00,
- 19200.00,
- 19200.00,
- 19200.00,
- 19200.00,
- 19200.00,
- 19200.00,
- 19200.00,
- 5000.00,
+ 742000.00m,
+ 125000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 21600.00m,
+ 19200.00m,
+ 19200.00m,
+ 19200.00m,
+ 19200.00m,
+ 19200.00m,
+ 19200.00m,
+ 19200.00m,
+ 5000.00m
}
};
@@ -171,73 +171,73 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 4452000.00,
- 750000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 129600.00,
- 115200.00,
- 115200.00,
- 115200.00,
- 115200.00,
- 115200.00,
- 115200.00,
- 115200.00,
- 30000.00,
+ 4452000.00m,
+ 750000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 129600.00m,
+ 115200.00m,
+ 115200.00m,
+ 115200.00m,
+ 115200.00m,
+ 115200.00m,
+ 115200.00m,
+ 115200.00m,
+ 30000.00m
}
};
var expected = new[]
{
- 2500000,
- 421159.0296495957,
- 80862.53369272237,
- 80862.53369272237,
- 80862.53369272237,
- 80862.53369272237,
- 80862.53369272237,
- 80862.53369272237,
- 80862.53369272237,
- 80862.53369272237,
- 80862.53369272237,
- 80862.53369272237,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 72776.280323450133,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 16846.361185983827,
+ 2500000m,
+ 421159.0296495957m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 80862.53369272237m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 72776.280323450133m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 16846.361185983827m
};
@@ -245,7 +245,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
acceptSumColumn.ComputeValues(preparedValues, sumColumn, vatColumn, sumWithVatColumn);
var values = acceptSumColumn.Values;
- Assert.Equal(expected, values);
+ Assert.Equal(expected, values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/AgentComissionExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/AgentComissionExpensesTests.cs
index e6dfced..69ed998 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/AgentComissionExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/AgentComissionExpensesTests.cs
@@ -9,15 +9,15 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void AgentComissionExpensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- AgentsSum = 47662.50,
- DoubleAgentsSum = 0.00,
- DeliverySum = 0.00,
- BrokerSum = 0.00,
- BrokerOfDeliverySum = 0.00,
- FinancialDeptOfDeliverySum = 0.00,
- ImporterSum = 0.00,
+ AgentsSum = 47662.50m,
+ DoubleAgentsSum = 0.00m,
+ DeliverySum = 0.00m,
+ BrokerSum = 0.00m,
+ BrokerOfDeliverySum = 0.00m,
+ FinancialDeptOfDeliverySum = 0.00m,
+ ImporterSum = 0.00m,
Nmper = 30
};
@@ -27,55 +27,55 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -47662.50,
- 0.00,
- -47662.50,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -47662.50m,
+ 0.00m,
+ -47662.50m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, agentComissionExpensesColumn.Values.Length);
- Assert.Equal(expected, agentComissionExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, agentComissionExpensesColumn.Values, new DecimalArrayComparer());
}
[Fact]
public void AgentComissionExpensesTest2()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- AgentsSum = 47662.50,
+ AgentsSum = 47662.50m,
DoubleAgentsSum = 31775,
DeliverySum = 50000,
BrokerSum = 75000,
BrokerOfDeliverySum = 100000,
FinancialDeptOfDeliverySum = 125000,
- ImporterSum = 16666.6666666667,
+ ImporterSum = 16666.6666666667m,
Nmper = 30
};
@@ -85,41 +85,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -446104.166666667,
- 0.00,
- -446104.166666667,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -446104.166666667m,
+ 0.00m,
+ -446104.166666667m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, agentComissionExpensesColumn.Values.Length);
- Assert.Equal(expected, agentComissionExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, agentComissionExpensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/CashflowTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/CashflowTests.cs
index f791566..24deaa8 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/CashflowTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/CashflowTests.cs
@@ -10,7 +10,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void CashflowTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 25,
AcquisitionExpenses = 2507300
@@ -86,7 +86,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2023, 12, 31),
new DateTime(2024, 1, 31),
new DateTime(2024, 2, 29),
- new DateTime(2024, 3, 31),
+ new DateTime(2024, 3, 31)
}
};
@@ -95,32 +95,32 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -2542903.66268442,
- 625000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 96000,
- 96000,
- 25000,
+ -2542903.66268442m,
+ 625000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 96000m,
+ 96000m,
+ 25000m
}
};
@@ -128,32 +128,32 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -110416.666666667,
- -53000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -57416.6666666667,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -110416.666666667m,
+ -53000m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -57416.6666666667m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -163,38 +163,38 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -2507300,
- 625000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 120000,
- 108000,
- 50583.3333333333,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 108000,
- 96000,
- 96000,
- 25000,
+ -2507300m,
+ 625000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 120000m,
+ 108000m,
+ 50583.3333333333m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 108000m,
+ 96000m,
+ 96000m,
+ 25000m
};
Assert.Equal(expected.Length, cashflowColumn.Values.Length);
Assert.Equal(0.3878, cashflowColumn.IRR, new DoubleArrayComparer(0.1));
- Assert.Equal(expected, cashflowColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, cashflowColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/ComissionBonusExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/ComissionBonusExpensesTests.cs
index 2332c3e..f4c1cc9 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/ComissionBonusExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/ComissionBonusExpensesTests.cs
@@ -9,9 +9,9 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void ComissionBonusExpensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- ComissionRub = 125000,
+ ComissionRub = 125000m,
Nmper = 24
};
@@ -21,36 +21,36 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 125000.00,
- 125000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 125000.00m,
+ 125000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, comissionBonusExpensesColumn.Values.Length);
- Assert.Equal(expected, comissionBonusExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, comissionBonusExpensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/DateColumnTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/DateColumnTests.cs
index 27a6c19..615a994 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/DateColumnTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/DateColumnTests.cs
@@ -8,16 +8,11 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
public class DateColumnTests
{
- public DateColumnTests(ITestOutputHelper output)
- {
- }
-
-
[Fact]
public void DateColumnTest1()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
DogDate = new DateTime(2018, 10, 28),
DeliveryTime = 100000000,
@@ -60,7 +55,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2020, 12, 28),
new DateTime(2021, 01, 28),
new DateTime(2021, 02, 28),
- new DateTime(2021, 03, 28),
+ new DateTime(2021, 03, 28)
};
var res = dateColumn.Values;
@@ -71,7 +66,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void DateColumnTest2()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
DogDate = new DateTime(2018, 10, 28),
DeliveryTime = 100000000,
@@ -114,7 +109,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2020, 12, 13),
new DateTime(2021, 01, 13),
new DateTime(2021, 02, 13),
- new DateTime(2021, 03, 13),
+ new DateTime(2021, 03, 13)
};
var res = dateColumn.Values;
@@ -125,7 +120,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void DateColumnTest3()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
DogDate = new DateTime(2018, 10, 28),
DeliveryTime = 100000001,
@@ -168,7 +163,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2021, 6, 26),
new DateTime(2021, 7, 26),
new DateTime(2021, 8, 26),
- new DateTime(2021, 9, 26),
+ new DateTime(2021, 9, 26)
};
var res = dateColumn.Values;
@@ -179,7 +174,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void DateColumnTest4()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
DogDate = new DateTime(2018, 10, 31),
DeliveryTime = 100000000,
@@ -222,7 +217,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2020, 12, 31),
new DateTime(2021, 01, 31),
new DateTime(2021, 02, 28),
- new DateTime(2021, 03, 31),
+ new DateTime(2021, 03, 31)
};
var res = dateColumn.Values;
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/DateTempTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/DateTempTests.cs
index 5e7b8b2..924930b 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/DateTempTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/DateTempTests.cs
@@ -11,16 +11,16 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void DateTempTest1()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
DogDate = new DateTime(2018, 10, 31),
- PaymentDateNew = null,
+ PaymentDateNew = null
};
var dateTempColumn = new DateTempColumn(67);
dateTempColumn.ComputeValues(preparedValues);
- var expected = new DateTime[]
+ var expected = new[]
{
new DateTime(2018, 10, 31),
new DateTime(2018, 10, 31),
@@ -88,7 +88,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2023, 12, 31),
new DateTime(2024, 1, 31),
new DateTime(2024, 2, 29),
- new DateTime(2024, 3, 31),
+ new DateTime(2024, 3, 31)
};
var res = dateTempColumn.Values;
@@ -99,16 +99,16 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void DateTempTest2()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
DogDate = new DateTime(2018, 10, 31),
- PaymentDateNew = new DateTime(2018, 12, 11),
+ PaymentDateNew = new DateTime(2018, 12, 11)
};
var dateTempColumn = new DateTempColumn(67);
dateTempColumn.ComputeValues(preparedValues);
- var expected = new DateTime[]
+ var expected = new[]
{
new DateTime(2018, 10, 31),
new DateTime(2018, 10, 31),
@@ -176,7 +176,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2024, 1, 11),
new DateTime(2024, 2, 11),
new DateTime(2024, 3, 11),
- new DateTime(2024, 4, 11),
+ new DateTime(2024, 4, 11)
};
var res = dateTempColumn.Values;
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationLDTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationLDTests.cs
index 94fc891..3e379cf 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationLDTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationLDTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void DeprecationLDTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
BalanceHolder = 100000001,
NmperDeprecation = 37,
@@ -23,50 +23,50 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 2500000.00,
- 0.00,
- 140000.00,
- 132160.00,
- 124759.04,
- 117772.53376,
- 111177.27186944,
- 104951.344644751,
- 99074.0693446453,
- 93525.9214613451,
- 88288.4698595098,
- 83344.3155473772,
- 78677.0338767241,
- 74271.1199796276,
- 70111.9372607684,
- 66185.6687741654,
- 62479.2713228121,
- 58980.4321287346,
- 55677.5279295255,
- 52559.5863654721,
- 49616.2495290057,
- 46837.7395553813,
- 44214.82614028,
- 41738.7958764243,
- 39401.4233073445,
- 37194.9436021332,
- 35112.0267604138,
- 33145.7532618306,
- 31289.5910791681,
- 29537.3739787347,
- 27883.2810359255,
- 26321.8172979137,
- 24847.7955292305,
- 23456.3189795936,
- 22142.7651167364,
- 20902.7702701992,
- 19732.215135068,
- 18627.2110875042,
- 314001.558332213,
+ 2500000.00m,
+ 0.00m,
+ 140000.00m,
+ 132160.00m,
+ 124759.04m,
+ 117772.53376m,
+ 111177.27186944m,
+ 104951.344644751m,
+ 99074.0693446453m,
+ 93525.9214613451m,
+ 88288.4698595098m,
+ 83344.3155473772m,
+ 78677.0338767241m,
+ 74271.1199796276m,
+ 70111.9372607684m,
+ 66185.6687741654m,
+ 62479.2713228121m,
+ 58980.4321287346m,
+ 55677.5279295255m,
+ 52559.5863654721m,
+ 49616.2495290057m,
+ 46837.7395553813m,
+ 44214.82614028m,
+ 41738.7958764243m,
+ 39401.4233073445m,
+ 37194.9436021332m,
+ 35112.0267604138m,
+ 33145.7532618306m,
+ 31289.5910791681m,
+ 29537.3739787347m,
+ 27883.2810359255m,
+ 26321.8172979137m,
+ 24847.7955292305m,
+ 23456.3189795936m,
+ 22142.7651167364m,
+ 20902.7702701992m,
+ 19732.215135068m,
+ 18627.2110875042m,
+ 314001.558332213m
};
var values = deprecationLDColumn.Values;
- Assert.Equal(expected, values, new DoubleArrayComparer());
+ Assert.Equal(expected, values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationLPTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationLPTests.cs
index c76dfd5..5f17c2e 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationLPTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationLPTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void DeprecationLPTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
BalanceHolder = 100000001,
Nmper = 30
@@ -19,37 +19,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 2224393.53099731,
- 421159.029649596,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 16846.3611859838,
+ 2224393.53099731m,
+ 421159.029649596m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 16846.3611859838m
}
};
@@ -58,48 +58,48 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
var values = deprecationLPColumn.Values;
- Assert.Equal(expected, values);
+ Assert.Equal(expected, values, new DecimalArrayComparer());
}
[Fact]
public void DeprecationLPTest2()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
BalanceHolder = 100000000,
Nmper = 30
@@ -109,37 +109,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 2224393.53099731,
- 421159.029649596,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 80862.533692722398,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 72776.280323450104,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 64690.026954177898,
- 16846.3611859838,
+ 2224393.53099731m,
+ 421159.029649596m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 80862.533692722398m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 72776.280323450104m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 64690.026954177898m,
+ 16846.3611859838m
}
};
@@ -148,42 +148,42 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 2500000.00,
- 421159.029649596,
- 80862.5336927224,
- 80862.5336927224,
- 80862.5336927224,
- 80862.5336927224,
- 80862.5336927224,
- 80862.5336927224,
- 80862.5336927224,
- 80862.5336927224,
- 80862.5336927224,
- 80862.5336927224,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 72776.2803234501,
- 64690.0269541779,
- 64690.0269541779,
- 64690.0269541779,
- 64690.0269541779,
- 64690.0269541779,
- 64690.0269541779,
- 64690.0269541779,
- 16846.3611859838,
+ 2500000.00m,
+ 421159.029649596m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 80862.5336927224m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 72776.2803234501m,
+ 64690.0269541779m,
+ 64690.0269541779m,
+ 64690.0269541779m,
+ 64690.0269541779m,
+ 64690.0269541779m,
+ 64690.0269541779m,
+ 64690.0269541779m,
+ 16846.3611859838m
};
var values = deprecationLPColumn.Values;
- Assert.Equal(expected, values, new DoubleArrayComparer());
+ Assert.Equal(expected, values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationTests.cs
index 170cbc4..38e1e96 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/DeprecationTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void DepreactionTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
NmperDeprecation = 37,
Nmper = 30
@@ -19,37 +19,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -57,45 +57,45 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 2500000.00,
- 0.00,
- 140000.00,
- 132160.00,
- 124759.04,
- 117772.53376,
- 111177.27186944,
- 104951.344644751,
- 99074.0693446453,
- 93525.9214613451,
- 88288.4698595098,
- 83344.3155473772,
- 78677.0338767241,
- 74271.1199796276,
- 70111.9372607684,
- 66185.6687741654,
- 62479.2713228121,
- 58980.4321287346,
- 55677.5279295255,
- 52559.5863654721,
- 49616.2495290057,
- 46837.7395553813,
- 44214.82614028,
- 41738.7958764243,
- 39401.4233073445,
- 37194.9436021332,
- 35112.0267604138,
- 33145.7532618306,
- 31289.5910791681,
- 29537.3739787347,
- 27883.2810359255,
- 26321.8172979137,
- 24847.7955292305,
- 23456.3189795936,
- 22142.7651167364,
- 20902.7702701992,
- 19732.215135068,
- 18627.2110875042,
- 314001.558332213,
+ 2500000.00m,
+ 0.00m,
+ 140000.00m,
+ 132160.00m,
+ 124759.04m,
+ 117772.53376m,
+ 111177.27186944m,
+ 104951.344644751m,
+ 99074.0693446453m,
+ 93525.9214613451m,
+ 88288.4698595098m,
+ 83344.3155473772m,
+ 78677.0338767241m,
+ 74271.1199796276m,
+ 70111.9372607684m,
+ 66185.6687741654m,
+ 62479.2713228121m,
+ 58980.4321287346m,
+ 55677.5279295255m,
+ 52559.5863654721m,
+ 49616.2495290057m,
+ 46837.7395553813m,
+ 44214.82614028m,
+ 41738.7958764243m,
+ 39401.4233073445m,
+ 37194.9436021332m,
+ 35112.0267604138m,
+ 33145.7532618306m,
+ 31289.5910791681m,
+ 29537.3739787347m,
+ 27883.2810359255m,
+ 26321.8172979137m,
+ 24847.7955292305m,
+ 23456.3189795936m,
+ 22142.7651167364m,
+ 20902.7702701992m,
+ 19732.215135068m,
+ 18627.2110875042m,
+ 314001.558332213m
}
};
@@ -104,50 +104,50 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 2500000.00,
- 0.00,
- 140000.00,
- 132160.00,
- 124759.04,
- 117772.53376,
- 111177.27186944,
- 104951.344644751,
- 99074.0693446453,
- 93525.9214613451,
- 88288.4698595098,
- 83344.3155473772,
- 78677.0338767241,
- 74271.1199796276,
- 70111.9372607684,
- 66185.6687741654,
- 62479.2713228121,
- 58980.4321287346,
- 55677.5279295255,
- 52559.5863654721,
- 49616.2495290057,
- 46837.7395553813,
- 44214.82614028,
- 41738.7958764243,
- 39401.4233073445,
- 37194.9436021332,
- 35112.0267604138,
- 33145.7532618306,
- 31289.5910791681,
- 29537.3739787347,
- 27883.2810359255,
- 26321.8172979137,
- 24847.7955292305,
- 23456.3189795936,
- 22142.7651167364,
- 20902.7702701992,
- 19732.215135068,
- 18627.2110875042,
- 314001.558332213,
+ 2500000.00m,
+ 0.00m,
+ 140000.00m,
+ 132160.00m,
+ 124759.04m,
+ 117772.53376m,
+ 111177.27186944m,
+ 104951.344644751m,
+ 99074.0693446453m,
+ 93525.9214613451m,
+ 88288.4698595098m,
+ 83344.3155473772m,
+ 78677.0338767241m,
+ 74271.1199796276m,
+ 70111.9372607684m,
+ 66185.6687741654m,
+ 62479.2713228121m,
+ 58980.4321287346m,
+ 55677.5279295255m,
+ 52559.5863654721m,
+ 49616.2495290057m,
+ 46837.7395553813m,
+ 44214.82614028m,
+ 41738.7958764243m,
+ 39401.4233073445m,
+ 37194.9436021332m,
+ 35112.0267604138m,
+ 33145.7532618306m,
+ 31289.5910791681m,
+ 29537.3739787347m,
+ 27883.2810359255m,
+ 26321.8172979137m,
+ 24847.7955292305m,
+ 23456.3189795936m,
+ 22142.7651167364m,
+ 20902.7702701992m,
+ 19732.215135068m,
+ 18627.2110875042m,
+ 314001.558332213m
};
var values = deprecationColumn.Values;
- Assert.Equal(expected, values, new DoubleArrayComparer());
+ Assert.Equal(expected, values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/ExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/ExpensesTests.cs
index 6742a91..8f50b72 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/ExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/ExpensesTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void ExpensesColumnTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 24
};
@@ -18,31 +18,31 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -446104.166666667,
- 0.00,
- -446104.166666667,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -446104.166666667m,
+ 0.00m,
+ -446104.166666667m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -52,29 +52,29 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
-6000,
-12000,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
6000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -83,30 +83,30 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
Values = new[]
{
-18000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -9000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
-9000,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -9000
}
};
@@ -114,31 +114,31 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -3376.08,
- -1688.04,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -1688.04,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -3376.08m,
+ -1688.04m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -1688.04m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -146,7 +146,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -33600.00,
+ -33600.00m,
-20000,
-1600,
-800,
@@ -170,7 +170,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
-800,
-800,
-800,
- -800,
+ -800
}
};
@@ -178,7 +178,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -25200.00,
+ -25200.00m,
-15000,
-1200,
-600,
@@ -202,7 +202,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
-600,
-600,
-600,
- -600,
+ -600
}
};
@@ -212,29 +212,29 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
-2300,
-2300,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -242,31 +242,31 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 26337.50,
- 0.00,
- 13168.75,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 13168.75,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 26337.50m,
+ 0.00m,
+ 13168.75m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 13168.75m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -276,29 +276,29 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
125000,
125000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -306,31 +306,31 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -19695.05642,
- -1355.97852,
- -18339.0779,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -19695.05642m,
+ -1355.97852m,
+ -18339.0779m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -343,36 +343,36 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -412737.803086667,
- 72655.98148,
- -454074.494566667,
- -1400,
- 4600,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -10400,
- 10080.71,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -1400,
- -10400,
+ -412737.803086667m,
+ 72655.98148m,
+ -454074.494566667m,
+ -1400m,
+ 4600m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -10400m,
+ 10080.71m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -1400m,
+ -10400m
};
Assert.Equal(expected.Length, expensesColumn.Values.Length);
- Assert.Equal(expected, expensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, expensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/GPSExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/GPSExpensesTests.cs
index 628333f..b70e6a0 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/GPSExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/GPSExpensesTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void GPSExpensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 17,
TrackerCost = 15000
@@ -21,72 +21,72 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
new PaymentRow
{
- GpsBasePayment = 0.00,
+ GpsBasePayment = 0.00m
},
new PaymentRow
{
- GpsBasePayment = 1200.00,
+ GpsBasePayment = 1200.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
+ GpsBasePayment = 600.00m
},
new PaymentRow
{
- GpsBasePayment = 600.00,
- },
+ GpsBasePayment = 600.00m
+ }
}
};
@@ -96,29 +96,29 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -25200.00,
- -15000.00,
- -1200.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
- -600.00,
+ -25200.00m,
+ -15000.00m,
+ -1200.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m,
+ -600.00m
};
Assert.Equal(expected.Length, gpsExpensesColumn.Values.Length);
- Assert.Equal(expected, gpsExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, gpsExpensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/GPS_GrTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/GPS_GrTests.cs
index a0e59c0..d5d5d6e 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/GPS_GrTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/GPS_GrTests.cs
@@ -11,9 +11,9 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void GPS_GrTest1()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
- IrrExpected = 0.22,
+ IrrExpected = 0.22
};
var dateTempColumn = new DateTempColumn(67)
@@ -86,134 +86,134 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2025, 12, 12),
new DateTime(2026, 1, 12),
new DateTime(2026, 2, 12),
- new DateTime(2026, 3, 12),
+ new DateTime(2026, 3, 12)
}
};
- var preparedPayments = new PreparedPayments()
+ var preparedPayments = new PreparedPayments
{
Rows = new[]
{
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
+ GpsCostPayment = 800.00m
},
new PaymentRow
{
- GpsCostPayment = 800.00,
- },
+ GpsCostPayment = 800.00m
+ }
}
};
@@ -224,41 +224,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -19068.29452640964,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
- 800.00,
+ -19068.29452640964m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m,
+ 800.00m
};
var res = gpsGrColumn.Values;
- Assert.Equal(expected, res);
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/InsuranceBonusExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/InsuranceBonusExpensesTests.cs
index 2b9c521..28626f3 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/InsuranceBonusExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/InsuranceBonusExpensesTests.cs
@@ -9,9 +9,9 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void InsuranceBonusExpensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- InsuranceBonus = 26337.5,
+ InsuranceBonus = 26337.5m,
NmperInsurance = 27,
Nmper = 27
};
@@ -22,47 +22,47 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 26337.50,
- 0.00,
- 11705.5555555556,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 14631.9444444444,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 26337.50m,
+ 0.00m,
+ 11705.5555555556m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 14631.9444444444m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, insuranceBonusExpensesColumn.Values.Length);
- Assert.Equal(expected, insuranceBonusExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, insuranceBonusExpensesColumn.Values, new DecimalArrayComparer());
}
[Fact]
public void InsuranceBonusExpensesTest2()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- InsuranceBonus = 26337.5,
+ InsuranceBonus = 26337.5m,
NmperInsurance = 24,
Nmper = 24
};
@@ -73,44 +73,44 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 26337.50,
- 0.00,
- 13168.75,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 13168.75,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 26337.50m,
+ 0.00m,
+ 13168.75m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 13168.75m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, insuranceBonusExpensesColumn.Values.Length);
- Assert.Equal(expected, insuranceBonusExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, insuranceBonusExpensesColumn.Values, new DecimalArrayComparer());
}
[Fact]
public void InsuranceBonusExpensesTest3()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- InsuranceBonus = 32921.875,
+ InsuranceBonus = 32921.875m,
NmperInsurance = 15,
Nmper = 15
};
@@ -121,35 +121,35 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 32921.875,
- 0.00,
- 32921.875,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 32921.875m,
+ 0.00m,
+ 32921.875m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, insuranceBonusExpensesColumn.Values.Length);
- Assert.Equal(expected, insuranceBonusExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, insuranceBonusExpensesColumn.Values, new DecimalArrayComparer());
}
[Fact]
public void InsuranceBonusExpensesTest4()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- InsuranceBonus = 26337.5,
+ InsuranceBonus = 26337.5m,
NmperInsurance = 16,
Nmper = 16
};
@@ -160,28 +160,28 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 26337.50,
- 0.00,
- 19753.125,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 6584.375,
- 0.00,
- 0.00,
- 0.00,
+ 26337.50m,
+ 0.00m,
+ 19753.125m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 6584.375m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, targetColumn.Values.Length);
- Assert.Equal(expected, targetColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, targetColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/KaskoBonusGrSumTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/KaskoBonusGrSumTests.cs
index 0061fee..ce260ac 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/KaskoBonusGrSumTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/KaskoBonusGrSumTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void KaskoBonusGrSumTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 30
};
@@ -20,37 +20,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -97954.4193420531,
- 53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 17666.6666666667,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -97954.419342053m,
+ 53000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 53000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 17666.6666666667m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -61,41 +61,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 98933.3333333333,
- 53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 37100.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 8833.33333333333,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 98933.3333333333m,
+ 53000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 37100.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 8833.33333333333m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
- Assert.Equal(expected, kaskoBonusGrSumColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, kaskoBonusGrSumColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/KaskoNmperGrTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/KaskoNmperGrTests.cs
index 532713e..5f6dd5e 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/KaskoNmperGrTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/KaskoNmperGrTests.cs
@@ -11,7 +11,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void KaskoNmperGrTest1()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
InsuranceKasko = 53000,
NmperInsurance = 17,
@@ -90,7 +90,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2024, 1, 11),
new DateTime(2024, 2, 11),
new DateTime(2024, 3, 11),
- new DateTime(2024, 4, 11),
+ new DateTime(2024, 4, 11)
}
};
@@ -102,48 +102,48 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -70992.94167536501,
- 53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 22083.333333333336,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00
+ -70992.94167536501m,
+ 53000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 22083.333333333336m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
var res = kaskoNmperGrColumn.Values;
- Assert.Equal(expected, res);
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
[Fact]
public void KaskoNmperGrTest2()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
InsuranceKasko = 53000,
NmperInsurance = 16,
@@ -222,7 +222,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2023, 12, 31),
new DateTime(2024, 1, 31),
new DateTime(2024, 2, 29),
- new DateTime(2024, 3, 31),
+ new DateTime(2024, 3, 31)
}
};
@@ -234,34 +234,34 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -67480.874316939895,
- 53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 17666.666666666668,
- 0.00,
- 0.00,
- 0.00,
+ -67480.874316939895m,
+ 53000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 17666.666666666668m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
var res = kaskoNmperGrColumn.Values;
- Assert.Equal(expected, res);
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
[Fact]
public void KaskoNmperGrTest3()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
InsuranceKasko = 53000,
NmperInsurance = 30,
@@ -340,7 +340,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2023, 12, 31),
new DateTime(2024, 1, 31),
new DateTime(2024, 2, 29),
- new DateTime(2024, 3, 31),
+ new DateTime(2024, 3, 31)
}
};
@@ -352,48 +352,48 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -114237.27950469786,
- 53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 26500.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -114237.27950469786m,
+ 53000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 53000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 26500.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
var res = kaskoNmperGrColumn.Values;
- Assert.Equal(expected, res);
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
[Fact]
public void KaskoNmperGrTest4()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
InsuranceKasko = 53000,
NmperInsurance = 15,
@@ -472,7 +472,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2023, 12, 31),
new DateTime(2024, 1, 31),
new DateTime(2024, 2, 29),
- new DateTime(2024, 3, 31),
+ new DateTime(2024, 3, 31)
}
};
@@ -484,35 +484,35 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -66250,
- 66250.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -66250m,
+ 66250.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
var res = kaskoNmperGrColumn.Values;
Assert.Equal(expected.Length, kaskoNmperGrColumn.Values.Length);
- Assert.Equal(expected, res, new DoubleArrayComparer());
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
[Fact]
public void KaskoNmperGrTest5()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
InsuranceKasko = 53000,
NmperInsurance = 16,
@@ -591,7 +591,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2023, 12, 31),
new DateTime(2024, 1, 31),
new DateTime(2024, 2, 29),
- new DateTime(2024, 3, 31),
+ new DateTime(2024, 3, 31)
}
};
@@ -603,29 +603,29 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -67480.8743169399,
- 53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 17666.6666666667,
- 0.00,
- 0.00,
- 0.00,
+ -67480.8743169399m,
+ 53000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 17666.6666666667m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
var res = kaskoNmperGrColumn.Values;
Assert.Equal(expected.Length, kaskoNmperGrColumn.Values.Length);
- Assert.Equal(expected, res, new DoubleArrayComparer());
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/NPVBonusExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/NPVBonusExpensesTests.cs
index 827b95e..55a6114 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/NPVBonusExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/NPVBonusExpensesTests.cs
@@ -14,11 +14,11 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
SalaryRate = 0.3,
MarketRate = 0.01,
DistrictRate = 0.02,
- RatBonus = 360.00,
- NsBonus = 90.00,
- NsibBonus = 97.014,
- BonusFix = 0.00,
- BonusBase = 2003933.33333333,
+ RatBonus = 360.00m,
+ NsBonus = 90.00m,
+ NsibBonus = 97.014m,
+ BonusFix = 0.00m,
+ BonusBase = 2003933.33333333m,
Bonus = 0.011,
Nmper = 30
};
@@ -29,41 +29,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -30248.3858126666,
- -732.451746,
- -29515.9340666666,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -30248.3858126666m,
+ -732.451746m,
+ -29515.9340666666m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
- Assert.Equal(expected, npvBonusExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, npvBonusExpensesColumn.Values, new DecimalArrayComparer());
}
@@ -75,11 +75,11 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
SalaryRate = 0.3,
MarketRate = 0.01,
DistrictRate = 0.02,
- RatBonus = 360.00,
- NsBonus = 90.00,
- NsibBonus = 97.014,
- BonusFix = 20000.00,
- BonusBase = 2003933.33333333,
+ RatBonus = 360.00m,
+ NsBonus = 90.00m,
+ NsibBonus = 97.014m,
+ BonusFix = 20000.00m,
+ BonusBase = 2003933.33333333m,
Bonus = 0.011,
Nmper = 30
};
@@ -90,41 +90,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -20732.451746,
- -732.451746,
- -20000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -20732.451746m,
+ -732.451746m,
+ -20000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
- Assert.Equal(expected, npvBonusExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, npvBonusExpensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/NSIBBruttoGrTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/NSIBBruttoGrTests.cs
index cb2d07f..249b5ad 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/NSIBBruttoGrTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/NSIBBruttoGrTests.cs
@@ -9,10 +9,10 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void NSIBBruttoGrTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 30,
- NsibBrutto = 23842.50
+ NsibBrutto = 23842.50m
};
var nsibBruttoGrColumn = new NSIBBruttoGrColumn(preparedValues.Nmper + 1);
@@ -21,42 +21,42 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 23842.5,
+ 23842.5m,
0,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
- 822.155172413793,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m,
+ 822.155172413793m
};
Assert.Equal(expected.Length, nsibBruttoGrColumn.Values.Length);
- Assert.Equal(expected, nsibBruttoGrColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, nsibBruttoGrColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/NSIBExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/NSIBExpensesTests.cs
index 22c32ae..716f5fd 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/NSIBExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/NSIBExpensesTests.cs
@@ -9,9 +9,9 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void NSIBExpensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- NsibNetto = 4186.80,
+ NsibNetto = 4186.80m,
Nmper = 30
};
@@ -20,49 +20,49 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -4186.80,
- -1674.72,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -1674.72,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -837.36,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -4186.80m,
+ -1674.72m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -1674.72m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -837.36m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, nsibExpensesColumn.Values.Length);
- Assert.Equal(expected, nsibExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, nsibExpensesColumn.Values, new DecimalArrayComparer());
}
[Fact]
public void NSIBExpensesTest2()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- NsibNetto = 2093.40,
+ NsibNetto = 2093.40m,
Nmper = 15
};
@@ -71,34 +71,34 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -2093.40,
- -2093.40,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -2093.40m,
+ -2093.40m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, nsibExpensesColumn.Values.Length);
- Assert.Equal(expected, nsibExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, nsibExpensesColumn.Values, new DecimalArrayComparer());
}
[Fact]
public void NSIBExpensesTest3()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
- NsibNetto = 2372.52,
+ NsibNetto = 2372.52m,
Nmper = 17
};
@@ -107,28 +107,28 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -2372.52,
- -1674.72,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -697.80,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -2372.52m,
+ -1674.72m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -697.80m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, nsibExpensesColumn.Values.Length);
- Assert.Equal(expected, nsibExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, nsibExpensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/NegativeCashflowTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/NegativeCashflowTests.cs
index a05a867..4c001fb 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/NegativeCashflowTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/NegativeCashflowTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void NegativeCashflowTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 30
};
@@ -20,37 +20,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -114237.279504698,
- 53000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 53000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -114237.279504698m,
+ 53000m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 53000m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
26500,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -60,42 +60,42 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -132500.00,
- -53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -53000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -26500.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -132500.00m,
+ -53000,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -53000m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -26500,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, negativeCashflowColumn.Values.Length);
- Assert.Equal(expected, negativeCashflowColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, negativeCashflowColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/PercentPaymentTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/PercentPaymentTests.cs
index d57ec69..676c6eb 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/PercentPaymentTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/PercentPaymentTests.cs
@@ -15,107 +15,107 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
new PaymentRow
{
- PercentPayment = 25.00,
+ PercentPayment = 25.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 1.00,
- },
+ PercentPayment = 1.00
+ }
}
};
var percentPaymentColumn = new PercentPaymentColumn(preparedPayments.Rows.Length + 1);
percentPaymentColumn.ComputeValues(preparedPayments);
- var expected = new double[]
+ var expected = new[]
{
0,
0,
@@ -161,151 +161,151 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 100.00,
+ PercentPayment = 100.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 75.00,
+ PercentPayment = 75.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 50.00,
+ PercentPayment = 50.00
},
new PaymentRow
{
- PercentPayment = 1.00,
- },
+ PercentPayment = 1.00
+ }
}
};
var percentPaymentColumn = new PercentPaymentColumn(preparedPayments.Rows.Length + 1);
percentPaymentColumn.ComputeValues(preparedPayments);
- var expected = new double[]
+ var expected = new[]
{
0.00,
0.00,
@@ -343,7 +343,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
50.00,
50.00,
50.00,
- 0.00,
+ 0.00
};
var res = percentPaymentColumn.Values;
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/RatExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/RatExpensesTests.cs
index 8a5cce2..1f14dfe 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/RatExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/RatExpensesTests.cs
@@ -9,11 +9,11 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void RatExpensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
BaseRatCost = 12000,
RetroBonus = 6000,
- Nmper = 30,
+ Nmper = 30
};
var ratExpensesColumn = new RatExpensesColumn(preparedValues.Nmper + 1);
@@ -22,41 +22,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -6000.00,
- -12000.00,
- 0.00,
- 0.00,
- 6000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -6000.00m,
+ -12000.00m,
+ 0.00m,
+ 0.00m,
+ 6000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
- Assert.Equal(expected, ratExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, ratExpensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/RegistrExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/RegistrExpensesTests.cs
index f854b15..81f9cb4 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/RegistrExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/RegistrExpensesTests.cs
@@ -9,10 +9,10 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void RegistrExpensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
BaseRegistration = 2300,
- Nmper = 17,
+ Nmper = 17
};
var registrExpensesColumn = new RegistrExpensesColumn(preparedValues.Nmper + 1);
@@ -21,29 +21,29 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -2300.00,
- -2300.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -2300.00m,
+ -2300.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
};
Assert.Equal(expected.Length, registrExpensesColumn.Values.Length);
- Assert.Equal(expected, registrExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, registrExpensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/SumTest.cs b/EvoCalculator.Core.Tests/Calculation/Columns/SumTest.cs
index 1281747..4861da6 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/SumTest.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/SumTest.cs
@@ -11,9 +11,9 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void SumTest1()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
- BaseCost = 2842960.70661055,
+ BaseCost = 2842960.70661055m,
FirstPaymentSum = 636000,
Nmper = 30,
LastPaymentSum = 25440,
@@ -55,7 +55,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
100.00,
100.00,
100.00,
- 0.00,
+ 0.00
}
};
@@ -129,44 +129,44 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2023, 12, 31),
new DateTime(2024, 1, 31),
new DateTime(2024, 2, 29),
- new DateTime(2024, 3, 31),
+ new DateTime(2024, 3, 31)
}
};
var expected = new[]
{
- -2842960.70661055,
+ -2842960.70661055m,
636000,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 98647.7277641429,
- 25440,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 98647.7277641429m,
+ 25440
};
var sumColumn = new SumColumn(
@@ -176,14 +176,14 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
, percentPaymentColumn);
sumColumn.ComputeValues(Convert.ToDecimal(preparedValues.IrrExpected));
var values = sumColumn.Values;
- Assert.Equal(expected, values, new DoubleArrayComparer(100));
+ Assert.Equal(expected, values, new DecimalArrayComparer(100));
}
[Fact]
public void SumTest2()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
BaseCost = 2500000,
FirstPaymentSum = 625000,
@@ -209,7 +209,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
100.00,
100.00,
100.00,
- 0.00,
+ 0.00
}
};
@@ -277,25 +277,25 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2025, 6, 19),
new DateTime(2025, 7, 19),
new DateTime(2025, 8, 19),
- new DateTime(2025, 9, 19),
+ new DateTime(2025, 9, 19)
}
};
var expected = new[]
{
- -2500000,
- 625000,
- 209113.783333333,
- 209113.783333333,
- 209113.783333333,
- 209113.783333333,
- 209113.783333333,
- 209113.783333333,
- 209113.783333333,
- 209113.783333333,
- 209113.783333333,
- 209113.783333333,
+ -2500000m,
+ 625000m,
+ 209113.783333333m,
+ 209113.783333333m,
+ 209113.783333333m,
+ 209113.783333333m,
+ 209113.783333333m,
+ 209113.783333333m,
+ 209113.783333333m,
+ 209113.783333333m,
+ 209113.783333333m,
+ 209113.783333333m,
25000
};
@@ -306,16 +306,16 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
, percentPaymentColumn);
sumColumn.ComputeValues(Convert.ToDecimal(preparedValues.IrrExpected));
var values = sumColumn.Values;
- Assert.Equal(expected, values, new DoubleArrayComparer(100));
+ Assert.Equal(expected, values, new DecimalArrayComparer(100));
}
[Fact]
public void SumTest3()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
- BaseCost = 2586532.79187453,
+ BaseCost = 2586532.79187453m,
FirstPaymentSum = 805000,
Nmper = 16,
LastPaymentSum = 23000,
@@ -343,7 +343,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
100.00,
100.00,
100.00,
- 0.00,
+ 0.00
}
};
@@ -411,30 +411,30 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2025, 6, 12),
new DateTime(2025, 7, 12),
new DateTime(2025, 8, 12),
- new DateTime(2025, 9, 12),
+ new DateTime(2025, 9, 12)
}
};
var expected = new[]
{
- -2586532.79187453,
+ -2586532.79187453m,
805000,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 143021.219846191,
- 23000,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 143021.219846191m,
+ 23000
};
var sumColumn = new SumColumn(
@@ -444,7 +444,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
, percentPaymentColumn);
sumColumn.ComputeValues(Convert.ToDecimal(preparedValues.IrrExpected));
var values = sumColumn.Values;
- Assert.Equal(expected, values, new DoubleArrayComparer(100));
+ Assert.Equal(expected, values, new DecimalArrayComparer(100));
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/SumWithVatTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/SumWithVatTests.cs
index a337f5a..e4afc58 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/SumWithVatTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/SumWithVatTests.cs
@@ -12,7 +12,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var preparedValues = new PreparedValues
{
FirstPaymentWithNdsAbs = 50000,
- Nmper = 30,
+ Nmper = 30
};
var dateTempColumn = new DateTempColumn(67);
@@ -21,37 +21,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -2542903.66268442,
- 625000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 25000.00
+ -2542903.66268442m,
+ 625000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 25000.00m
}
};
@@ -61,41 +61,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 4112000.00,
- 50000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 144000.00,
- 30000.00,
+ 4112000.00m,
+ 50000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 144000.00m,
+ 30000.00m
};
var res = sumWithVatColumn.Values;
- Assert.Equal(expected, res);
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/TLMExpensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/TLMExpensesTests.cs
index 75b9d16..ad96e9e 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/TLMExpensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/TLMExpensesTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void TLMExpensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 17,
TLMCost = 20000
@@ -21,72 +21,72 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
new PaymentRow
{
- TlmBasePayment = 0.00,
+ TlmBasePayment = 0.00m
},
new PaymentRow
{
- TlmBasePayment = 1600.00,
+ TlmBasePayment = 1600.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
+ TlmBasePayment = 800.00m
},
new PaymentRow
{
- TlmBasePayment = 800.00,
- },
+ TlmBasePayment = 800.00m
+ }
}
};
@@ -97,28 +97,28 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
-33600,
- -20000.00,
- -1600.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
- -800.00,
+ -20000.00m,
+ -1600.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m,
+ -800.00m
};
Assert.Equal(expected.Length, tlmExpensesColumn.Values.Length);
- Assert.Equal(expected, tlmExpensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, tlmExpensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/TLM_GrTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/TLM_GrTests.cs
index 5d886ff..919f085 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/TLM_GrTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/TLM_GrTests.cs
@@ -11,9 +11,9 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
public void TLM_GrTest1()
{
var preparedValues =
- new PreparedValues()
+ new PreparedValues
{
- IrrExpected = 0.22,
+ IrrExpected = 0.22
};
var dateTempColumn = new DateTempColumn(67)
@@ -86,134 +86,134 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
new DateTime(2025, 12, 12),
new DateTime(2026, 1, 12),
new DateTime(2026, 2, 12),
- new DateTime(2026, 3, 12),
+ new DateTime(2026, 3, 12)
}
};
- var preparedPayments = new PreparedPayments()
+ var preparedPayments = new PreparedPayments
{
Rows = new[]
{
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
+ TlmCostPayment = 1000.00m
},
new PaymentRow
{
- TlmCostPayment = 1000.00,
- },
+ TlmCostPayment = 1000.00m
+ }
}
};
@@ -224,41 +224,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -23835.36815801206,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
- 1000.00,
+ -23835.36815801206m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m,
+ 1000.00m
};
var res = tlmGrColumn.Values;
- Assert.Equal(expected, res);
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/TaxColumnTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/TaxColumnTests.cs
index e28bc4b..069bb46 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/TaxColumnTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/TaxColumnTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void TaxColumnTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 25
};
@@ -19,7 +19,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -2542903.66268442,
+ -2542903.66268442m,
625000,
120000,
120000,
@@ -44,7 +44,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
108000,
96000,
96000,
- 25000,
+ 25000
}
};
@@ -52,32 +52,32 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 140416.666666667,
- 0.00,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 7327.96717171717,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
- 4600.69444444444,
+ 140416.666666667m,
+ 0.00m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 7327.96717171717m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m,
+ 4600.69444444444m
}
};
@@ -85,32 +85,32 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 2525456.22292856,
- 488671.869761719,
- 93824.99899425,
- 93824.99899425,
- 93824.99899425,
- 93824.99899425,
- 93824.99899425,
- 93824.99899425,
- 93824.99899425,
- 93824.99899425,
- 93824.99899425,
- 93824.99899425,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 84442.499094825,
- 75059.9991954,
- 75059.9991954,
- 19546.8747904687,
+ 2525456.22292856m,
+ 488671.869761719m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 93824.99899425m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 84442.499094825m,
+ 75059.9991954m,
+ 75059.9991954m,
+ 19546.8747904687m
}
};
@@ -120,30 +120,30 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
-6000,
-12000,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
6000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -153,30 +153,30 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
-2300,
-2300,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -186,30 +186,30 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
125000,
125000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -218,31 +218,31 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
Values = new[]
{
-18750,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
-9000,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
-9000,
- -750,
+ -750
}
};
@@ -250,32 +250,32 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -19774.2041520833,
- -1389.58909375,
- -18384.6150583333,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -19774.2041520833m,
+ -1389.58909375m,
+ -18384.6150583333m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -283,32 +283,32 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -446104.166666667,
- 0.00,
- -446104.166666667,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ -446104.166666667m,
+ 0.00m,
+ -446104.166666667m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
@@ -316,38 +316,38 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- 26337.50,
- 0.00,
- 12642.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 13695.50,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
+ 26337.50m,
+ 0.00m,
+ 12642.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 13695.50m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m
}
};
var tlmExpensesColumn = new TLMExpensesColumn(preparedValues.Nmper + 1)
{
- Values = new double[]
+ Values = new decimal[]
{
-40000,
-20000,
@@ -374,13 +374,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
-800,
-800,
-800,
- -800,
+ -800
}
};
var gpsExpensesColumn = new GPSExpensesColumn(preparedValues.Nmper + 1)
{
- Values = new double[]
+ Values = new decimal[]
{
-30000,
-15000,
@@ -407,7 +407,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
-600,
-600,
-600,
- -600,
+ -600
}
};
@@ -421,37 +421,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- 30507.2479172043,
- 42127.7082289063,
- -87159.9495781934,
- 3489.40676680657,
- 4689.40676680657,
- 3489.40676680657,
- 3489.40676680657,
- 3489.40676680657,
- 3489.40676680657,
- 3489.40676680657,
- 3489.40676680657,
- 3489.40676680657,
- 1165.90674669157,
- 6250.46129214612,
- 3511.36129214612,
- 3511.36129214612,
- 3511.36129214612,
- 3511.36129214612,
- 3511.36129214612,
- 3511.36129214612,
- 3511.36129214612,
- 3511.36129214612,
- 3511.36129214612,
- 2987.86127203112,
- 1187.86127203112,
- -259.513846982638,
+ 30507.2479172043m,
+ 42127.7082289063m,
+ -87159.9495781934m,
+ 3489.40676680657m,
+ 4689.40676680657m,
+ 3489.40676680657m,
+ 3489.40676680657m,
+ 3489.40676680657m,
+ 3489.40676680657m,
+ 3489.40676680657m,
+ 3489.40676680657m,
+ 3489.40676680657m,
+ 1165.90674669157m,
+ 6250.46129214612m,
+ 3511.36129214612m,
+ 3511.36129214612m,
+ 3511.36129214612m,
+ 3511.36129214612m,
+ 3511.36129214612m,
+ 3511.36129214612m,
+ 3511.36129214612m,
+ 3511.36129214612m,
+ 3511.36129214612m,
+ 2987.86127203112m,
+ 1187.86127203112m,
+ -259.513846982638m
};
Assert.Equal(expected.Length, incomeTaxColumn.Values.Length);
- Assert.Equal(expected, incomeTaxColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, incomeTaxColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/TransExprensesTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/TransExprensesTests.cs
index bafb016..1594301 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/TransExprensesTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/TransExprensesTests.cs
@@ -9,7 +9,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
[Fact]
public void TransExprensesTest1()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 30,
TransportTaxGrYear = 12000,
@@ -22,48 +22,48 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -30000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -12000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -12000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -6000.00,
+ -30000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -12000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -12000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -6000.00m
};
Assert.Equal(expected.Length, transExprensesColumn.Values.Length);
- Assert.Equal(expected, transExprensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, transExprensesColumn.Values, new DecimalArrayComparer());
}
[Fact]
public void TransExprensesTest2()
{
- var preparedValues = new PreparedValues()
+ var preparedValues = new PreparedValues
{
Nmper = 32,
TransportTaxGrYear = 9000,
@@ -76,44 +76,44 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
- -24000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -9000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -9000.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- 0.00,
- -6000.00,
+ -24000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -9000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -9000.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ 0.00m,
+ -6000.00m
};
Assert.Equal(expected.Length, transExprensesColumn.Values.Length);
- Assert.Equal(expected, transExprensesColumn.Values, new DoubleArrayComparer());
+ Assert.Equal(expected, transExprensesColumn.Values, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Columns/VATColumnTests.cs b/EvoCalculator.Core.Tests/Calculation/Columns/VATColumnTests.cs
index a14d7af..10c01e4 100644
--- a/EvoCalculator.Core.Tests/Calculation/Columns/VATColumnTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Columns/VATColumnTests.cs
@@ -12,7 +12,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var preparedValues = new PreparedValues
{
FirstPaymentNdsAbs = 0,
- Nmper = 30,
+ Nmper = 30
};
var dateTempColumn = new DateTempColumn(67);
@@ -21,37 +21,37 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
{
Values = new[]
{
- -2542903.66268442,
- 625000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 120000.00,
- 25000.00
+ -2542903.66268442m,
+ 625000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 120000.00m,
+ 25000.00m
}
};
@@ -62,41 +62,41 @@ namespace EvoCalculator.Core.Tests.Calculation.Columns
var expected = new[]
{
802000,
- 125000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 24000.00,
- 5000.00,
+ 125000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 24000.00m,
+ 5000.00m
};
var res = vatColumn.Values;
- Assert.Equal(expected, res);
+ Assert.Equal(expected, res, new DecimalArrayComparer());
}
}
}
\ No newline at end of file
diff --git a/EvoCalculator.Core.Tests/Calculation/Controller/CalculationControllerV1Tests.cs b/EvoCalculator.Core.Tests/Calculation/Controller/CalculationControllerV1Tests.cs
index afedb72..cef5e76 100644
--- a/EvoCalculator.Core.Tests/Calculation/Controller/CalculationControllerV1Tests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/Controller/CalculationControllerV1Tests.cs
@@ -19,7 +19,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
IrrExpected = 0.23,
NpvniExpected = 0.05,
TotalExpected = 0,
- Leasing0K = 1,
+ Leasing0K = true,
LoanRate = 0.07,
BalanceHolder = 100000000,
DogDate = new DateTime(2020, 10, 12),
@@ -42,13 +42,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
MotorVolume = 0,
PlEngineType = 0,
CarCarrying = 0,
- AgentsSum = 13885.675,
- DoubleAgentsSum = 16662.81,
+ AgentsSum = 13885.675m,
+ DoubleAgentsSum = 16662.81m,
DeliverySum = 15295,
BrokerSum = 17480,
BrokerOfDeliverySum = 19665,
FinancialDeptOfDeliverySum = 21850,
- ImporterSum = 19166.6666666667,
+ ImporterSum = 19166.6666666667m,
Bonus = 0.011,
BonusFix = 0,
MarketRate = 0.01,
@@ -56,7 +56,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
SalaryRate = 0.3,
RatBonus = 210,
NsBonus = 210,
- NsibBonus = 592.64688,
+ NsibBonus = 592.64688m,
Rats = 7000,
BaseRatCost = 7000,
RetroBonus = 3500,
@@ -65,7 +65,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
TransTax = 0,
TransIncludeGr = true,
TransportTaxGrYear = 35000,
- TransportTaxGr = 46666.6666666667,
+ TransportTaxGr = 46666.6666666667m,
TrackerCost = 15000,
TLMCost = 22000,
InsuranceKasko = 85548,
@@ -76,18 +76,18 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
InsuranceContract = 226430,
InsuranceBonus = 0,
NsibBase = 2116596,
- NsibBrutto = 19754.896,
- NsibNetto = 2822.128,
+ NsibBrutto = 19754.896m,
+ NsibNetto = 2822.128m,
Repayment = 0.25,
NmperDeprecation = 37,
DeprecationTime = 5.6,
CalculationCost = 2445108,
- PriceUpTotal = 2703584.896,
+ PriceUpTotal = 2703584.896m,
AcquisitionExpenses = 2283678,
- NpvBase = 1480794.596,
- NiAtInception = 19166.6666666667,
- BonusBase = 1513378.6,
- BaseCost = 2586532.79187453,
+ NpvBase = 1480794.596m,
+ NiAtInception = 19166.6666666667m,
+ BonusBase = 1513378.6m,
+ BaseCost = 2586532.79187453m,
};
var preparedPayments = new PreparedPayments()
@@ -98,145 +98,145 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
{
NumberPayment = 1,
PercentPayment = 0.00,
- GpsBasePayment = 0.00,
- GpsCostPayment = 0.00,
- TlmBasePayment = 0.00,
- TlmCostPayment = 0.00
+ GpsBasePayment = 0.00m,
+ GpsCostPayment = 0.00m,
+ TlmBasePayment = 0.00m,
+ TlmCostPayment = 0.00m
},
new PaymentRow
{
NumberPayment = 2,
PercentPayment = 100.00,
- GpsBasePayment = 1500.00,
- GpsCostPayment = 1800.00,
- TlmBasePayment = 1220.00,
- TlmCostPayment = 1500.00
+ GpsBasePayment = 1500.00m,
+ GpsCostPayment = 1800.00m,
+ TlmBasePayment = 1220.00m,
+ TlmCostPayment = 1500.00m
},
new PaymentRow
{
NumberPayment = 3,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 4,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 5,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 6,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 7,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 8,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 9,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 10,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 11,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 12,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 13,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 14,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 15,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
new PaymentRow
{
NumberPayment = 16,
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
- GpsCostPayment = 900.00,
- TlmBasePayment = 610.00,
- TlmCostPayment = 800.00
+ GpsBasePayment = 750.00m,
+ GpsCostPayment = 900.00m,
+ TlmBasePayment = 610.00m,
+ TlmCostPayment = 800.00m
},
}
};
@@ -271,7 +271,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
IrrExpected = 0.22,
NpvniExpected = 0.05,
TotalExpected = 0,
- Leasing0K = 1,
+ Leasing0K = true,
LoanRate = 0.07,
BalanceHolder = 100000001,
DogDate = new DateTime(2020, 10, 22),
@@ -294,13 +294,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
MotorVolume = 0,
PlEngineType = 0,
CarCarrying = 0,
- AgentsSum = 21130.375,
- DoubleAgentsSum = 25356.45,
+ AgentsSum = 21130.375m,
+ DoubleAgentsSum = 25356.45m,
DeliverySum = 23275,
BrokerSum = 26600,
BrokerOfDeliverySum = 29925,
FinancialDeptOfDeliverySum = 33250,
- ImporterSum = 19166.6666666667,
+ ImporterSum = 19166.6666666667m,
Bonus = 0.011,
BonusFix = 0,
MarketRate = 0.01,
@@ -308,7 +308,7 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
SalaryRate = 0.3,
RatBonus = 210,
NsBonus = 210,
- NsibBonus = 121.74786,
+ NsibBonus = 121.74786m,
Rats = 7000,
BaseRatCost = 7000,
RetroBonus = 3500,
@@ -326,20 +326,20 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
Insurance = 98108,
InsuranceKaskoNmper = 85548,
InsuranceContract = 98108,
- InsuranceBonus = 37089.8791666667,
- NsibBase = 3246609.6,
- NsibBrutto = 4058.262,
- NsibNetto = 7304.8716,
+ InsuranceBonus = 37089.8791666667m,
+ NsibBase = 3246609.6m,
+ NsibBrutto = 4058.262m,
+ NsibNetto = 7304.8716m,
Repayment = 0.25,
NmperDeprecation = 37,
DeprecationTime = 5.6,
CalculationCost = 3645108,
- PriceUpTotal = 3759566.262,
+ PriceUpTotal = 3759566.262m,
AcquisitionExpenses = 3469678,
- NpvBase = 2597599.94864,
- NiAtInception = 19166.6666666667,
+ NpvBase = 2597599.94864m,
+ NiAtInception = 19166.6666666667m,
BonusBase = 2548108,
- BaseCost = 3689559.59284717,
+ BaseCost = 3689559.59284717m,
};
var preparedPayments = new PreparedPayments()
@@ -352,13 +352,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 0.00,
- GpsBasePayment = 0.00,
+ GpsBasePayment = 0.00m,
- GpsCostPayment = 0.00,
+ GpsCostPayment = 0.00m,
- TlmBasePayment = 0.00,
+ TlmBasePayment = 0.00m,
- TlmCostPayment = 0.00
+ TlmCostPayment = 0.00m
},
new PaymentRow
@@ -367,13 +367,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 1500.00,
+ GpsBasePayment = 1500.00m,
- GpsCostPayment = 1800.00,
+ GpsCostPayment = 1800.00m,
- TlmBasePayment = 1220.00,
+ TlmBasePayment = 1220.00m,
- TlmCostPayment = 1500.00
+ TlmCostPayment = 1500.00m
},
new PaymentRow
@@ -383,13 +383,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -399,13 +399,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -415,13 +415,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -431,13 +431,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -447,13 +447,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -463,13 +463,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -479,13 +479,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -495,13 +495,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -511,13 +511,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -527,13 +527,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -543,13 +543,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -559,13 +559,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -575,13 +575,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -591,13 +591,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -607,13 +607,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -623,13 +623,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -639,13 +639,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -655,13 +655,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -671,13 +671,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -687,13 +687,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -703,13 +703,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -719,13 +719,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -735,13 +735,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -751,13 +751,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -767,13 +767,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -783,13 +783,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -799,13 +799,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
new PaymentRow
@@ -815,13 +815,13 @@ namespace EvoCalculator.Core.Tests.Calculation.Controller
PercentPayment = 100.00,
- GpsBasePayment = 750.00,
+ GpsBasePayment = 750.00m,
- GpsCostPayment = 900.00,
+ GpsCostPayment = 900.00m,
- TlmBasePayment = 610.00,
+ TlmBasePayment = 610.00m,
- TlmCostPayment = 800.00
+ TlmCostPayment = 800.00m
},
}
};
diff --git a/EvoCalculator.Core.Tests/Calculation/FinanceFormulas/FinanceFormulasTests.cs b/EvoCalculator.Core.Tests/Calculation/FinanceFormulas/FinanceFormulasTests.cs
index 13d322e..01678d2 100644
--- a/EvoCalculator.Core.Tests/Calculation/FinanceFormulas/FinanceFormulasTests.cs
+++ b/EvoCalculator.Core.Tests/Calculation/FinanceFormulas/FinanceFormulasTests.cs
@@ -3,15 +3,12 @@ using System.Linq;
using EvoCalculator.Core.FinanceFormulas;
using EvoCalculator.Core.Models.Calculation.Models;
using Xunit;
-using Xunit.Abstractions;
namespace EvoCalculator.Core.Tests.Calculation.FinanceFormulas
{
public class FinanceFormulasTests
{
- private readonly ITestOutputHelper output;
-
- readonly Flow[] _flows =
+ private readonly Flow[] _flows =
{
new Flow
{
@@ -21,76 +18,70 @@ namespace EvoCalculator.Core.Tests.Calculation.FinanceFormulas
new Flow
{
Date = new DateTime(2020, 09, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2020, 10, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2020, 11, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2020, 12, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2021, 1, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2021, 2, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2021, 3, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2021, 4, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2021, 5, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2021, 6, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2021, 7, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
new Flow
{
Date = new DateTime(2021, 8, 01),
- Value = 608944.445718643
+ Value = 608944.445718643m
},
};
- public FinanceFormulasTests(ITestOutputHelper output)
- {
- this.output = output;
- }
-
[Fact]
public void XNPVTest()
{
var XNPV = new XNPV(_flows.Skip(1).ToArray(), 0.3);
var res = XNPV.GetResult();
- output.WriteLine(res.ToString());
Assert.InRange(res, 6490000, 6590000);
}
@@ -99,7 +90,6 @@ namespace EvoCalculator.Core.Tests.Calculation.FinanceFormulas
{
var XIRR = new XIRR(_flows);
var res = XIRR.GetResult();
- output.WriteLine(res.ToString());
Assert.InRange(res, 0.29, 0.31);
}
}
diff --git a/EvoCalculator.Core.Tests/DoubleArrayComparer.cs b/EvoCalculator.Core.Tests/DoubleArrayComparer.cs
deleted file mode 100644
index 5c49c5b..0000000
--- a/EvoCalculator.Core.Tests/DoubleArrayComparer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace EvoCalculator.Core.Tests
-{
- public class DoubleArrayComparer : IEqualityComparer
- {
- private double _tolerance = 0.001;
-
- public DoubleArrayComparer(double tolerance)
- {
- this._tolerance = tolerance;
- }
- public DoubleArrayComparer()
- {
-
- }
-
- public bool Equals(double x, double y)
- {
- return Math.Abs(x - y) < _tolerance;
- }
-
- public int GetHashCode(double obj)
- {
- return obj.GetHashCode();
- }
- }
-}
\ No newline at end of file
diff --git a/EvoCalculator.Core/Controllers/v1/WeatherForecastController.cs b/EvoCalculator.Core/Controllers/v1/WeatherForecastController.cs
deleted file mode 100644
index 9987642..0000000
--- a/EvoCalculator.Core/Controllers/v1/WeatherForecastController.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EvoCalculator.Core.Models.Weather;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-namespace EvoCalculator.Core.Controllers.V1
-{
- [ApiController]
- [ApiVersion("1.0")]
- [Route("api/v{version:apiVersion}/[controller]")]
- public class WeatherForecastController : ControllerBase
- {
- private static readonly string[] Summaries = new[]
- {
- "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
- };
-
- private readonly ILogger _logger;
-
- public WeatherForecastController(ILogger logger)
- {
- _logger = logger;
- }
-
- [HttpGet]
- public IEnumerable Get()
- {
- var rng = new Random();
- return Enumerable.Range(1, 5).Select(index => new WeatherForecast
- {
- Date = DateTime.Now.AddDays(index),
- TemperatureC = rng.Next(-20, 55),
- Summary = Summaries[rng.Next(Summaries.Length)]
- })
- .ToArray();
- }
- }
-}
\ No newline at end of file