Skip to content

Openings scenario #252

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
amuolo merged 7 commits into from
Apr 24, 2023
Merged

Openings scenario #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
835a48b
fix openings scenario
Mar 25, 2023
9e53443
better handling of all cases through tests
Mar 25, 2023
0d1dae4
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
Mar 31, 2023
48c4599
toward the implementation of feedback
Apr 17, 2023
1543c84
Merge branch 'develop' of https://github.com/Systemorph/IFRS17Calcula…
Apr 17, 2023
22a8433
implement all feedback
Apr 23, 2023
b0977ae
resolve all comments
Apr 24, 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
53 changes: 26 additions & 27 deletions ifrs17/Import/ImportStorage.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,59 +231,58 @@
"\n var openingIfrsVariables = Enumerable.Empty<IfrsVariable>();",
"\n",
"\n var allImportScopesAtInceptionYear = allImportScopes.Select(dn => DataNodeDataBySystemName[dn]).Where(dnd => dnd.Year == args.Year).Select(x => x.DataNode).ToHashSet();",
"\n var allImportScopesNotAtInceptionYear = allImportScopes.Except(allImportScopesAtInceptionYear);",
"\n var allImportScopesNotAtInceptionYear = allImportScopes.Except(allImportScopesAtInceptionYear).ToHashSet();",
"\n",
"\n if(allImportScopesAtInceptionYear.Any()) {",
"\n var primaryScopeAtInceptionYear = allImportScopesAtInceptionYear.Where(dn => primaryScopeFromParsedVariables.Contains(dn));",
"\n var secondaryScopeAtInceptionYear = allImportScopesAtInceptionYear.Where(dn => primaryScopeFromLinkedReinsurance.Contains(dn) || secondaryScope.Contains(dn));",
"\n",
"\n openingIfrsVariables = await querySource.Query<IfrsVariable>()",
"\n .Where(iv => iv.Partition == TargetPartition && iv.AocType == AocTypes.BOP && iv.Novelty == Novelties.I)",
"\n .Where(iv => primaryScopeAtInceptionYear.Contains(iv.DataNode) && ImportFormat != ImportFormats.Opening",
"\n && EstimateTypesByImportFormat[InputSource.Opening.ToString()].Contains(iv.EstimateType) ",
"\n || secondaryScopeAtInceptionYear.Contains(iv.DataNode)).ToArrayAsync();",
"\n }",
"\n",
"\n if(allImportScopesNotAtInceptionYear.Any()) {",
"\n PreviousPeriodPartition = (await querySource.Query<PartitionByReportingNodeAndPeriod>().Where(p => p.ReportingNode == args.ReportingNode &&",
"\n p.Year == PreviousReportingPeriod.Year &&",
"\n p.Month == PreviousReportingPeriod.Month &&",
"\n p.Scenario == null).ToArrayAsync()).Single().Id;",
"\n PreviousPeriodPartition = (await querySource.Query<PartitionByReportingNodeAndPeriod>()",
"\n .Where(p => p.ReportingNode == args.ReportingNode && p.Year == PreviousReportingPeriod.Year ",
"\n && p.Month == PreviousReportingPeriod.Month && p.Scenario == null).ToArrayAsync()).Single().Id;",
"\n ",
"\n await querySource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(PreviousPeriodPartition);",
"\n ",
"\n //Perform queries to previous Period",
"\n openingRawVariables = (await querySource.Query<RawVariable>()",
"\n .Where(rv => rv.Partition == PreviousPeriodPartition && rv.AocType == AocTypes.CL)",
"\n .Where(v => primaryScope.Contains(v.DataNode))",
"\n .ToArrayAsync())",
"\n .Select(rv => rv with {AocType = AocTypes.BOP, Novelty = Novelties.I, Values = rv.Values.Skip(MonthInAYear).ToArray(), Partition = TargetPartition});",
"\n .Where(v => primaryScope.Contains(v.DataNode)).ToArrayAsync())",
"\n .Select(rv => rv with {AocType = AocTypes.BOP, Novelty = Novelties.I, ",
"\n Values = rv.Values.Skip(MonthInAYear).ToArray(), Partition = TargetPartition});",
"\n ",
"\n openingIfrsVariables = (await querySource.Query<IfrsVariable>()",
"\n openingIfrsVariables = openingIfrsVariables.Union((await querySource.Query<IfrsVariable>()",
Comment thread
dcolleoni marked this conversation as resolved.
"\n .Where(iv => iv.Partition == PreviousPeriodPartition && iv.AocType == AocTypes.EOP)",
"\n .Where(v => allImportScopesNotAtInceptionYear.Contains(v.DataNode))",
"\n .ToArrayAsync())",
"\n .Select(iv => iv with {AocType = AocTypes.BOP, Novelty = Novelties.I, Partition = TargetPartition});",
"\n .Where(v => allImportScopesNotAtInceptionYear.Contains(v.DataNode)).ToArrayAsync())",
"\n .Select(iv => iv with {AocType = AocTypes.BOP, Novelty = Novelties.I, Partition = TargetPartition}),",
"\n EqualityComparer<IfrsVariable>.Instance);",
"\n ",
"\n await querySource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(TargetPartition);",
"\n",
"\n // TODO: print error if ",
"\n //openingRawVariables.Select(x => x.DataNode).ToHashSet() != dataNodesWithPreviousPeriod",
"\n }",
"\n ",
"\n //SetPartition to current Period",
"\n await querySource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(TargetPartition);",
"\n",
"\n var primaryScopeAtInceptionYear = allImportScopesAtInceptionYear.Where(dn => primaryScope.Contains(dn));",
"\n var secondaryScopeAtInceptionYear = allImportScopesAtInceptionYear.Where(dn => secondaryScope.Contains(dn)); ",
"\n if(allImportScopesAtInceptionYear.Any() && ImportFormat != ImportFormats.Opening) ",
"\n openingIfrsVariables = openingIfrsVariables.Concat(await querySource.Query<IfrsVariable>()",
"\n .Where(iv => iv.Partition == TargetPartition && iv.AocType == AocTypes.BOP && iv.Novelty == Novelties.I)",
"\n .Where(iv => primaryScopeAtInceptionYear.Contains(iv.DataNode) ",
"\n && EstimateTypesByImportFormat[InputSource.Opening.ToString()].Contains(iv.EstimateType) ",
"\n || secondaryScopeAtInceptionYear.Contains(iv.DataNode))",
"\n .ToArrayAsync());",
"\n ",
"\n //Variables",
"\n var rawVariables = parsedRawVariables.Concat(openingRawVariables)",
"\n .Concat(await querySource.Query<RawVariable>()",
"\n .Where(rv => rv.Partition == TargetPartition)",
"\n .Where(rv => primaryScopeFromLinkedReinsurance.Contains(rv.DataNode)).ToArrayAsync()); ",
"\n ",
"\n var ifrsVariables = parsedIfrsVariables.Concat(openingIfrsVariables)",
"\n var ifrsVariables = parsedIfrsVariables.Union(openingIfrsVariables, EqualityComparer<IfrsVariable>.Instance)",
"\n .Concat(await querySource.Query<IfrsVariable>()",
"\n .Where(iv => iv.Partition == TargetPartition && !(iv.AocType == AocTypes.BOP && iv.Novelty == Novelties.I))",
"\n .Where(iv => primaryScopeFromParsedVariables.Contains(iv.DataNode) ",
"\n && !EstimateTypesByImportFormat[ImportFormat].Contains(iv.EstimateType) ",
"\n || primaryScopeFromLinkedReinsurance.Contains(iv.DataNode) ",
"\n || secondaryScope.Contains(iv.DataNode)).ToArrayAsync());",
"\n || secondaryScope.Contains(iv.DataNode)).ToArrayAsync()); ",
"\n",
"\n if(DefaultPartition != TargetPartition) {",
"\n await querySource.Partition.SetAsync<PartitionByReportingNodeAndPeriod>(DefaultPartition);",
Expand Down
31 changes: 17 additions & 14 deletions ifrs17/Import/Importers.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,7 @@
{
"cell_type": "code",
"source": [
"public async Task<ActivityLog> ParseSimpleValueToWorkspaceAsync(IDataSet dataSet, ImportArgs args, Guid targetPartitionByReportingNodeAndPeriodId, IWorkspace workspace, IDataSource targetDataSource)",
"public async Task<ActivityLog> ParseSimpleValueToWorkspaceAsync(IDataSet dataSet, ImportArgs args, IWorkspace workspace, IDataSource targetDataSource)",
"\n{",
"\n workspace.Reset(x => x.ResetInitializationRules().ResetCurrentPartitions());",
"\n workspace.Initialize(x => x.FromSource(targetDataSource)",
Expand Down Expand Up @@ -1565,7 +1565,6 @@
"\n ApplicationMessage.Log(Error.MultipleTechnicalMarginOpening, $\"{iv.DataNode},{iv.AocType},{iv.Novelty}\");",
"\n ",
"\n await workspace.ValidateForDataNodeStateActiveAsync<IfrsVariable>(parsingStorage.DataNodeDataBySystemName);",
"\n targetPartitionByReportingNodeAndPeriodId = parsingStorage.TargetPartitionByReportingNodeAndPeriod.Id;",
"\n return Activity.Finish().Merge(importLog);",
"\n}"
],
Expand All @@ -1583,16 +1582,16 @@
"\n await DataNodeFactoryAsync(dataSet, ImportFormats.SimpleValue, args, options.TargetDataSource);",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n",
"\n Guid partitionId = new Guid();",
"\n var workspace = Workspace.CreateNew();",
"\n var parsingLog = await ParseSimpleValueToWorkspaceAsync(dataSet, args, partitionId, workspace, options.TargetDataSource);",
"\n var parsingLog = await ParseSimpleValueToWorkspaceAsync(dataSet, args, workspace, options.TargetDataSource);",
"\n if(parsingLog.Errors.Any()) return Activity.Finish().Merge(parsingLog);",
"\n",
"\n workspace.Query<IfrsVariable>().Select(v => new {v.DataNode, v.AccidentYear}).Distinct();",
"\n",
"\n var targetDataNodes = workspace.Query<IfrsVariable>().Select(v => v.DataNode).Distinct().ToArray();",
"\n await workspace.CommitToAsync<IfrsVariable,PartitionByReportingNodeAndPeriod>(options.TargetDataSource, partitionId, snapshot : true,",
"\n filter : x => targetDataNodes.Contains(x.DataNode));",
"\n await workspace.CommitToAsync<IfrsVariable,PartitionByReportingNodeAndPeriod>(",
"\n options.TargetDataSource, (Guid)(await DataSource.Partition.GetKeyForInstanceAsync<PartitionByReportingNodeAndPeriod>(args)),",
"\n snapshot : true, filter : x => targetDataNodes.Contains(x.DataNode));",
"\n return Activity.Finish().Merge(parsingLog);",
"\n});"
],
Expand All @@ -1616,22 +1615,26 @@
"source": [
"Import.DefineFormat(ImportFormats.Opening, async (options, dataSet) => {",
"\n Activity.Start();",
"\n var args = await GetArgsAndCommitPartitionAsync<PartitionByReportingNodeAndPeriod>(dataSet, options.TargetDataSource) with {ImportFormat = ImportFormats.Opening};",
"\n var primaryArgs = await GetArgsAndCommitPartitionAsync<PartitionByReportingNodeAndPeriod>(dataSet, options.TargetDataSource) with {ImportFormat = ImportFormats.Opening};",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n await DataNodeFactoryAsync(dataSet, ImportFormats.Opening, args, options.TargetDataSource);",
"\n",
"\n var allArgs = await GetAllArgsAsync(primaryArgs, options.TargetDataSource, ImportFormats.Opening);",
"\n await DataNodeFactoryAsync(dataSet, ImportFormats.Opening, primaryArgs, options.TargetDataSource);",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n",
"\n Guid partitionId = new Guid();",
"\n var workspace = Workspace.CreateNew();",
"\n var parsingLog = await ParseSimpleValueToWorkspaceAsync(dataSet, args, partitionId, workspace, options.TargetDataSource);",
"\n if(parsingLog.Errors.Any()) return Activity.Finish().Merge(parsingLog);",
"\n var log = await ParseSimpleValueToWorkspaceAsync(dataSet, primaryArgs, workspace, options.TargetDataSource);",
"\n if(log.Errors.Any()) return Activity.Finish().Merge(log);",
"\n",
"\n var workspaceToCompute = Workspace.CreateNew();",
"\n workspaceToCompute.Initialize(x => x.FromSource(options.TargetDataSource));",
"\n var calculationLog = await ComputeAsync(args, workspace, workspaceToCompute, false); ",
"\n if(calculationLog.Errors.Any()) return Activity.Finish().Merge(calculationLog);",
"\n foreach (var args in allArgs) {",
"\n log = log.Merge(await ComputeAsync(args, workspace, workspaceToCompute, false)); ",
"\n if(log.Errors.Any()) return Activity.Finish().Merge(log);",
"\n }",
"\n await workspaceToCompute.CommitToTargetAsync(options.TargetDataSource, x => x.SnapshotMode<IfrsVariable>());",
"\n return Activity.Finish().Merge(parsingLog).Merge(calculationLog);",
"\n return Activity.Finish().Merge(log);",
"\n",
"\n})"
],
"metadata": {},
Expand Down
Loading