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.

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

Develop to main #115

Merged
merged 44 commits into from
Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e1f4622
Merge pull request #29 from Systemorph/importCeProject
dcolleoni Sep 28, 2022
4abedf9
Merge pull request #31 from Systemorph/OpeningImporterBug
sbusato Sep 29, 2022
0c3428a
Rename "PvBase" to "PresentValue" (#32)
nnikolopoulos Sep 30, 2022
2b320ea
Merge pull request #36 from Systemorph/CleanUpNotebooksSpaces
sbusato Oct 5, 2022
f9dd259
Merge pull request #37 from Systemorph/ReorderGlobalMetadata
sbusato Oct 6, 2022
e07f578
Break utils nb (#33)
dcolleoni Oct 6, 2022
5c0d5d3
Merge pull request #38 from Systemorph/FXinPl
dcolleoni Oct 7, 2022
76a9c82
Rename calculation type with estimate type (#34)
nnikolopoulos Oct 7, 2022
23591f3
Merge pull request #40 from Systemorph/defaultsStateParameters
amuolo Oct 10, 2022
08a2bc5
Merge pull request #42 from Systemorph/ExtractDataProject
dcolleoni Oct 12, 2022
3974104
Merge pull request #44 from Systemorph/UpdatePackageAndFixCsm
dcolleoni Oct 14, 2022
1573f47
Merge pull request #43 from Systemorph/defaultAocConfig
amuolo Oct 17, 2022
f57be90
Update links (#51)
dcolleoni Oct 20, 2022
8ec67f6
Simple value test data (#54)
dtrzesniak Oct 24, 2022
f7eb0c6
Overview texts (#53)
UMueller1 Oct 26, 2022
459b088
Merge pull request #55 from Systemorph/removalArithmetic
amuolo Oct 27, 2022
0c8614d
Interactive reports (#58)
dcolleoni Oct 31, 2022
a2496c1
New format design in importers (#62)
nnikolopoulos Nov 2, 2022
75c5f79
Package update (#65)
dcolleoni Nov 3, 2022
64e2243
Fixing AA and OA opening and benchmark simple importer (#57)
dtrzesniak Nov 4, 2022
02d0676
Aggregate by in report variable (#67)
sbusato Nov 7, 2022
1bf5c06
Clean up doc (#71)
dcolleoni Nov 7, 2022
0458d87
Update issue templates (#69)
dcolleoni Nov 7, 2022
a9a30ce
Merge pull request #72 from Systemorph/NoMorePartitions
amuolo Nov 7, 2022
a96e79e
Doc cleanup2 (#76)
dcolleoni Nov 9, 2022
5ec6d03
Merge pull request #45 from Systemorph/Multiple_Scenario_Implementation
amuolo Nov 9, 2022
e915152
packages + withGridOption + await HierarchyCache init (#83)
dcolleoni Nov 14, 2022
2af3dd3
Change in ReportMutableScopes NB (#85)
nnikolopoulos Nov 14, 2022
6f61f26
New metadata (#87)
nnikolopoulos Nov 15, 2022
b6bb12b
Rename pv amount type (#88)
nnikolopoulos Nov 15, 2022
810f68b
New metadatax2 (#91)
nnikolopoulos Nov 16, 2022
4ca49d0
Signs and actuals (#77)
dtrzesniak Nov 16, 2022
23c4cf2
Present value series (#70)
tkukuljan Nov 18, 2022
7e2499f
Update Reports.ipynb (#96)
amuolo Nov 18, 2022
1266829
New packages, tested at *STAGE* (17/11/2022) (#93)
nnikolopoulos Nov 21, 2022
5783224
Add a comma (#97)
nnikolopoulos Nov 21, 2022
713036b
Improve doc (#92)
dcolleoni Nov 22, 2022
d4fcdee
updated links (#101)
amuolo Nov 24, 2022
1561c6b
Implement Disposable Workspace in all Importers (#100)
tkukuljan Nov 25, 2022
8d0ea41
Reorganising importers (#104)
tkukuljan Nov 25, 2022
c62435a
Final refinements (#113)
dcolleoni Nov 30, 2022
488870c
Merge branch 'develop' into developToMain
dcolleoni Nov 30, 2022
e8db491
delete full template dir
dcolleoni Nov 30, 2022
3b8acd0
remove images
dcolleoni Nov 30, 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
Prev Previous commit
Next Next commit
Simple value test data (#54)
* Adding data files

* Fix input

* Fix input

* change to importers test

* Fix to sign

* Int convention
  • Loading branch information
dtrzesniak committed Nov 23, 2022
commit 8ec67f602f740348185e9c82f1ee40301b609204
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ DT2.1,Active,
DT2.2,Active,
DT3.1,Active,
DT4.1,Active,
DT5.1,Active,
DTR1.1,Active,
DTR1.2,Active,
DTR2.1,Active,
Expand Down
12 changes: 7 additions & 5 deletions full-ifrs17-template/Files/700.DataNodes/DataNodes_CH.csv
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
@@Main,,,,,,
ReportingNode,,,,,,
CH,,,,,,
,,,,,,

@@InsurancePortfolio,,,,,,
SystemName,DisplayName,ContractualCurrency,LineOfBusiness,ValuationApproach,OciType,
DT,DT complex CF,USD,ANN,BBA,Default,
DT,DT Complex CF,USD,ANN,BBA,Default,
DT1,DT1 OCI,USD,ANN,BBA,Default,
DT2,DT2 NOCI,USD,ANN,BBA,,
DT3,DT3 RunOff,USD,ANN,BBA,Default,
DT4,DT4 OCI,USD,ANN,BBA,Default,
,,,,,,
DT5,DT5 Simple Import,USD,ANN,BBA,Default

@@GroupOfInsuranceContract,,,,,,
SystemName,DisplayName,InsurancePortfolio,AnnualCohort,LiabilityType,Profitability,
GicComplex,Gic test discounting,DT,2020,LRC,P,
Expand All @@ -20,13 +21,14 @@ DT2.1,DT2.1 NOCI LRC PA 0.8,DT2,2020,LRC,P,
DT2.2,DT2.2 NOCI LIC,DT2,2020,LIC,P,
DT3.1,DT3.1 Runoff - PA 0.8,DT3,2020,LRC,P,
DT4.1,DT4.1 CSM PA 0.8,DT4,2020,LRC,P,
,,,,,,
DT5.1,DT5.1 Simple Import on DT 4.1,DT5,2020,LRC,P,

@@ReinsurancePortfolio,,,,,,
SystemName,DisplayName,ContractualCurrency,LineOfBusiness,ValuationApproach,OciType,
DTR,DTR complex CF,USD,ANN,BBA,,
DTR1,DTR1 OCI,USD,ANN,BBA,Default,
DTR2,DTR2 NOCI,USD,ANN,BBA,,
,,,,,,

@@GroupOfReinsuranceContract,,,,,,
SystemName,DisplayName,ReinsurancePortfolio,AnnualCohort,LiabilityType,Profitability,Partner
GricComplex,Gric test for discounting,DTR,2020,LRC,P,PT1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
@@Main
Month,ReportingNode,Scenario,Year
12,CH,,2020
@@SimpleValue
AccidentYear,AmountType,AocType,DataNode,EconomicBasis,EstimateType,Novelty,Value
,PR,BOP,DT5.1,L,BE,N,-798.536731161375
,NIC,BOP,DT5.1,L,BE,N,598.7529445986629
,PR,BOP,DT5.1,C,BE,N,-798.536731161375
,NIC,BOP,DT5.1,C,BE,N,598.7529445986629
,,BOP,DT5.1,C,RA,N,59.8752944598663
,,BOP,DT5.1,L,RA,N,59.8752944598663
,,AM,DT5.1,L,F,C,0.6562298579039588
,PR,EOP,DT5.1,L,BE,C,-399.63392949885525
,NIC,EOP,DT5.1,L,BE,C,299.67554969423594
,PR,EOP,DT5.1,C,BE,C,-399.63392949885525
,NIC,EOP,DT5.1,C,BE,C,299.67554969423594
,,EOP,DT5.1,C,RA,C,29.967554969423595
,,EOP,DT5.1,L,RA,C,29.967554969423595
,PR,IA,DT5.1,L,BE,N,-1.0971983374806105
,NIC,IA,DT5.1,L,BE,N,0.9226050955731167
,PR,IA,DT5.1,C,BE,N,-1.0971983374806105
,NIC,IA,DT5.1,C,BE,N,0.9226050955731167
,,IA,DT5.1,C,RA,N,0.09226050955731169
,,IA,DT5.1,L,RA,N,0.09226050955731169
,PR,CF,DT5.1,L,BE,N,400
,NIC,CF,DT5.1,L,BE,N,-300
,PR,CF,DT5.1,C,BE,N,400
,NIC,CF,DT5.1,C,BE,N,-300
,,CF,DT5.1,C,RA,N,-30
,,CF,DT5.1,L,RA,N,-30
,PR,CF,DT5.1,L,BEPA,N,320
,PR,CF,DT5.1,,A,C,400
,NIC,CF,DT5.1,,A,C,-280
,ACA,CF,DT5.1,,A,C,-10
,AEA,CF,DT5.1,,A,C,-5
,PR,CF,DT5.1,,APA,C,320
,,CF,DT5.1,,DA,C,-15
,,EA,DT5.1,,C,C,-15
,,AM,DT5.1,,DA,C,9.843447868559382
,,AM,DT5.1,,C,C,-82.02271122089925
,,EOP,DT5.1,,DA,C,-5.156552131440618
,,EOP,DT5.1,,C,C,42.9681136142967
,,BOP,DT5.1,,C,N,139.90849210284577
,,IA,DT5.1,,C,N,0.08233273235018213
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@
"await UploadActualAsync(\"../Files/900.TransactionalData/Actuals_CH_2021_3.csv\")"
]
},
{
"cell_type": "code",
"source": [
"await UploadSimpleValueAsync(\"../Files/900.TransactionalData/SimpleValue_CH_2020_12.csv\")"
]
},
{
"cell_type": "markdown",
"source": [
Expand Down
22 changes: 13 additions & 9 deletions ifrs17/Import/Importers.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1065,21 +1065,25 @@
"\n EstimateType = estimateType,",
"\n EconomicBasis = economicBasis,",
"\n Partition = parsingStorage.TargetPartitionByReportingNodeAndPeriod.Id,",
"\n Value = GetSign((aocStep.AocType, amountType, estimateType, parsingStorage.IsDataNodeReinsurance(dataNode)), parsingStorage.HierarchyCache)",
"\n Value = //GetSign((aocStep.AocType, amountType, estimateType, parsingStorage.IsDataNodeReinsurance(dataNode)), parsingStorage.HierarchyCache)",
"\n 1 // TODO, we need to adjust the inputs to have the correct sign, so that the default GetSign returns 1.",
"\n * datarow.Field<string>(nameof(IfrsVariable.Value)).CheckStringForExponentialAndConvertToDouble()",
"\n };",
"\n return iv;",
"\n }, importFormat",
"\n }, importFormat // This should indicate the table name, not the input format",
"\n ).WithTarget(Workspace).ExecuteAsync();",
"\n ",
"\n HashSet<string> availableEstimateTypes = parsingStorage.TechnicalMarginEstimateTypes;",
"\n var multipleOp = await Workspace.Query<IfrsVariable>().Where(iv => availableEstimateTypes.Contains(iv.EstimateType))",
"\n .GroupBy(iv => iv.DataNode)",
"\n .Where(g => g.Count() > 1).ToArrayAsync();",
"\n //.Select(g => ApplicationMessage.Log(Error.MultipleTechnicalMarginOpening, g.Key));",
"\n // Checking if there are inconsistencies in the TechnicalMarginEstimateTypes --> double entries in the steps where we expect to have unique values",
"\n var invalidVariables = await Workspace.Query<IfrsVariable>()",
"\n .Where(iv => parsingStorage.TechnicalMarginEstimateTypes.Contains(iv.EstimateType))",
"\n .Where(iv => iv.AocType == AocTypes.BOP || iv.AocType == AocTypes.EOP || iv.AocType == AocTypes.AM || iv.AocType == AocTypes.EA)",
"\n .GroupBy(iv => new {iv.DataNode, iv.AocType, iv.Novelty})",
"\n .Where(g => g.Count() > 1)",
"\n .Select(g => g.Key)",
"\n .ToArrayAsync();",
"\n ",
"\n foreach (var op in multipleOp)",
"\n ApplicationMessage.Log(Error.MultipleTechnicalMarginOpening, op.Key);",
"\n foreach (var iv in invalidVariables)",
"\n ApplicationMessage.Log(Error.MultipleTechnicalMarginOpening, $\"{iv.DataNode},{iv.AocType},{iv.Novelty}\");",
"\n ",
"\n await ValidateForDataNodeStateActiveAsync<IfrsVariable>(parsingStorage.DataNodeDataBySystemName);",
"\n targetPartitionByReportingNodeAndPeriodId = parsingStorage.TargetPartitionByReportingNodeAndPeriod.Id;",
Expand Down