Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9b7dceb
Rewrite warnings as a class with a protected constructor. Should work…
andrey-katz-systemorph Aug 2, 2023
9311761
Merge branch 'develop' into 359_ExtendableWarningsAndErrors
andrey-katz-systemorph Aug 2, 2023
9ba0ae0
partial rearrangement of errors. Not done yet
andrey-katz-systemorph Aug 2, 2023
ee3219c
compiling error get
andrey-katz-systemorph Aug 2, 2023
9ec4e88
Merge remote-tracking branch 'origin/develop' into 359_ExtendableWarn…
andrey-katz-systemorph Aug 2, 2023
dcfb91d
remove obsolete pieces of code
andrey-katz-systemorph Aug 2, 2023
a4be22c
bug fixed, tests pass
andrey-katz-systemorph Aug 2, 2023
c1f15e1
name change: not sure it was necessary
andrey-katz-systemorph Aug 2, 2023
9a7d558
revert to old names
andrey-katz-systemorph Aug 2, 2023
5d8ab6a
add new error and log it into the cashflow importer
andrey-katz-systemorph Aug 3, 2023
71db57a
define a Util and use it to end the activity if there is no table
andrey-katz-systemorph Aug 3, 2023
74f9fcd
Yield curve
andrey-katz-systemorph Aug 3, 2023
fc52ee2
API improvement: use everywhere the Yield Curve way to log the error
andrey-katz-systemorph Aug 3, 2023
b1b4112
warnings: new more compact API
andrey-katz-systemorph Aug 3, 2023
8f89e3d
moved the Get functions to be virtual methods of the error and warnin…
andrey-katz-systemorph Aug 3, 2023
fa9f5f2
application message updated
andrey-katz-systemorph Aug 3, 2023
077f3c1
Tests adaptation
andrey-katz-systemorph Aug 3, 2023
1177d6e
adapt two tests from the template
andrey-katz-systemorph Aug 3, 2023
27b9ef1
one more test adaptation
andrey-katz-systemorph Aug 4, 2023
599dca4
include GetMessage as an abstract method in the base class
andrey-katz-systemorph Aug 4, 2023
7e40587
Merge branch '359_ExtendableWarningsAndErrors' into 360_AddTableNameV…
andrey-katz-systemorph Aug 4, 2023
cde580e
define new error and log the error
andrey-katz-systemorph Aug 4, 2023
a569cba
Move the checks to the format definitions
andrey-katz-systemorph Aug 4, 2023
066f8c1
openings
andrey-katz-systemorph Aug 4, 2023
40f7d99
verbal explanation slightly modified.
andrey-katz-systemorph Aug 4, 2023
7735eb1
further adjustment to the explanation
andrey-katz-systemorph Aug 4, 2023
f8b1f32
Merge branch '359_ExtendableWarningsAndErrors' into 360_AddTableNameV…
andrey-katz-systemorph Aug 7, 2023
9505c30
all validations are in place
andrey-katz-systemorph Aug 7, 2023
47390de
Merge remote-tracking branch 'origin/develop' into 360_AddTableNameVa…
andrey-katz-systemorph Aug 8, 2023
4bf5d7f
update the validations file correctly
andrey-katz-systemorph Aug 8, 2023
019585c
Merge branch '360_help' into 360_AddTableNameValidation
andrey-katz-systemorph Aug 8, 2023
c86b040
identations
andrey-katz-systemorph Aug 8, 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
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
"outputs": []
}
]
}
}
2 changes: 2 additions & 0 deletions ifrs17/Constants/Validations.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
"\n public static readonly Error AocTypePositionNotSupported = new Error(nameof(AocTypePositionNotSupported));",
"\n public static readonly Error AocConfigurationOrderNotUnique = new Error(nameof(AocConfigurationOrderNotUnique));",
"\n public static readonly Error AccidentYearTypeNotValid = new Error(nameof(AccidentYearTypeNotValid));",
"\n public static readonly Error TableNotFound = new Error(nameof(TableNotFound));",
"\n",
"\n // Partition Errors",
"\n public static readonly Error PartitionNotFound = new Error(nameof(PartitionNotFound));",
Expand Down Expand Up @@ -206,6 +207,7 @@
"\n (nameof(AocTypePositionNotSupported), 1) => $\"The position of the AoC Type {s[0]} is not supported.\",",
"\n (nameof(AocConfigurationOrderNotUnique), _) => $\"Two or more AoC Configurations have the same Order.\",",
"\n (nameof(AccidentYearTypeNotValid), 1) => $\"The parsed AccidentYear {s[0]} is invalid. Expected Accident Year input of type int.\",",
"\n (nameof(TableNotFound), 1) => $\"The import file does not contain table {s[0]}\",",
"\n",
"\n // Partition",
"\n (nameof(PartitionNotFound), _) => $\"Partition do not found.\",",
Expand Down
18 changes: 17 additions & 1 deletion ifrs17/Import/Importers.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,7 @@
"\n Activity.Start();",
"\n var primaryArgs = GetArgsFromMain(dataSet) with {ImportFormat = ImportFormats.YieldCurve};",
"\n primaryArgs.ValidateArgsForPeriodAsync(options.TargetDataSource);",
"\n if (!dataSet.Tables.Contains(primaryArgs.ImportFormat)) ApplicationMessage.Log(Error.TableNotFound, primaryArgs.ImportFormat);",
"\n if(ApplicationMessage.HasErrors()) return Activity.Finish();",
"\n var workspace = Workspace.CreateNew();",
"\n workspace.Initialize(x => x.FromSource(options.TargetDataSource)",
Expand Down Expand Up @@ -985,6 +986,7 @@
"\n ",
"\n Activity.Start();",
"\n var args = await GetArgsAndCommitPartitionAsync<PartitionByReportingNode>(dataSet, targetDataSource);",
"\n",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n ",
"\n var storage = new ParsingStorage(args, targetDataSource, workspace);",
Expand Down Expand Up @@ -1014,7 +1016,6 @@
"\n .ExecuteAsync();",
"\n ",
"\n var portfolios = await workspace.Query<Portfolio>().ToDictionaryAsync(x => x.SystemName);",
"\n",
"\n var yieldCurveColumnGroupOfInsuranceContract = dataSet.Tables.Contains(nameof(GroupOfInsuranceContract)) && dataSet.Tables[nameof(GroupOfInsuranceContract)].Columns.Any(x => x.ColumnName == nameof(GroupOfInsuranceContract.YieldCurveName));",
"\n var yieldCurveColumnGroupOfReinsuranceContract = dataSet.Tables.Contains(nameof(GroupOfReinsuranceContract)) && dataSet.Tables[nameof(GroupOfReinsuranceContract)].Columns.Any(x => x.ColumnName == nameof(GroupOfReinsuranceContract.YieldCurveName));",
"\n",
Expand Down Expand Up @@ -1117,6 +1118,7 @@
"\n .DisableInitialization<DataNodeState>());",
"\n Activity.Start();",
"\n var args = await GetArgsAndCommitPartitionAsync<PartitionByReportingNodeAndPeriod>(dataSet, targetDataSource) with {ImportFormat = ImportFormats.DataNodeState};",
"\n if (!dataSet.Tables.Contains(args.ImportFormat)) ApplicationMessage.Log(Error.TableNotFound, args.ImportFormat);",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n ",
"\n var storage = new ParsingStorage(args, targetDataSource, workspace);",
Expand Down Expand Up @@ -1288,6 +1290,7 @@
"\n Activity.Start();",
"\n var primaryArgs = GetArgsFromMain(dataSet) with {ImportFormat = ImportFormats.DataNodeParameter};",
"\n primaryArgs.ValidateArgsForPeriodAsync(options.TargetDataSource);",
"\n if (!dataSet.Tables.Contains(primaryArgs.ImportFormat)) ApplicationMessage.Log(Error.TableNotFound, primaryArgs.ImportFormat);",
"\n if(ApplicationMessage.HasErrors()) return Activity.Finish();",
"\n var workspace = Workspace.CreateNew();",
"\n workspace.Initialize(x => x.FromSource(options.TargetDataSource).DisableInitialization<RawVariable>().DisableInitialization<IfrsVariable>());",
Expand Down Expand Up @@ -1478,6 +1481,7 @@
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n",
"\n var allArgs = await GetAllArgsAsync(primaryArgs, options.TargetDataSource, ImportFormats.Cashflow);",
"\n if(!dataSet.Tables.Contains(primaryArgs.ImportFormat)) ApplicationMessage.Log(Error.TableNotFound, primaryArgs.ImportFormat);",
"\n await DataNodeFactoryAsync(dataSet, ImportFormats.Cashflow, primaryArgs, options.TargetDataSource);",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n ",
Expand Down Expand Up @@ -1603,6 +1607,7 @@
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n",
"\n var allArgs = await GetAllArgsAsync(primaryArgs, options.TargetDataSource, ImportFormats.Actual);",
"\n if(!dataSet.Tables.Contains(primaryArgs.ImportFormat)) ApplicationMessage.Log(Error.TableNotFound, primaryArgs.ImportFormat);",
"\n await DataNodeFactoryAsync(dataSet, ImportFormats.Actual, primaryArgs, options.TargetDataSource);",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n",
Expand Down Expand Up @@ -1730,6 +1735,7 @@
"Import.DefineFormat(ImportFormats.SimpleValue, async (options, dataSet) => {",
"\n Activity.Start();",
"\n var args = await GetArgsAndCommitPartitionAsync<PartitionByReportingNodeAndPeriod>(dataSet, options.TargetDataSource) with {ImportFormat = ImportFormats.SimpleValue};",
"\n if(!dataSet.Tables.Contains(args.ImportFormat)) ApplicationMessage.Log(Error.TableNotFound, args.ImportFormat);",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n await DataNodeFactoryAsync(dataSet, ImportFormats.SimpleValue, args, options.TargetDataSource);",
"\n if(Activity.HasErrors()) return Activity.Finish();",
Expand Down Expand Up @@ -1769,6 +1775,7 @@
"\n Activity.Start();",
"\n var primaryArgs = await GetArgsAndCommitPartitionAsync<PartitionByReportingNodeAndPeriod>(dataSet, options.TargetDataSource) with {ImportFormat = ImportFormats.Opening};",
"\n if(primaryArgs.Scenario != default(string)) ApplicationMessage.Log(Error.NoScenarioOpening);",
"\n if(!dataSet.Tables.Contains(primaryArgs.ImportFormat)) ApplicationMessage.Log(Error.TableNotFound, primaryArgs.ImportFormat);",
"\n if(Activity.HasErrors()) return Activity.Finish();",
"\n",
"\n var allArgs = await GetAllArgsAsync(primaryArgs, options.TargetDataSource, ImportFormats.Opening);",
Expand All @@ -1793,6 +1800,15 @@
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
""
],
"metadata": {},
"execution_count": 0,
"outputs": []
}
]
}