From 498d7dd44279949f51ca827645d57da33745a9cb Mon Sep 17 00:00:00 2001 From: Teo Kukuljan Date: Fri, 21 Jul 2023 10:52:54 +0200 Subject: [PATCH 1/3] Placeholder for the customer project method --- ifrs17/Import/Importers.ipynb | 3 ++- ifrs17/Utils/ImportCalculationMethods.ipynb | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb index 66ec8b69..734db53e 100644 --- a/ifrs17/Import/Importers.ipynb +++ b/ifrs17/Import/Importers.ipynb @@ -1221,7 +1221,7 @@ "\n .ToArray().Prune();", "\n ", "\n //Instantiate SingleDataNodeParameter", - "\n return new SingleDataNodeParameter {", + "\n var singleDataNodeParameter = new SingleDataNodeParameter {", "\n Year = args.Year,", "\n Month = args.Month,", "\n Scenario = args.Scenario,", @@ -1234,6 +1234,7 @@ "\n PremiumAllocation = (datarow.Field(nameof(SingleDataNodeParameter.PremiumAllocation)))", "\n .ToString().CheckStringForExponentialAndConvertToDouble(),", "\n };", + "\n return ExtendSingleDataNodeParameter(singleDataNodeParameter, datarow, hasCostOfCapitalColumn);", "\n })", "\n .WithType( (dataset, datarow) => {", "\n", diff --git a/ifrs17/Utils/ImportCalculationMethods.ipynb b/ifrs17/Utils/ImportCalculationMethods.ipynb index e6daa007..8017232f 100644 --- a/ifrs17/Utils/ImportCalculationMethods.ipynb +++ b/ifrs17/Utils/ImportCalculationMethods.ipynb @@ -157,6 +157,24 @@ "execution_count": 0, "outputs": [] }, + { + "cell_type": "markdown", + "source": [ + "## Data Node Parameters" + ], + "metadata": {}, + "execution_count": 0, + "outputs": [] + }, + { + "cell_type": "code", + "source": [ + "public SingleDataNodeParameter ExtendSingleDataNodeParameter(SingleDataNodeParameter singleDataNodeParameter, IDataRow datarow) => singleDataNodeParameter;" + ], + "metadata": {}, + "execution_count": 0, + "outputs": [] + }, { "cell_type": "markdown", "source": [ From 03f15be43dc986c94e71563d10ec437dbb91c332 Mon Sep 17 00:00:00 2001 From: Teo Kukuljan Date: Fri, 21 Jul 2023 11:12:09 +0200 Subject: [PATCH 2/3] small fix --- ifrs17/Import/Importers.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb index 734db53e..184c65d2 100644 --- a/ifrs17/Import/Importers.ipynb +++ b/ifrs17/Import/Importers.ipynb @@ -1234,7 +1234,7 @@ "\n PremiumAllocation = (datarow.Field(nameof(SingleDataNodeParameter.PremiumAllocation)))", "\n .ToString().CheckStringForExponentialAndConvertToDouble(),", "\n };", - "\n return ExtendSingleDataNodeParameter(singleDataNodeParameter, datarow, hasCostOfCapitalColumn);", + "\n return ExtendSingleDataNodeParameter(singleDataNodeParameter, datarow);", "\n })", "\n .WithType( (dataset, datarow) => {", "\n", From 7a90349e45cd514a7f932b3ddb74ac78e62590d8 Mon Sep 17 00:00:00 2001 From: Teo Kukuljan Date: Fri, 21 Jul 2023 18:04:17 +0200 Subject: [PATCH 3/3] Custom enhancement --- ifrs17/Import/3ImportScope-Actuals.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ifrs17/Import/3ImportScope-Actuals.ipynb b/ifrs17/Import/3ImportScope-Actuals.ipynb index ed072c6a..0fa9b664 100644 --- a/ifrs17/Import/3ImportScope-Actuals.ipynb +++ b/ifrs17/Import/3ImportScope-Actuals.ipynb @@ -543,7 +543,7 @@ "\n", "\npublic interface ClDeferrable : NominalDeferrable{", "\n private int projectionShift => GetStorage().GetShift(Identity.Id.ProjectionPeriod);", - "\n private IEnumerable previousAocSteps => GetScope((Identity.Id, InputSource.Cashflow)).Values;", + "\n private IEnumerable previousAocSteps => GetScope((Identity.Id, InputSource.Cashflow)).Values.Where(aocStep => aocStep.Novelty != Novelties.C);", "\n double referenceCashflow => previousAocSteps", "\n .GroupBy(x => x.Novelty, (k, aocs) => aocs.Last())", "\n .Sum(aoc => GetScope((Identity.Id with {AocType = aoc.AocType, Novelty = aoc.Novelty}, AmountTypes.DAE, EstimateTypes.BE, (int?)null)).Values",