diff --git a/Constants/Consts.ipynb b/Constants/Consts.ipynb
index 808308c2..79179ff2 100644
--- a/Constants/Consts.ipynb
+++ b/Constants/Consts.ipynb
@@ -169,22 +169,13 @@
"\n}"
]
},
- {
- "cell_type": "code",
- "source": [
- "public static class CalculationTypes{",
- "\n public const string BE = nameof(BE); //Best Estimate",
- "\n public const string CU = nameof(CU); //Coverage Units",
- "\n public const string RA = nameof(RA); //Risk Adjustment",
- "\n}"
- ]
- },
{
"cell_type": "code",
"source": [
"public static class EstimateTypes{",
"\n public const string BE = nameof(BE); //Best Estimate",
"\n public const string RA = nameof(RA); //Risk Adjustment",
+ "\n public const string CU = nameof(CU); //Coverage Units",
"\n public const string A = nameof(A); //Actuals",
"\n public const string AA = nameof(AA); //Advance Actuals",
"\n public const string OA = nameof(OA); //Overdue Actuals",
diff --git a/Constants/Validations.ipynb b/Constants/Validations.ipynb
index d1b09cc0..56dec561 100644
--- a/Constants/Validations.ipynb
+++ b/Constants/Validations.ipynb
@@ -57,7 +57,7 @@
"\n // Partition",
"\n PartitionNotFound, ParsedPartitionNotFound, PartititionNameNotFound, PartitionTypeNotFound,",
"\n // Dimensions",
- "\n AmountTypeNotFound, EstimateTypeNotFound,CalculationTypeNotFound, ReportingNodeNotFound, AocTypeMapNotFound, AocTypeNotFound, PortfolioGicNotFound, PortfolioGricNotFound, ",
+ "\n AmountTypeNotFound, EstimateTypeNotFound, ReportingNodeNotFound, AocTypeMapNotFound, AocTypeNotFound, PortfolioGicNotFound, PortfolioGricNotFound, ",
"\n InvalidAmountTypeEstimateType, MultipleTechnicalMarginOpening,",
"\n // Exchange Rate",
"\n ExchangeRateNotFound, ExchangeRateCurrency,",
@@ -103,7 +103,6 @@
"\n // Dimensions",
"\n (Error.AmountTypeNotFound , 1) => $\"AmountType {s[0]} not found.\",",
"\n (Error.EstimateTypeNotFound , 1) => $\"EstimateType {s[0]} not found.\",",
- "\n (Error.CalculationTypeNotFound , 1) => $\"CalculationType {s[0]} not found.\",",
"\n (Error.ReportingNodeNotFound , 1) => $\"Reporting Node {s[0]} not found.\",",
"\n (Error.AocTypeNotFound , 1) => $\"AocType {s[0]} not found.\",",
"\n (Error.AocTypeMapNotFound , 2) => $\"AocType {s[0]} and Novelty {s[1]} combination not defined in the mapping.\",",
diff --git a/DataModel/DataStructure.ipynb b/DataModel/DataStructure.ipynb
index 55885f24..98114494 100644
--- a/DataModel/DataStructure.ipynb
+++ b/DataModel/DataStructure.ipynb
@@ -305,24 +305,6 @@
"\npublic record DeferrableAmountType : AmountType {}"
]
},
- {
- "cell_type": "markdown",
- "source": [
- "",
- "\n## Calculation Type",
- "\nThis dimension is used to distinguish between e.g. **Best Estimate** values and **Risk Adjustment** values:"
- ]
- },
- {
- "cell_type": "code",
- "source": [
- "public record CalculationType : KeyedOrderedDimension {",
- "\n [Display(Order = 10)]",
- "\n [Dimension(typeof(PeriodType))]",
- "\n public PeriodType PeriodType { get; init; }",
- "\n}"
- ]
- },
{
"cell_type": "markdown",
"source": [
@@ -364,6 +346,9 @@
"\n ",
"\n [Display(Order = 120)]",
"\n public StructureType StructureType { get; init; }",
+ "\n",
+ "\n [Dimension(typeof(PeriodType))]",
+ "\n public PeriodType PeriodType { get; init; }",
"\n}"
]
},
@@ -1443,9 +1428,9 @@
"\n public double[] Values { get; init; }",
"\n ",
"\n [NotVisible]",
- "\n [Dimension(typeof(CalculationType))]",
+ "\n [Dimension(typeof(EstimateType))]",
"\n [IdentityProperty]",
- "\n public string CalculationType { get; init; }",
+ "\n public string EstimateType { get; init; }",
"\n}"
]
},
diff --git a/Files/DimensionsAndPartitions.csv b/Files/DimensionsAndPartitions.csv
index 80f592bd..e9353558 100644
--- a/Files/DimensionsAndPartitions.csv
+++ b/Files/DimensionsAndPartitions.csv
@@ -65,12 +65,6 @@ AM,C,Calculated,6,EndOfPeriod,NotApplicable,NotApplicable,NotApplicable,EndOfPer
FX,C,Calculated,0,NotApplicable,NotApplicable,NotApplicable,NotApplicable,NotApplicable,210,1900,1
EOP,C,Calculated,6,EndOfPeriod,EndOfPeriod,EndOfPeriod,EndOfPeriod,EndOfPeriod,220,1900,1
,,,,,,,,,,,
-@@CalculationType,,,,,,,,,,,
-SystemName,DisplayName,PeriodType,Order,,,,,,,,
-BE,Best Estimate,EndOfPeriod,10,,,,,,,,
-RA,Risk Adjustment,EndOfPeriod,20,,,,,,,,
-CU,Coverage Unit,EndOfPeriod,30,,,,,,,,
-,,,,,,,,,,,
@@CreditRiskRating,,,,,,,,,,,
SystemName,DisplayName,,,,,,,,,,
AAA,AAA,,,,,,,,,,
@@ -115,22 +109,23 @@ L,Locked-in,10,,,,,,,,,
C,Current,20,,,,,,,,,
,,,,,,,,,,,
@@EstimateType,,,,,,,,,,,
-SystemName,DisplayName,Order,StructureType,InputSource,ExternalId0,ExternalId1,ExternalId2,,,,
-BE,Best Estimate of Present Value,1,AoC,4,,,,,,,
-RA,Risk Adjustment,10,AoC,4,,,,,,,
-C,Contractual Service Margin,20,AoC,7,,,,,,,
-L,Loss Component,30,AoC,7,,,,,,,
-LR,Loss Recovery Component,40,AoC,7,,,,,,,
-PL,Profit and Loss,50,None,7,,,,,,,
-AA,Advance Actuals,60,AoC,3,PayablePR,ReceivableNIC,ReceivableICO,,,,
-OA,Overdue Actuals,70,AoC,3,ReceivablePR,PayableNIC,PayableICO,,,,
-DA,Deferrable Actuals,80,AoC,3,,,,,,,
-A,Actuals,90,None,2,,,,,,,
-F,Factors,100,None,4,,,,,,,
-AAPA,Advance Actuals,110,None,2,,,,,,,
-OAPA,Overdue Actuals,120,None,2,,,,,,,
-APA,Actuals,130,None,2,,,,,,,
-BEPA,Best Estimate of Present Value,140,None,4,,,,,,,
+SystemName,DisplayName,Order,StructureType,InputSource,PeriodType,ExternalId0,ExternalId1,ExternalId2,,,
+BE,Best Estimate of Present Value,1,AoC,4,,,,EndOfPeriod,,,
+RA,Risk Adjustment,10,AoC,4,,,,EndOfPeriod,,,
+CU,CoverageUnit,15,AoC,4,,,,EndOfPeriod,,,
+C,Contractual Service Margin,20,AoC,7,,,,NotApplicable,,,
+L,Loss Component,30,AoC,7,,,,NotApplicable,,,
+LR,Loss Recovery Component,40,AoC,7,,,,NotApplicable,,,
+PL,Profit and Loss,50,None,7,,,,NotApplicable,,,
+AA,Advance Actuals,60,AoC,3,PayablePR,ReceivableNIC,ReceivableICO,NotApplicable,,,
+OA,Overdue Actuals,70,AoC,3,ReceivablePR,PayableNIC,PayableICO,NotApplicable,,,
+DA,Deferrable Actuals,80,AoC,3,,,,NotApplicable,,,
+A,Actuals,90,None,2,,,,NotApplicable,,,
+F,Factors,100,None,4,,,,NotApplicable,,,
+AAPA,Advance Actuals,110,None,2,,,,NotApplicable,,,
+OAPA,Overdue Actuals,120,None,2,,,,NotApplicable,,,
+APA,Actuals,130,None,2,,,,NotApplicable,,,
+BEPA,Best Estimate of Present Value,140,None,4,,,,NotApplicable,,,
,,,,,,,,,,,
@@LiabilityType,,,,,,,,,,,
SystemName,DisplayName,,,,,,,,,,
diff --git a/Import/ImportScopeCalculation.ipynb b/Import/ImportScopeCalculation.ipynb
index 4f8e78f5..ce766089 100644
--- a/Import/ImportScopeCalculation.ipynb
+++ b/Import/ImportScopeCalculation.ipynb
@@ -464,20 +464,20 @@
{
"cell_type": "code",
"source": [
- "public interface NominalCashflow : IScope<(ImportIdentity Id, string AmountType, string CalculationType, int? AccidentYear), ImportStorage>",
+ "public interface NominalCashflow : IScope<(ImportIdentity Id, string AmountType, string EstimateType, int? AccidentYear), ImportStorage>",
"\n{",
"\n static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
"\n builder.ForScope(s => s.WithApplicability(x => x.Identity.AmountType == AmountTypes.CDR && x.Identity.Id.AocType == AocTypes.CF)",
"\n .WithApplicability(x => x.Identity.AmountType == AmountTypes.CDR));",
"\n",
"\n AocStep referenceAocStep => GetScope(Identity.Id).Value;",
- "\n double[] Values => GetStorage().GetValues(Identity.Id with {AocType = referenceAocStep.AocType, Novelty = referenceAocStep.Novelty}, Identity.AmountType, Identity.CalculationType, Identity.AccidentYear);",
+ "\n double[] Values => GetStorage().GetValues(Identity.Id with {AocType = referenceAocStep.AocType, Novelty = referenceAocStep.Novelty}, Identity.AmountType, Identity.EstimateType, Identity.AccidentYear);",
"\n}",
"\n",
"\npublic interface CreditDefaultRiskNominalCashflow : NominalCashflow",
"\n{",
"\n private double[] NominalClaimsCashflow => GetStorage().GetClaims()",
- "\n .Select(claim => GetStorage().GetValues(Identity.Id with {AocType = referenceAocStep.AocType, Novelty = referenceAocStep.Novelty}, claim, Identity.CalculationType, Identity.AccidentYear))",
+ "\n .Select(claim => GetStorage().GetValues(Identity.Id with {AocType = referenceAocStep.AocType, Novelty = referenceAocStep.Novelty}, claim, Identity.EstimateType, Identity.AccidentYear))",
"\n .Aggregate();",
"\n ",
"\n private double nonPerformanceRiskRate => GetStorage().GetNonPerformanceRiskRate(Identity.Id);",
@@ -494,7 +494,7 @@
"\npublic interface AllClaimsCashflow : NominalCashflow",
"\n{",
"\n double[] NominalCashflow.Values => GetStorage().GetClaims()",
- "\n .Select(claim => GetStorage().GetValues(Identity.Id with {AocType = referenceAocStep.AocType, Novelty = referenceAocStep.Novelty}, claim, Identity.CalculationType, Identity.AccidentYear))",
+ "\n .Select(claim => GetStorage().GetValues(Identity.Id with {AocType = referenceAocStep.AocType, Novelty = referenceAocStep.Novelty}, claim, Identity.EstimateType, Identity.AccidentYear))",
"\n .Aggregate();",
"\n}"
]
@@ -547,9 +547,9 @@
{
"cell_type": "code",
"source": [
- "public interface DiscountedCashflow : IScope<(ImportIdentity Id, string AmountType, string CalculationType, int? Accidentyear), ImportStorage>",
+ "public interface DiscountedCashflow : IScope<(ImportIdentity Id, string AmountType, string EstimateType, int? Accidentyear), ImportStorage>",
"\n{",
- "\n private PeriodType periodType => GetStorage().GetPeriodType(Identity.AmountType, Identity.CalculationType); ",
+ "\n private PeriodType periodType => GetStorage().GetPeriodType(Identity.AmountType, Identity.EstimateType); ",
"\n ",
"\n static ApplicabilityBuilder ScopeApplicabilityBuilder(ApplicabilityBuilder builder) =>",
"\n builder.ForScope(s => s.WithApplicability(x => x.Identity.Id.IsReinsurance && x.Identity.AmountType == AmountTypes.CDR));",
@@ -604,7 +604,7 @@
{
"cell_type": "code",
"source": [
- "public interface TelescopicDifference : IScope<(ImportIdentity Id, string AmountType, string CalculationType, int? Accidentyear), ImportStorage>",
+ "public interface TelescopicDifference : IScope<(ImportIdentity Id, string AmountType, string EstimateType, int? Accidentyear), ImportStorage>",
"\n{",
"\n [NotVisible]",
"\n string EconomicBasis => GetContext();",
@@ -612,7 +612,7 @@
"\n ",
"\n private double[] PreviousValues => (GetScope((Identity.Id, Identity.AmountType)))",
"\n .Values",
- "\n .Select(aoc => GetScope((Identity.Id with {AocType = aoc.AocType, Novelty = aoc.Novelty}, Identity.AmountType, Identity.CalculationType, Identity.Accidentyear)).Values)",
+ "\n .Select(aoc => GetScope((Identity.Id with {AocType = aoc.AocType, Novelty = aoc.Novelty}, Identity.AmountType, Identity.EstimateType, Identity.Accidentyear)).Values)",
"\n .Where(cf => cf.Count() > 0)",
"\n .Aggregate();",
"\n ",
@@ -654,7 +654,7 @@
{
"cell_type": "code",
"source": [
- "public interface IWithGetValueFromValues : IScope<(ImportIdentity Id, string AmountType, string CalculationType, int? AccidentYear), ImportStorage>",
+ "public interface IWithGetValueFromValues : IScope<(ImportIdentity Id, string AmountType, string EstimateType, int? AccidentYear), ImportStorage>",
"\n{",
"\n private int shift => GetStorage().GetShift(0);//Identity.Id.ProjectionPeriod",
"\n private int timeStep => GetStorage().GetTimeStep(0);//Identity.Id.ProjectionPeriod",
@@ -701,7 +701,7 @@
{
"cell_type": "code",
"source": [
- "public interface IWithInterestAccretion : IScope<(ImportIdentity Id, string AmountType, string CalculationType, int? AccidentYear), ImportStorage>",
+ "public interface IWithInterestAccretion : IScope<(ImportIdentity Id, string AmountType, string EstimateType, int? AccidentYear), ImportStorage>",
"\n{",
"\n private double[] parentDiscountedValues => GetScope(Identity).Values; ",
"\n private double[] parentNominalValues => GetScope(Identity).Values;",
@@ -709,7 +709,7 @@
"\n ",
"\n double[] GetInterestAccretion() ",
"\n {",
- "\n var periodType = GetStorage().GetPeriodType(Identity.AmountType, Identity.CalculationType);",
+ "\n var periodType = GetStorage().GetPeriodType(Identity.AmountType, Identity.EstimateType);",
"\n var ret = new double[parentDiscountedValues.Length];",
"\n ",
"\n switch (periodType) {",
@@ -727,7 +727,7 @@
"\n }",
"\n}",
"\n",
- "\npublic interface IWithInterestAccretionForCreditRisk : IScope<(ImportIdentity Id, string AmountType, string CalculationType, int? AccidentYear), ImportStorage>",
+ "\npublic interface IWithInterestAccretionForCreditRisk : IScope<(ImportIdentity Id, string AmountType, string EstimateType, int? AccidentYear), ImportStorage>",
"\n{",
"\n private double[] nominalClaimsCashflow => GetScope(Identity).Values;",
"\n private double[] nominalValuesCreditRisk => -1 * GetScope(Identity with {Id = Identity.Id with {AocType = AocTypes.CF}}).Values;",
@@ -806,7 +806,7 @@
"\n",
"\npublic interface ComputePresentValueWithIfrsVariable : PresentValue",
"\n{",
- "\n double PresentValue.Value => GetStorage().GetValue(Identity.Id, Identity.AmountType, Identity.CalculationType, EconomicBasis, Identity.AccidentYear); //unify CalculationType and EstimateTypeGet",
+ "\n double PresentValue.Value => GetStorage().GetValue(Identity.Id, Identity.AmountType, Identity.EstimateType, EconomicBasis, Identity.AccidentYear);",
"\n double[] PresentValue.Values => Enumerable.Empty().ToArray();",
"\n}",
"\n",
@@ -887,15 +887,15 @@
"\n [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))]",
"\n string EconomicBasis => EconomicBases.L;",
"\n ",
- "\n [IdentityProperty][NotVisible][Dimension(typeof(CalculationType))]",
- "\n string CalculationType => CalculationTypes.BE;",
+ "\n [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
+ "\n string EstimateType => EstimateTypes.BE;",
"\n ",
"\n private int?[] accidentYears => GetStorage().GetAccidentYears(Identity.DataNode).ToArray(); ",
"\n ",
"\n [NotVisible]",
"\n PresentValue[] PresentValues => GetScope(Identity.DataNode).BeAmountTypes",
"\n .SelectMany(at => accidentYears",
- "\n .Select(ay => GetScope((Identity, at, CalculationType, ay), o => o.WithContext(EconomicBasis))))",
+ "\n .Select(ay => GetScope((Identity, at, EstimateType, ay), o => o.WithContext(EconomicBasis))))",
"\n .ToArray();",
"\n double Value => PresentValues.Aggregate().Value;",
"\n}",
@@ -905,15 +905,15 @@
"\n [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))]",
"\n string EconomicBasis => EconomicBases.C;",
"\n ",
- "\n [IdentityProperty][NotVisible][Dimension(typeof(CalculationType))]",
- "\n string CalculationType => CalculationTypes.BE;",
+ "\n [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
+ "\n string EstimateType => EstimateTypes.BE;",
"\n ",
"\n private int?[] accidentYears => GetStorage().GetAccidentYears(Identity.DataNode).ToArray();",
"\n ",
"\n [NotVisible]",
"\n PresentValue[] PresentValues => GetScope(Identity.DataNode).BeAmountTypes",
"\n .SelectMany(at => accidentYears",
- "\n .Select(ay => GetScope((Identity, at, CalculationType, ay), o => o.WithContext(EconomicBasis))))",
+ "\n .Select(ay => GetScope((Identity, at, EstimateType, ay), o => o.WithContext(EconomicBasis))))",
"\n .ToArray();",
"\n ",
"\n double Value => PresentValues.Aggregate().Value;",
@@ -947,12 +947,12 @@
"\n [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))]",
"\n string EconomicBasis => EconomicBases.L;",
"\n ",
- "\n [IdentityProperty][NotVisible][Dimension(typeof(CalculationType))]",
- "\n string CalculationType => CalculationTypes.RA;",
+ "\n [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
+ "\n string EstimateType => EstimateTypes.RA;",
"\n ",
"\n private int?[] accidentYears => GetStorage().GetAccidentYears(Identity.DataNode).ToArray(); ",
"\n ",
- "\n PresentValue[] PresentValues => accidentYears.Select(ay => GetScope((Identity, (string)null, CalculationType, ay), o => o.WithContext(EconomicBasis))).ToArray();",
+ "\n PresentValue[] PresentValues => accidentYears.Select(ay => GetScope((Identity, (string)null, EstimateType, ay), o => o.WithContext(EconomicBasis))).ToArray();",
"\n ",
"\n double Value => PresentValues.Aggregate().Value;",
"\n}",
@@ -961,12 +961,12 @@
"\n [IdentityProperty][NotVisible][Dimension(typeof(EconomicBasis))]",
"\n string EconomicBasis => EconomicBases.C;",
"\n ",
- "\n [IdentityProperty][NotVisible][Dimension(typeof(CalculationType))]",
- "\n string CalculationType => CalculationTypes.RA;",
+ "\n [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
+ "\n string EstimateType => EstimateTypes.RA;",
"\n ",
"\n private int?[] accidentYears => GetStorage().GetAccidentYears(Identity.DataNode).ToArray(); ",
"\n ",
- "\n PresentValue[] PresentValues => accidentYears.Select(ay => GetScope((Identity, (string)null, CalculationType, ay), o => o.WithContext(EconomicBasis))).ToArray(); ",
+ "\n PresentValue[] PresentValues => accidentYears.Select(ay => GetScope((Identity, (string)null, EstimateType, ay), o => o.WithContext(EconomicBasis))).ToArray(); ",
"\n ",
"\n double Value => PresentValues.Aggregate().Value;",
"\n}"
@@ -1000,10 +1000,10 @@
"\n{ ",
"\n [NotVisible] string EconomicBasis => GetContext();",
"\n ",
- "\n [IdentityProperty][NotVisible][Dimension(typeof(CalculationType))]",
- "\n string CalculationType => CalculationTypes.CU;",
+ "\n [IdentityProperty][NotVisible][Dimension(typeof(EstimateType))]",
+ "\n string EstimateType => EstimateTypes.CU;",
"\n ",
- "\n double[] Values => GetScope((Identity, (string)null, CalculationType, (int?)null)).Values;",
+ "\n double[] Values => GetScope((Identity, (string)null, EstimateType, (int?)null)).Values;",
"\n}"
]
},
@@ -1034,7 +1034,7 @@
"source": [
"public interface MonthlyAmortizationFactorCashflow : IScope",
"\n{",
- "\n private double[] NominalCuCashflow => GetScope((Identity with {AocType = AocTypes.CL}, (string)null, CalculationTypes.CU, (int?)null)).Values;",
+ "\n private double[] NominalCuCashflow => GetScope((Identity with {AocType = AocTypes.CL}, (string)null, EstimateTypes.CU, (int?)null)).Values;",
"\n private double[] DiscountedCuCashflow => GetScope(Identity with {AocType = AocTypes.CL}, o => o.WithContext(EconomicBasis)).Values;",
"\n ",
"\n [NotVisible] string EconomicBasis => GetContext();",
@@ -1086,7 +1086,7 @@
"\n",
"\npublic interface AmfFromIfrsVariable : CurrentPeriodAmortizationFactor",
"\n{",
- "\n double CurrentPeriodAmortizationFactor.Value => GetStorage().GetValue(Identity, (string)null, EstimateType, EconomicBasis, (int?)null); //unify CalculationType and EstimateTypeGet",
+ "\n double CurrentPeriodAmortizationFactor.Value => GetStorage().GetValue(Identity, (string)null, EstimateType, EconomicBasis, (int?)null);",
"\n}"
]
},
@@ -1497,7 +1497,7 @@
"\n ",
"\n double Value => GetScope(Identity.DataNode).BeAmountTypes",
"\n .Except(GetStorage().GetNonAttributableAmountType())",
- "\n .Sum(at => GetScope((Identity, at, CalculationTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) +",
+ "\n .Sum(at => GetScope((Identity, at, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) +",
"\n GetScope(Identity).Value;",
"\n ",
"\n double AggregatedValue => GetScope((Identity, InputSource.Cashflow)).Values",
@@ -1550,12 +1550,12 @@
"\n ",
"\n private double attributableExpenseAndCommissions => GetStorage().GetAttributableExpenseAndCommissionAmountType().Sum(d =>",
"\n GetStorage().GetNovelties(referenceAocType, InputSource.Cashflow)",
- "\n .Sum(n => GetScope((Identity with {AocType = referenceAocType, Novelty = n}, d, CalculationTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) -",
+ "\n .Sum(n => GetScope((Identity with {AocType = referenceAocType, Novelty = n}, d, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) -",
"\n GetScope((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, d, EstimateTypes.A, (int?)null)).Value);",
"\n",
"\n private double investmentClaims => GetStorage().GetInvestmentClaims().Sum(ic =>",
"\n GetStorage().GetNovelties(referenceAocType, InputSource.Cashflow)",
- "\n .Sum(n => GetScope((Identity with {AocType = referenceAocType, Novelty = n}, ic, CalculationTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) -",
+ "\n .Sum(n => GetScope((Identity with {AocType = referenceAocType, Novelty = n}, ic, EstimateTypes.BE, (int?)null), o => o.WithContext(EconomicBasis)).Value) -",
"\n GetScope((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, ic, EstimateTypes.A, (int?)null)).Value - ",
"\n GetScope((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, ic, EstimateTypes.AA, (int?)null)).Value -",
"\n GetScope((Identity with {AocType = referenceAocType, Novelty = Novelties.C}, ic, EstimateTypes.OA, (int?)null)).Value);",
@@ -1875,7 +1875,7 @@
"public interface ComputeAllScopes: IScope //ComputeIfrsVariable",
"\n{",
"\n IEnumerable PvLocked => GetScope(Identity).PresentValues.Where(x => Math.Abs(x.Value) >= Precision).Select(x => new IfrsVariable{ EconomicBasis = x.EconomicBasis, ",
- "\n EstimateType = x.Identity.CalculationType, ",
+ "\n EstimateType = x.Identity.EstimateType, ",
"\n DataNode = x.Identity.Id.DataNode, ",
"\n AocType = x.Identity.Id.AocType, ",
"\n Novelty = x.Identity.Id.Novelty, ",
@@ -1885,7 +1885,7 @@
"\n Partition = GetStorage().TargetPartition",
"\n });",
"\n IEnumerable PvCurrent => GetScope(Identity).PresentValues.Where(x => Math.Abs(x.Value) >= Precision).Select(x => new IfrsVariable{ EconomicBasis = x.EconomicBasis, ",
- "\n EstimateType = x.Identity.CalculationType, ",
+ "\n EstimateType = x.Identity.EstimateType, ",
"\n DataNode = x.Identity.Id.DataNode, ",
"\n AocType = x.Identity.Id.AocType, ",
"\n Novelty = x.Identity.Id.Novelty, ",
@@ -1895,7 +1895,7 @@
"\n Partition = GetStorage().TargetPartition",
"\n });",
"\n IEnumerable RaCurrent => GetScope(Identity).PresentValues.Where(x => Math.Abs(x.Value) >= Precision).Select(x => new IfrsVariable{ EconomicBasis = x.EconomicBasis, ",
- "\n EstimateType = x.Identity.CalculationType, ",
+ "\n EstimateType = x.Identity.EstimateType, ",
"\n DataNode = x.Identity.Id.DataNode, ",
"\n AocType = x.Identity.Id.AocType, ",
"\n Novelty = x.Identity.Id.Novelty, ",
@@ -1905,7 +1905,7 @@
"\n Partition = GetStorage().TargetPartition",
"\n });",
"\n IEnumerable RaLocked => GetScope(Identity).PresentValues.Where(x => Math.Abs(x.Value) >= Precision).Select(x => new IfrsVariable{ EconomicBasis = x.EconomicBasis, ",
- "\n EstimateType = x.Identity.CalculationType, ",
+ "\n EstimateType = x.Identity.EstimateType, ",
"\n DataNode = x.Identity.Id.DataNode, ",
"\n AocType = x.Identity.Id.AocType, ",
"\n Novelty = x.Identity.Id.Novelty, ",
diff --git a/Import/ImportStorage.ipynb b/Import/ImportStorage.ipynb
index 291e0e0b..8dc36adc 100644
--- a/Import/ImportStorage.ipynb
+++ b/Import/ImportStorage.ipynb
@@ -35,7 +35,7 @@
"\n- [DataNodeParameters](../DataModel/DataStructure)",
"\n- [AocType](../DataModel/DataStructure)",
"\n- [AmountType](../DataModel/DataStructure)",
- "\n- [CalculationType](../DataModel/DataStructure)",
+ "\n- [EstimateType](../DataModel/DataStructure)",
"\n- [DataNodes](../DataModel/DataStructure)",
"\n",
"\nSuch storage is then passed to calculations defined in the corresponding [Import Scopes](./ImportScopeCalculation)."
@@ -105,7 +105,6 @@
"\n //Dimensions",
"\n public Dictionary AmountTypeDimension { get; private set; }",
"\n public Dictionary NoveltyDimension { get; private set; }",
- "\n public Dictionary CalculationTypeDimension { get; private set; }",
"\n public Dictionary EstimateTypeDimension { get; private set; }",
"\n public Dictionary> EstimateTypesByImportFormat { get; private set; }",
"\n public Dictionary ExperienceAdjustEstimateTypeMapping { get; private set; } ",
@@ -128,7 +127,6 @@
"\n EstimateTypeDimension = estimateTypes.ToDictionary(x => x.SystemName);",
"\n AmountTypeDimension = (await workspace.Query().ToArrayAsync()).ToDictionary(x => x.SystemName);",
"\n NoveltyDimension = (await workspace.Query().ToArrayAsync()).ToDictionary(x => x.SystemName);",
- "\n CalculationTypeDimension = (await workspace.Query().ToArrayAsync()).ToDictionary(x => x.SystemName);",
"\n ",
"\n ExperienceAdjustEstimateTypeMapping = new Dictionary{{EstimateTypes.A, EstimateTypes.APA}, {EstimateTypes.AA, EstimateTypes.AAPA}, {EstimateTypes.OA, EstimateTypes.OAPA}}; //TODO move this logic",
"\n ",
@@ -296,10 +294,10 @@
"\n public int GetShift(int projectionPeriod) => ProjectionConfiguration[projectionPeriod].Shift;",
"\n public int GetTimeStep(int projectionPeriod) => ProjectionConfiguration[projectionPeriod].TimeStep;",
"\n ",
- "\n public PeriodType GetPeriodType(string amountType, string calculationType) => ",
+ "\n public PeriodType GetPeriodType(string amountType, string estimateType) => ",
"\n amountType != null && AmountTypeDimension.TryGetValue(amountType, out var at) ",
"\n ? at.PeriodType",
- "\n : calculationType != null && CalculationTypeDimension.TryGetValue(calculationType, out var ct) ",
+ "\n : estimateType != null && EstimateTypeDimension.TryGetValue(estimateType, out var ct) ",
"\n ? ct.PeriodType : PeriodType.EndOfPeriod;",
"\n",
"\n //Variables and Cashflows",
@@ -309,7 +307,7 @@
"\n public double[] GetValues(ImportIdentity id, Func whereClause) => GetRawVariables(id.DataNode).Where(v => (v.AocType, v.Novelty) == id.AocStep && whereClause(v)).Aggregate()?.Values ?? Enumerable.Empty().ToArray();",
"\n public double GetValue(ImportIdentity id, Func whereClause) => GetIfrsVariables(id.DataNode).Where(v => (v.AocType, v.Novelty) == id.AocStep && whereClause(v)).Aggregate()?.Value ?? 0;",
"\n ",
- "\n public double[] GetValues(ImportIdentity id, string amountType, string calculationType, int? accidentYear) => GetValues(id, v => v.AccidentYear == accidentYear && v.AmountType == amountType && v.CalculationType == calculationType);",
+ "\n public double[] GetValues(ImportIdentity id, string amountType, string estimateType, int? accidentYear) => GetValues(id, v => v.AccidentYear == accidentYear && v.AmountType == amountType && v.EstimateType == estimateType);",
"\n public double GetValue(ImportIdentity id, string amountType, string estimateType, int? accidentYear) => GetValue(id, v => v.AccidentYear == accidentYear && v.AmountType == amountType && v.EstimateType == estimateType);",
"\n public double GetValue(ImportIdentity id, string amountType, string estimateType, string economicBasis, int? accidentYear) => GetValue(id, v => v.AccidentYear == accidentYear && v.AmountType == amountType && v.EstimateType == estimateType && v.EconomicBasis == economicBasis);",
"\n ",
diff --git a/Import/Importers.ipynb b/Import/Importers.ipynb
index 808b4cbe..319f9b9e 100644
--- a/Import/Importers.ipynb
+++ b/Import/Importers.ipynb
@@ -55,7 +55,7 @@
"\n public Dictionary DataNodeDataBySystemName;",
"\n ",
"\n // Dimensions",
- "\n public Dictionary CalculationType;",
+ "\n public Dictionary EstimateType;",
"\n public Dictionary PvAmountType; ",
"\n public HashSet AocTypeMap;",
"\n private HashSet estimateTypes;",
@@ -128,7 +128,7 @@
"\n ? (await LoadDataNodesAsync(dataSource, args)).Where(kvp => kvp.Value.Year == args.Year).ToDictionary(kvp => kvp.Key, kvp => kvp.Value)",
"\n : await LoadDataNodesAsync(dataSource, args);",
"\n // Dimensions",
- "\n CalculationType = (await dataSource.Query().ToArrayAsync()).ToDictionary(x => x.SystemName);",
+ "\n EstimateType = (await dataSource.Query().ToArrayAsync()).ToDictionary(x => x.SystemName);",
"\n PvAmountType = (await dataSource.Query().ToArrayAsync()).ToDictionary(x => x.SystemName);",
"\n amountTypes = (await dataSource.Query().ToArrayAsync()).Select(at => at.SystemName).ToHashSet();",
"\n estimateTypes = args.ImportFormat switch {",
@@ -748,9 +748,9 @@
"\n }",
"\n ",
"\n var amountTypeFromFile = datarow.Field(nameof(RawVariable.AmountType));",
- "\n var isCalculationType = parsingStorage.CalculationType.ContainsKey(amountTypeFromFile);",
- "\n var amountType = isCalculationType ? null : amountTypeFromFile;",
- "\n var calculationType = isCalculationType ? amountTypeFromFile : CalculationTypes.BE;",
+ "\n var isEstimateType = parsingStorage.EstimateType.ContainsKey(amountTypeFromFile);",
+ "\n var amountType = isEstimateType ? null : amountTypeFromFile;",
+ "\n var estimateType = isEstimateType ? amountTypeFromFile : EstimateTypes.BE;",
"\n ",
"\n var values = datarow.Table.Columns.Where(c => c.ColumnName.StartsWith(nameof(RawVariable.Values))).OrderBy(c => c.ColumnName.Length).ThenBy(c => c.ColumnName)",
"\n .Select(x => datarow.Field(x.ColumnName).CheckStringForExponentialAndConvertToDouble()).Prune();",
@@ -763,10 +763,10 @@
"\n AocType = aocType,",
"\n Novelty = novelty,",
"\n AmountType = amountType,",
- "\n CalculationType = calculationType,",
+ "\n EstimateType = estimateType,",
"\n AccidentYear = Int32.TryParse((datarow.Field(nameof(RawVariable.AccidentYear))), out var tempVal)? tempVal : (int?)null,",
"\n Partition = parsingStorage.TargetPartitionByReportingNodeAndPeriod.Id,",
- "\n Values = Multiply(GetSign((aocType, amountType, calculationType, dataNodeData.IsReinsurance), parsingStorage.HierarchyCache), values)",
+ "\n Values = Multiply(GetSign((aocType, amountType, estimateType, dataNodeData.IsReinsurance), parsingStorage.HierarchyCache), values)",
"\n };",
"\n return item;",
"\n }, ImportFormats.Cashflow",
diff --git a/Initialization/InitSystemorphBaseToMemory.ipynb b/Initialization/InitSystemorphBaseToMemory.ipynb
index d28022d0..e7b7b98d 100644
--- a/Initialization/InitSystemorphBaseToMemory.ipynb
+++ b/Initialization/InitSystemorphBaseToMemory.ipynb
@@ -80,7 +80,6 @@
"\n .WithType()",
"\n .WithType()",
"\n .WithType()",
- "\n .WithType()",
"\n .WithType()",
"\n .WithType()",
"\n .WithType()",
diff --git a/Initialization/InitSystemorphToDatabase.ipynb b/Initialization/InitSystemorphToDatabase.ipynb
index c994f78b..bb25efb5 100644
--- a/Initialization/InitSystemorphToDatabase.ipynb
+++ b/Initialization/InitSystemorphToDatabase.ipynb
@@ -70,7 +70,6 @@
"\n .WithType()",
"\n .WithType()",
"\n .WithType()",
- "\n .WithType()",
"\n .WithType()",
"\n .WithType()",
"\n .WithType()",
diff --git a/InputFormatDescription.ipynb b/InputFormatDescription.ipynb
index bee76506..2e81506f 100644
--- a/InputFormatDescription.ipynb
+++ b/InputFormatDescription.ipynb
@@ -96,12 +96,6 @@
"\n- [AmountType](./DataModel/DataStructure#amount-type) : entered with its SystemName,",
"\n- AccidentYear : relevant for Data Node with Liability Type: Liability for Incurred Claims."
]
- },
- {
- "cell_type": "markdown",
- "source": [
- ""
- ]
}
]
}
\ No newline at end of file
diff --git a/Test/AocStructureTest.ipynb b/Test/AocStructureTest.ipynb
index 1dbad859..f279ad6f 100644
--- a/Test/AocStructureTest.ipynb
+++ b/Test/AocStructureTest.ipynb
@@ -223,11 +223,11 @@
"cell_type": "code",
"source": [
"var inputRawVariables = new RawVariable[]{",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"MC\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"N\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"EV\", Novelty = \"N\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"CL\", Novelty = \"C\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"MC\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"N\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"EV\", Novelty = \"N\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"CL\", Novelty = \"C\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
"\n};"
]
},
@@ -322,11 +322,11 @@
"cell_type": "code",
"source": [
"inputRawVariables = new RawVariable[]{",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"MC\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"N\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"EV\", Novelty = \"N\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"CL\", Novelty = \"C\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"MC\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"N\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"EV\", Novelty = \"N\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"CL\", Novelty = \"C\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
"\n};"
]
},
@@ -439,9 +439,9 @@
"cell_type": "code",
"source": [
"inputRawVariables = new RawVariable[]{",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"MC\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
- "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"CL\", Novelty = \"C\", AccidentYear = null, AmountType = \"PR\", CalculationType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"BOP\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"MC\", Novelty = \"I\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
+ "\n new RawVariable{Partition = partition.Id, Values = new []{1.0}, DataNode = groupOfContract, AocType = \"CL\", Novelty = \"C\", AccidentYear = null, AmountType = \"PR\", EstimateType = \"BE\"},",
"\n};"
]
},
diff --git a/Test/SpecificationsImportCashflows.ipynb b/Test/SpecificationsImportCashflows.ipynb
index b392feef..481da388 100644
--- a/Test/SpecificationsImportCashflows.ipynb
+++ b/Test/SpecificationsImportCashflows.ipynb
@@ -383,14 +383,14 @@
"source": [
"var amountTypePR = \"PR\";",
"\nvar amountTypeNIC = \"NIC\";",
- "\nvar calculationType = \"BE\";",
+ "\nvar estimateType = \"BE\";",
"\nvar accidentYear = (int?)null;"
]
},
{
"cell_type": "code",
"source": [
- "var nominalPR = Test.GetScope((id, amountTypePR, calculationType, accidentYear));"
+ "var nominalPR = Test.GetScope((id, amountTypePR, estimateType, accidentYear));"
]
},
{
@@ -402,7 +402,7 @@
{
"cell_type": "code",
"source": [
- "var nominalNIC = Test.GetScope((id, amountTypeNIC, calculationType, accidentYear));"
+ "var nominalNIC = Test.GetScope((id, amountTypeNIC, estimateType, accidentYear));"
]
},
{
@@ -450,7 +450,7 @@
{
"cell_type": "code",
"source": [
- "var computedDiscountedPR = Test.GetScope((id, amountTypePR, calculationType, accidentYear));"
+ "var computedDiscountedPR = Test.GetScope((id, amountTypePR, estimateType, accidentYear));"
]
},
{
@@ -519,7 +519,7 @@
{
"cell_type": "code",
"source": [
- "var computedDiscountedNIC = Test.GetScope((id, amountTypeNIC, calculationType, accidentYear));"
+ "var computedDiscountedNIC = Test.GetScope((id, amountTypeNIC, estimateType, accidentYear));"
]
},
{
@@ -646,7 +646,7 @@
{
"cell_type": "code",
"source": [
- "var computedDiscountedCRD = Test.GetScope((id, \"CDR\", calculationType, accidentYear));"
+ "var computedDiscountedCRD = Test.GetScope((id, \"CDR\", estimateType, accidentYear));"
]
},
{
@@ -676,28 +676,28 @@
{
"cell_type": "code",
"source": [
- "var nominalNIC = Test.GetScope((id, \"NIC\", calculationType, accidentYear));",
+ "var nominalNIC = Test.GetScope((id, \"NIC\", estimateType, accidentYear));",
"\nnominalNIC"
]
},
{
"cell_type": "code",
"source": [
- "var nominalICO = Test.GetScope((id, \"ICO\", calculationType, accidentYear));",
+ "var nominalICO = Test.GetScope((id, \"ICO\", estimateType, accidentYear));",
"\nnominalICO"
]
},
{
"cell_type": "code",
"source": [
- "var nominalALE = Test.GetScope((id, \"ALE\", calculationType, accidentYear));",
+ "var nominalALE = Test.GetScope((id, \"ALE\", estimateType, accidentYear));",
"\nnominalNIC"
]
},
{
"cell_type": "code",
"source": [
- "var nominalULE = Test.GetScope((id, \"ULE\", calculationType, accidentYear));",
+ "var nominalULE = Test.GetScope((id, \"ULE\", estimateType, accidentYear));",
"\nnominalNIC"
]
},
diff --git a/Test/SpecificationsSetup.ipynb b/Test/SpecificationsSetup.ipynb
index f4d8ab6f..73244da4 100644
--- a/Test/SpecificationsSetup.ipynb
+++ b/Test/SpecificationsSetup.ipynb
@@ -88,7 +88,7 @@
"\n",
"\npublic static IfrsVariable FromPvToIfrsVariable(this PresentValue scope)",
"\n => new IfrsVariable{ EconomicBasis = scope.EconomicBasis, ",
- "\n EstimateType = scope.Identity.CalculationType, ",
+ "\n EstimateType = scope.Identity.EstimateType, ",
"\n DataNode = scope.Identity.Id.DataNode, ",
"\n AocType = scope.Identity.Id.AocType, ",
"\n Novelty = scope.Identity.Id.Novelty, ",
diff --git a/Test/SpecificationsTechnicalMargin.ipynb b/Test/SpecificationsTechnicalMargin.ipynb
index 13c6c98b..5ef06971 100644
--- a/Test/SpecificationsTechnicalMargin.ipynb
+++ b/Test/SpecificationsTechnicalMargin.ipynb
@@ -840,7 +840,7 @@
"cell_type": "code",
"source": [
"var premiums = premiumAllocationFactor * Test.GetStorage().GetPremiums()",
- "\n .Sum(p => referenceAoC.Sum(aoc => Test.GetScope((Test.GetIdentity(dataNode, aoc.AocType, aoc.Novelty), p, CalculationTypes.BE, (int?)null), o => o.WithContext(economicBasis)).Value)",
+ "\n .Sum(p => referenceAoC.Sum(aoc => Test.GetScope((Test.GetIdentity(dataNode, aoc.AocType, aoc.Novelty), p, EstimateTypes.BE, (int?)null), o => o.WithContext(economicBasis)).Value)",
"\n -referenceAoC.Sum(aoc => Test.GetScope((Test.GetIdentity(dataNode, aoc.AocType, aoc.Novelty), p, EstimateTypes.A, (int?)null)).Value)",
"\n -referenceAoC.Sum(aoc => Test.GetScope((Test.GetIdentity(dataNode, aoc.AocType, aoc.Novelty), p, EstimateTypes.AA, (int?)null)).Value)",
"\n -referenceAoC.Sum(aoc => Test.GetScope((Test.GetIdentity(dataNode, aoc.AocType, aoc.Novelty), p, EstimateTypes.OA, (int?)null)).Value)",
@@ -869,7 +869,7 @@
"cell_type": "code",
"source": [
"var attributableExpenseAndCommissions = new string[] {AmountTypes.ACA, AmountTypes.AEA}",
- "\n .Sum(d => referenceAoC.Sum(s => Test.GetScope((Test.GetIdentity(dataNode, s.AocType, s.Novelty), d, CalculationTypes.BE, (int?)null), o => o.WithContext(economicBasis)).Value)",
+ "\n .Sum(d => referenceAoC.Sum(s => Test.GetScope((Test.GetIdentity(dataNode, s.AocType, s.Novelty), d, EstimateTypes.BE, (int?)null), o => o.WithContext(economicBasis)).Value)",
"\n -referenceAoC.Sum(s => Test.GetScope((Test.GetIdentity(dataNode, s.AocType, s.Novelty), d, EstimateTypes.A, (int?)null)).Value));"
]
},
@@ -895,7 +895,7 @@
"cell_type": "code",
"source": [
"var investmentClaims = Test.GetStorage().GetInvestmentClaims()",
- "\n .Sum(ic => referenceAoC.Sum(s => Test.GetScope((Test.GetIdentity(dataNode, s.AocType, s.Novelty), ic, CalculationTypes.BE, (int?)null), o => o.WithContext(economicBasis)).Value)",
+ "\n .Sum(ic => referenceAoC.Sum(s => Test.GetScope((Test.GetIdentity(dataNode, s.AocType, s.Novelty), ic, EstimateTypes.BE, (int?)null), o => o.WithContext(economicBasis)).Value)",
"\n -referenceAoC.Sum(s => Test.GetScope((Test.GetIdentity(dataNode, s.AocType, s.Novelty), ic, EstimateTypes.A, (int?)null)).Value)",
"\n -referenceAoC.Sum(s => Test.GetScope((Test.GetIdentity(dataNode, s.AocType, s.Novelty), ic, EstimateTypes.AA, (int?)null)).Value)",
"\n -referenceAoC.Sum(s => Test.GetScope((Test.GetIdentity(dataNode, s.AocType, s.Novelty), ic, EstimateTypes.OA, (int?)null)).Value)",