Skip to content

Rename calculation type with estimate type #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nnikolopoulos merged 9 commits into from
Oct 7, 2022
Merged

Rename calculation type with estimate type #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ee12dc
Replace CalculationType with EstimateType
Oct 4, 2022
67169f6
Correct estimateType capitalization error in Test/SpecificationsImpor…
Oct 4, 2022
4c41bcd
Clean up notebooks spaces
Oct 6, 2022
2527cc1
Empty commit to refresh the meta-data
Oct 7, 2022
a8e0031
Merge branch develop into RCTWET
Oct 7, 2022
df26af9
Cleanup comments in Import/ImportStorage.ipynb
Oct 7, 2022
056fac5
Fix capitalization in Importers & ImportStorage NB
Oct 7, 2022
a2d00f1
Fix column order in csv
Oct 7, 2022
042f777
Add blank cell DataNodeParameters link
Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions Constants/Consts.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions Constants/Validations.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,",
Expand Down Expand Up @@ -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.\",",
Expand Down
25 changes: 5 additions & 20 deletions DataModel/DataStructure.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,24 +305,6 @@
"\npublic record DeferrableAmountType : AmountType {}"
]
},
{
"cell_type": "markdown",
"source": [
"<a id='calculation-type'></a>",
"\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": [
Expand Down Expand Up @@ -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}"
]
},
Expand Down Expand Up @@ -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}"
]
},
Expand Down
39 changes: 17 additions & 22 deletions Files/DimensionsAndPartitions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,,,,,,,,,,
Expand Down Expand Up @@ -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,,,,,,,,,,
Expand Down
Loading