Skip to content
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

Jump to bottom

Importer scenario cashflow actuals #112

Merged
merged 42 commits into from
Dec 20, 2022
Merged

Importer scenario cashflow actuals #112

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5e619f6
equality comparer and queries updated
calderinisystemorph Nov 29, 2022
36db29e
data model, importers and importstorage updated
calderinisystemorph Nov 29, 2022
270c126
scenario avalinade for datanodes
calderinisystemorph Nov 30, 2022
ce3298e
scenario test improved
calderinisystemorph Nov 30, 2022
8ba025c
firsts comments resolved
calderinisystemorph Dec 2, 2022
4886ccb
Merge remote-tracking branch 'origin/develop' into Importer_Scenario_…
calderinisystemorph Dec 2, 2022
c43d3f8
all comments resolved
calderinisystemorph Dec 2, 2022
2a55e62
scenario test works
calderinisystemorph Dec 4, 2022
3e54971
estimate type fix
Dec 5, 2022
6b276e2
more scenario tests
Dec 5, 2022
695f270
revert calculation engine notebook
Dec 6, 2022
a3a1a29
improved union of target/default variables
Dec 6, 2022
be3a99d
full union + save zeros for scenarios
Dec 7, 2022
f07a088
scenario tests are green
Dec 7, 2022
ba8b108
Merge remote-tracking branch 'origin/develop' into Importer_Scenario_…
calderinisystemorph Dec 7, 2022
062fe34
fix equality comparer
Dec 7, 2022
e011351
Merge branch 'Importer_Scenario_Cashflow_Actuals' of https://github.c…
Dec 8, 2022
26053ed
best estimate all green
Dec 8, 2022
56c19fb
ifrs variables scenario new benchmark
Dec 8, 2022
2870df2
openings importer cleanups
Dec 8, 2022
8fb42af
fix report benchmark scenario
Dec 12, 2022
04f9055
cleanup
Dec 12, 2022
322085a
preparation before pull develop
Dec 13, 2022
a4c541f
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
Dec 13, 2022
6ed2464
scenario for GOC removed
Dec 13, 2022
f552dac
more readable relaxed query util method
Dec 13, 2022
5c57183
warning triggering multiple calculation
calderinisystemorph Dec 13, 2022
2c987e6
Merge remote-tracking branch 'origin/Importer_Scenario_Cashflow_Actua…
calderinisystemorph Dec 13, 2022
f486952
comments on warning implemented
calderinisystemorph Dec 13, 2022
236a2b7
fix report variables benchmark
Dec 13, 2022
899b7f9
some comments resolved
calderinisystemorph Dec 14, 2022
eb016f3
Merge remote-tracking branch 'origin/develop' into Importer_Scenario_…
calderinisystemorph Dec 15, 2022
6dfd9e5
validation added
calderinisystemorph Dec 15, 2022
d31353a
new args datamodel, bm with standard digits
calderinisystemorph Dec 16, 2022
2bb6168
Useless Zeros not saved, code cleanup
calderinisystemorph Dec 19, 2022
f67e384
comments on EqualityComparer resolved, BM updated
calderinisystemorph Dec 19, 2022
6f42ff6
Test Improved
calderinisystemorph Dec 19, 2022
6737504
comments resolved
calderinisystemorph Dec 20, 2022
b0aaf09
Merge remote-tracking branch 'origin/develop' into Importer_Scenario_…
calderinisystemorph Dec 20, 2022
a4d234a
comments resolved
calderinisystemorph Dec 20, 2022
7b8157a
typo fixed
calderinisystemorph Dec 20, 2022
087d867
Merge remote-tracking branch 'origin/develop' into Importer_Scenario_…
calderinisystemorph Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ifrs17-template/Constants/CalculationEngine.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"var projectName = \"ifrs17\";",
"\nvar environmentName = \"v1.0.0\";",
"\nvar notebookName = \"CalculationEngine\";",
"\nvar calculationEngine = $\"#!import \\\"//{projectName}/{environmentName}/{notebookName}\\\"\";"
"\n//var calculationEngine = $\"#!import \\\"//{projectName}/{environmentName}/{notebookName}\\\"\";",
amuolo marked this conversation as resolved.
Show resolved Hide resolved
"\nvar calculationEngine = $\"#!import ../../ifrs17/CalculationEngine\";"
],
"metadata": {},
"execution_count": 0,
Expand Down
2 changes: 1 addition & 1 deletion ifrs17-template/Files/DataNodes/DataNodes_CH.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ DTR1,DTR1 OCI,USD,ANN,BBA,Default,
DTR2,DTR2 NOCI,USD,ANN,BBA,,
,,,,,,
@@GroupOfReinsuranceContract,,,,,,
SystemName,DisplayName,ReinsurancePortfolio,AnnualCohort,LiabilityType,Profitability,Partner
SystemName,DisplayName,ReinsurancePortfolio,AnnualCohort,LiabilityType,Profitability,Partner,
GricComplex,Gric test for discounting,DTR,2020,LRC,P,PT1
DTR1.1,DTR1.1 OCI LRC,DTR1,2020,LRC,P,PT1
DTR1.2,DTR1.2 OCI LIC,DTR1,2020,LIC,P,PT1
Expand Down
2 changes: 1 addition & 1 deletion ifrs17-template/Test/ImportStorageTest.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
"//Define partition",
"\nvar args = new ImportArgs(\"CH\", 2021, 3, Periodicity.Quarterly, null, ImportFormats.Cashflow);",
"\n",
"\nvar reportingNodePartition = DataSource.Query<PartitionByReportingNode>().FirstOrDefault(x => x.ReportingNode == args.ReportingNode && x.Scenario == args.Scenario);",
"\nvar reportingNodePartition = DataSource.Query<PartitionByReportingNode>().FirstOrDefault(x => x.ReportingNode == args.ReportingNode);",
"\nif(reportingNodePartition == null) ApplicationMessage.Log(Error.PartitionNotFound);",
"\n",
"\n",
Expand Down
214 changes: 175 additions & 39 deletions ifrs17-template/Test/ScenarioTest.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 10 additions & 5 deletions ifrs17/DataModel/DataStructure.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,11 +1305,6 @@
"\n [Dimension(typeof(ReportingNode))]",
"\n [IdentityProperty]",
"\n public string ReportingNode { get; init; }",
"\n",
"\n [Display(Order = 50)]",
"\n [Dimension(typeof(Scenario))]",
"\n [IdentityProperty]",
"\n public string Scenario { get; init; }",
"\n}"
],
"metadata": {},
Expand Down Expand Up @@ -1356,6 +1351,11 @@
"\n [Dimension(typeof(int), nameof(Month))]",
"\n [IdentityProperty]",
"\n public int Month { get; init; }",
"\n ",
"\n [Display(Order = 50)]",
"\n [Dimension(typeof(Scenario))]",
"\n [IdentityProperty]",
"\n public string Scenario { get; init; }",
"\n}"
],
"metadata": {},
Expand Down Expand Up @@ -1426,6 +1426,11 @@
"\n [Dimension(typeof(OciType))]",
"\n //[Immutable]",
"\n public string OciType { get; init; }",
"\n ",
"\n [NotVisible] ",
"\n [Dimension(typeof(Scenario))]",
"\n //[Immutable]",
"\n public string Scenario { get; init; }",
"\n}"
],
"metadata": {},
Expand Down
3 changes: 1 addition & 2 deletions ifrs17/Export/ExportConfiguration.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@
"\n => builder.WithTable<T>( config => config .AtBeginning() ",
"\n .WithName(Main) ",
"\n .WithSource(source => args.RepeatOnce().AsQueryable()) ",
"\n .WithColumn(x => x.Id, x => x.Delete())",
"\n .WithColumn(x => x.Scenario, x => x.Delete()));"
"\n .WithColumn(x => x.Id, x => x.Delete()));"
],
"metadata": {},
"execution_count": 0,
Expand Down
4 changes: 2 additions & 2 deletions ifrs17/Import/ImportStorage.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@
"\n await workspace.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(TargetPartition);",
"\n ",
"\n //Get data from Workspace (result of parsing)",
"\n var parsedRawVariables = await workspace.Query<RawVariable>().ToArrayAsync();",
"\n var parsedIfrsVariables = await workspace.Query<IfrsVariable>().ToArrayAsync();",
"\n var parsedRawVariables = await workspace.LoadPartitionedDataRelaxedAsync<RawVariable,PartitionByReportingNodeAndPeriod>(querySource, TargetPartition, DefaultPartition);",
"\n var parsedIfrsVariables = await workspace.LoadPartitionedDataRelaxedAsync<IfrsVariable,PartitionByReportingNodeAndPeriod>(querySource, TargetPartition, DefaultPartition);",
"\n ",
"\n //DataNodes",
"\n DataNodeDataBySystemName = await workspace.LoadDataNodesAsync(args);",
Expand Down