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

Feature/oed2tests #954

Merged
merged 32 commits into from
Dec 3, 2021
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8b065a8
restored
johcarter Oct 8, 2021
d70291d
upgraded validation test cases to oed2 format
johcarter Oct 8, 2021
eb386cc
added original test case for #813
johcarter Oct 12, 2021
fc100c1
added fm64 mix of step and non step
johcarter Oct 15, 2021
e260818
added oed2 version of insurance and step combined test
johcarter Nov 16, 2021
3f0272e
expected results for sc units
johcarter Nov 23, 2021
09e3944
support for OED2 condtag
sstruzik Nov 22, 2021
4eeb0d4
added expected for sc units
johcarter Nov 23, 2021
173a58d
fix duplicated item_id
sstruzik Nov 24, 2021
1093126
added version of sc13 with 4 locations
johcarter Nov 24, 2021
0175fee
fix policies terms for missing layer
sstruzik Nov 24, 2021
f325308
special conditions expected results
johcarter Nov 26, 2021
ca8167f
added sc14
johcarter Nov 26, 2021
b19d009
handle CondClass
sstruzik Nov 26, 2021
3cb998f
added expected
johcarter Nov 26, 2021
448d75f
added sc5-sc8 to expected
johcarter Nov 26, 2021
1e0d46e
expected folder for conditions
johcarter Nov 30, 2021
9caeed2
move RiskLevel from scope to info
sstruzik Nov 30, 2021
79ec050
Merge branch 'feature/839_CondTag' into feature/oed2tests
sstruzik Dec 1, 2021
c9612f1
updated expected for step
johcarter Dec 1, 2021
2f6a665
test script - Create expected directory if not found
sambles Dec 2, 2021
a4c97ec
expected results for conditions
johcarter Dec 2, 2021
4c3bb51
update expected conditions
johcarter Dec 2, 2021
ee9e735
more updates to expected
johcarter Dec 2, 2021
991190a
added insurance_and_step test
johcarter Dec 2, 2021
08db356
FM testing - Update expected for insurance_conditions
sambles Dec 2, 2021
e5ebd99
Try new fm files
sambles Dec 2, 2021
2d3a1d6
updated to OED2 format
johcarter Dec 3, 2021
cf361f6
Fix test_reinsurance.py - move risk_level column
sambles Dec 3, 2021
b572a22
special condition use dict over set to preserve ordering
sstruzik Dec 3, 2021
6b0533f
Set MDK test to target py:3.8
sambles Dec 3, 2021
eda32a7
Merge branch 'develop' into feature/oed2tests
sambles Dec 3, 2021
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
support for OED2 condtag
  • Loading branch information
sstruzik committed Nov 23, 2021
commit 09e3944968fa2cb60662536a846a584cb6c5b140
13 changes: 10 additions & 3 deletions oasislmf/_data/acc_dtypes.json
Original file line number Diff line number Diff line change
@@ -770,10 +770,17 @@
"require_field": "CR"
},
"CondNumber": {
"data_type": "int",
"data_type": "varchar(40)",
"default_value": "n/a",
"desc": "Condition number",
"py_dtype": "int",
"desc": "Condition number identifies a unique set of condition financial terms applicable to one or more CondTag's.",
"py_dtype": "str",
"require_field": "CR"
},
"CondTag": {
"data_type": "varchar(20)",
"default_value": "n/a",
"desc": "Identifies a group of locations which are subject to one or more conditions.",
"py_dtype": "str",
"require_field": "CR"
},
"CondPeril": {
5 changes: 5 additions & 0 deletions oasislmf/_data/default_acc_profile.json
Original file line number Diff line number Diff line change
@@ -14,6 +14,11 @@
"OEDHierarchy": "Policy",
"Key": "PolNum"
},
"CondTag": {
"ProfileElementName": "CondTag",
"OEDHierarchy": "SpecialCondition",
"Key": "CondTag"
},
"CondNumber": {
"ProfileElementName": "CondNumber",
"OEDHierarchy": "SpecialCondition",
5 changes: 5 additions & 0 deletions oasislmf/_data/default_fm_agg_profile.json
Original file line number Diff line number Diff line change
@@ -71,6 +71,11 @@
"field": "accnumber",
"name": "Account num."
},
"CondTag": {
"src": "FM",
"field": "condtag",
"name": "Cond tag."
},
"CondNum": {
"src": "FM",
"field": "condnumber",
10 changes: 5 additions & 5 deletions oasislmf/_data/loc_dtypes.json
Original file line number Diff line number Diff line change
@@ -461,12 +461,12 @@
"default_value": "n/a",
"py_dtype": "str"
},
"CondNumber": {
"desc": "Condition Number to be able to link to relevant special condition",
"require_field": "CR",
"data_type": "int",
"CondTag": {
"data_type": "varchar(20)",
"default_value": "n/a",
"py_dtype": "int"
"desc": "Identifies a group of locations which are subject to one or more conditions.",
"py_dtype": "str",
"require_field": "CR"
},
"CondPriority": {
"desc": "Condition priority: specifies the order in which special conditions apply",
290 changes: 137 additions & 153 deletions oasislmf/preparation/il_inputs.py

Large diffs are not rendered by default.

664 changes: 332 additions & 332 deletions validation/insurance/account.csv

Large diffs are not rendered by default.

1,270 changes: 635 additions & 635 deletions validation/insurance/location.csv

Large diffs are not rendered by default.