Skip to content

Tm amount type #367

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
dcolleoni merged 6 commits into from
Aug 10, 2023
Merged

Tm amount type #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb5d874
exclude cu from be amountType
dcolleoni Aug 8, 2023
80059c3
Merge remote-tracking branch 'origin/develop' into TmAmountType
dcolleoni Aug 8, 2023
b6f7e5e
correct ce ref in template
dcolleoni Aug 8, 2023
9b33774
Merge branch 'develop' into TmAmountType
dcolleoni Aug 10, 2023
467a08a
fix at in ce tests
dcolleoni Aug 10, 2023
20362e0
Merge remote-tracking branch 'origin/develop' into TmAmountType
dcolleoni Aug 10, 2023
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
2 changes: 1 addition & 1 deletion ifrs17-template/Constants/CalculationEngine.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"var projectName = \"ifrs17\";",
"\nvar environmentName = \"v1.3.1\";",
"\nvar notebookName = \"CalculationEngine\";",
"\nvar calculationEngine = $\"#!import \\\"../../{projectName}/{environmentName}/{notebookName}\\\"\";"
"\nvar calculationEngine = $\"#!import \\\"//{projectName}/{environmentName}/{notebookName}\\\"\";"
],
"metadata": {},
"execution_count": 0,
Expand Down
8 changes: 4 additions & 4 deletions ifrs17/Import/4ImportScope-TechnicalMargin.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@
"public interface TechnicalMarginAmountType : IScope<(ImportIdentity Id, string EstimateType), ImportStorage>",
"\n{",
"\n protected IEnumerable<string> amountTypesToExclude => (Identity.EstimateType, Identity.Id.ValuationApproach) switch {",
"\n (EstimateTypes.LR, ValuationApproaches.PAA) => GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetAttributableExpenses()).Concat(GetStorage().GetDeferrableExpenses()).Concat(GetStorage().GetPremiums()),",
"\n (EstimateTypes.LR, _) => GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetAttributableExpenses()),",
"\n (_, ValuationApproaches.PAA) => GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetDeferrableExpenses()).Concat(GetStorage().GetPremiums()),",
"\n (_) => GetStorage().GetNonAttributableAmountType().Concat(AmountTypes.CDR.RepeatOnce())",
"\n (EstimateTypes.LR, ValuationApproaches.PAA) => GetStorage().GetCoverageUnits().Concat(GetStorage().GetNonAttributableAmountType()).Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetAttributableExpenses()).Concat(GetStorage().GetDeferrableExpenses()).Concat(GetStorage().GetPremiums()),",
"\n (EstimateTypes.LR, _) => GetStorage().GetCoverageUnits().Concat(GetStorage().GetNonAttributableAmountType()).Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetAttributableExpenses()),",
"\n (_, ValuationApproaches.PAA) => GetStorage().GetCoverageUnits().Concat(GetStorage().GetNonAttributableAmountType()).Concat(AmountTypes.CDR.RepeatOnce()).Concat(GetStorage().GetDeferrableExpenses()).Concat(GetStorage().GetPremiums()),",
"\n (_) => GetStorage().GetCoverageUnits().Concat(GetStorage().GetNonAttributableAmountType()).Concat(AmountTypes.CDR.RepeatOnce())",
"\n };",
"\n",
"\n IEnumerable<string> Values => GetScope<ValidAmountType>(Identity.Id.DataNode).BeAmountTypes.Except(amountTypesToExclude);",
Expand Down
1 change: 1 addition & 0 deletions ifrs17/Import/ImportStorage.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@
"\n public IEnumerable<string> GetPremiums() => hierarchyCache.Get<AmountType>(AmountTypes.PR).Descendants(includeSelf : true).Select(x => x.SystemName);",
"\n public IEnumerable<string> GetClaims() => hierarchyCache.Get<AmountType>(AmountTypes.CL).Descendants().Select(x => x.SystemName);",
"\n public IEnumerable<string> GetCdr() => hierarchyCache.Get<AmountType>(AmountTypes.CDR).Descendants(includeSelf: true).Select(x => x.SystemName);",
"\n public IEnumerable<string> GetCoverageUnits() => hierarchyCache.Get<AmountType>(AmountTypes.CU).Descendants(includeSelf: true).Select(x => x.SystemName);",
"\n}"
],
"metadata": {},
Expand Down
4 changes: 3 additions & 1 deletion ifrs17/Test/QueriesScenarioDataTest.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
{
"cell_type": "code",
"source": [
"await DataSource.UpdateAsync( new[] { partitionReportingNode } );",
"await DataSource.DeleteAsync( DataSource.Query<RawVariable>());",
"\nawait DataSource.DeleteAsync( DataSource.Query<IfrsVariable>());",
"\nawait DataSource.UpdateAsync( new[] { partitionReportingNode } );",
"\nawait DataSource.UpdateAsync( new[] { partition, previousPeriodPartition, partitionScenarioMTUP, previousPeriodPartitionScenarioMTUP } );",
"\nawait DataSource.UpdateAsync( new[] { dt11 } );",
"\nawait Import.FromString(projectionConfiguration).WithType<ProjectionConfiguration>().WithTarget(DataSource).ExecuteAsync();"
Expand Down
39 changes: 20 additions & 19 deletions ifrs17/Test/TestData.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,25 +186,26 @@
"cell_type": "code",
"source": [
"var amountType = ",
"\n@\"@@AmountType,,,,,,,,,,,",
"\nSystemName,DisplayName,Parent,Order,PeriodType,,,,,,,",
"\nPR,Premiums,,10,BeginningOfPeriod,,,,,,,",
"\nCL,Claims,,20,EndOfPeriod,,,,,,,",
"\nNIC,Non Investment Component,CL,30,EndOfPeriod,,,,,,,",
"\nICO,Investment Component,CL,40,EndOfPeriod,,,,,,,",
"\nCDR,Credit Default Risk,CL,50,EndOfPeriod,,,,,,,",
"\nCE,Claim Expenses,CL,200,EndOfPeriod,,,,,,,",
"\nALE,Allocated Loss Adjustment Expenses,CE,210,EndOfPeriod,,,,,,,",
"\nULE,Unallocated Loss Adjustment Expenses,CE,220,EndOfPeriod,,,,,,,",
"\nAE,Attributable Expenses,,80,BeginningOfPeriod,,,,,,,",
"\nAEA,Aquisition,AE,90,BeginningOfPeriod,,,,,,,",
"\nAEM,Maintenance,AE,100,BeginningOfPeriod,,,,,,,",
"\nNE,Non Attributable Expenses,,110,BeginningOfPeriod,,,,,,,",
"\nAC,Attributable Commission,,120,BeginningOfPeriod,,,,,,,",
"\nACA,Aquisition,AC,130,BeginningOfPeriod,,,,,,,",
"\nACM,Maitenance,AC,140,BeginningOfPeriod,,,,,,,",
"\nDE,Deferrals,,200,EndOfPeriod,,,,,,,",
"\nDAE,Aquisition Expenses,DE,220,EndOfPeriod,,,,,,,\";"
"\n@\"@@AmountType",
"\nSystemName,DisplayName,Parent,Order,PeriodType",
"\nPR,Premiums,,10,BeginningOfPeriod",
"\nCL,Claims,,20,EndOfPeriod",
"\nNIC,Non Investment Component,CL,30,EndOfPeriod",
"\nICO,Investment Component,CL,40,EndOfPeriod",
"\nCDR,Credit Default Risk,CL,50,EndOfPeriod",
"\nCE,Claim Expenses,CL,200,EndOfPeriod",
"\nALE,Allocated Loss Adjustment Expenses,CE,210,EndOfPeriod",
"\nULE,Unallocated Loss Adjustment Expenses,CE,220,EndOfPeriod",
"\nAE,Attributable Expenses,,80,BeginningOfPeriod",
"\nAEA,Aquisition,AE,90,BeginningOfPeriod",
"\nAEM,Maintenance,AE,100,BeginningOfPeriod",
"\nNE,Non Attributable Expenses,,110,BeginningOfPeriod",
"\nAC,Attributable Commission,,120,BeginningOfPeriod",
"\nACA,Aquisition,AC,130,BeginningOfPeriod",
"\nACM,Maitenance,AC,140,BeginningOfPeriod",
"\nDE,Deferrals,,200,EndOfPeriod",
"\nDAE,Aquisition Expenses,DE,220,EndOfPeriod",
"\nCU,Coverage Units,,150,EndOfPeriod\";"
],
"metadata": {},
"execution_count": 0,
Expand Down