expected folder for conditions

OasisLMF · sambles · Dec 3, 2021 · Oct 8, 2021 · Oct 8, 2021 · Oct 12, 2021
commit 1e0d46ed3a8f74fdbe6b429cb0639fc43533bd11
diff --git a/tests/fm/test_fm.py b/tests/fm/test_fm.py
@@ -14,7 +14,7 @@ class FmAcceptanceTests(TestCase):
     def setUp(self):
         self.test_cases_fp = os.path.join(sys.path[0], 'validation')
         self.update_expected = False
-        self.keep_output = False
+        self.keep_output = True
 
     def run_test(self, test_case, fmpy=False, subperils=1, expected_dir="expected"):
         with tempfile.TemporaryDirectory() as tmp_run_dir:
@@ -43,6 +43,8 @@ def run_test(self, test_case, fmpy=False, subperils=1, expected_dir="expected"):
     def test_insurance(self):
         self.run_test('insurance')
 
+    def test_insurance_conditions(self):
+        self.run_test('insurance_conditions')
 
     def test_insurance_step(self):
        self.run_test('insurance_step')
@@ -60,6 +62,9 @@ def test_issues(self):
     def test_insurance_2_subperils(self):
         self.run_test('insurance', subperils=2, expected_dir="expected_subperils")
 
+    def test_insurance_conditions_2_subperils(self):
+        self.run_test('insurance_conditions', subperils=2, expected_dir="expected_subperils")
+
 #   test skipped - fails because of ordering of outputs in ils.csv is different between fm and fmpy, but otherwise correct.
 #   def test_insurance_step_2_subperils(self):
 #       self.run_test('insurance_step', subperils=2, expected_dir="expected_subperils")

diff --git a/tests/fm/test_fmpy.py b/tests/fm/test_fmpy.py
@@ -43,6 +43,9 @@ def run_test(self, test_case, fmpy=False, subperils=1, expected_dir="expected"):
     def test_insurance(self):
         self.run_test('insurance',fmpy=True)
 
+    def test_insurance_conditions(self):
+        self.run_test('insurance_conditions', fmpy=True)
+
     def test_insurance_step(self):
         self.run_test('insurance_step',fmpy=True)
 
@@ -59,6 +62,9 @@ def test_issues(self):
     def test_insurance_2_subperils(self):
         self.run_test('insurance', fmpy=True, subperils=2, expected_dir="expected_subperils")
 
+    def test_insurance_conditions_2_subperils(self):
+        self.run_test('insurance_conditions', fmpy=True, subperils=2, expected_dir="expected_subperils")
+
     def test_insurance_step_2_subperils(self):
         self.run_test('insurance_step', fmpy=True, subperils=2, expected_dir="expected_subperils")
 

diff --git a/tests/fm/test_fmpy_cond.py b/tests/fm/test_fmpy_cond.py
@@ -0,0 +1,78 @@
+import os.path
+import sys
+import tempfile
+import shutil
+import datetime
+
+from oasislmf.manager import OasisManager
+from unittest import TestCase
+
+import pytest
+
+class FmAcceptanceTests(TestCase):
+
+    def setUp(self):
+        self.test_cases_fp = os.path.join(sys.path[0], 'validation')
+        self.update_expected = False
+        self.keep_output = True
+
+    def run_test(self, test_case, fmpy=False, subperils=1, expected_dir="expected"):
+        with tempfile.TemporaryDirectory() as tmp_run_dir:
+
+            run_dir=tmp_run_dir
+            if self.keep_output:
+                utcnow = '{:%Y%m%d%H%M%S}'.format(datetime.datetime.now())
+                run_dir = os.path.join(
+                    self.test_cases_fp, 'runs', 'test-fmpy-p{}-{}-{}'.format(subperils, test_case,utcnow)
+                )
+                print(f'Generating Output in: {run_dir}')
+
+            result = OasisManager().run_fm_test(
+                test_case_dir=self.test_cases_fp,
+                test_case_name=test_case,
+                run_dir=run_dir,
+                update_expected=self.update_expected,
+                fmpy=fmpy,
+                fmpy_sort_output=True,
+                num_subperils=subperils,
+                test_tolerance=0.001,
+                expected_output_dir=expected_dir,
+            )
+        self.assertTrue(result)
+
+#    def test_insurance(self):
+#        self.run_test('insurance',fmpy=True)
+
+    def test_insurance_conditions(self):
+        self.run_test('insurance_conditions',fmpy=True)
+
+#    def test_insurance_step(self):
+#        self.run_test('insurance_step',fmpy=True)
+
+#    def test_reinsurance1(self):
+#        self.run_test('reinsurance1',fmpy=True)
+
+#    def test_reinsurance2(self):
+#        self.run_test('reinsurance2',fmpy=True)
+
+#    def test_issues(self):
+#        self.run_test('issues',fmpy=True)
+
+    # multiperil tests
+#    def test_insurance_2_subperils(self):
+#        self.run_test('insurance', fmpy=True, subperils=2, expected_dir="expected_subperils")
+
+#    def test_insurance_conditions_2_subperils(self):
+#        self.run_test('insurance_conditions', subperils=2, expected_dir="expected_subperils")
+
+#    def test_insurance_step_2_subperils(self):
+#        self.run_test('insurance_step', fmpy=True, subperils=2, expected_dir="expected_subperils")
+
+#    def test_reinsurance1_2_subperils(self):
+#        self.run_test('reinsurance1', fmpy=True, subperils=2, expected_dir="expected_subperils")
+
+#    def test_reinsurance2_2_subperils(self):
+#        self.run_test('reinsurance2', fmpy=True, subperils=2, expected_dir="expected_subperils")
+
+#    def test_issues_2_subperils(self):
+#        self.run_test('issues', fmpy=True, subperils=2, expected_dir="expected_subperils")
diff --git a/validation/insurance_conditions/expected/account.csv b/validation/insurance_conditions/expected/account.csv
@@ -0,0 +1,81 @@
+FlexiAccTestCase,PortNumber,AccNumber,PolNumber,PolPerilsCovered,AccCurrency,LayerParticipation,LayerLimit,LayerAttachment,PolPeril,PolDed6All,PolDedType6All,PolMinDed6All,PolMaxDed6All,PolLimit6All,PolLimitType6All,CondPeril,CondTag,CondNumber,CondDed6All,CondDedType6All,CondMinDed6All,CondMaxDed6All,CondLimit6All,CondLimitType6All,CondPriority,CondName,CondClass,OEDVersion,FlexiAccUnit
+fm12,fm12,105449,477353,AA1,EUR,0.15,5700000,0,AA1,0,0,10000,0,0,0,AA1,ii 0,471160,0,0,10000,0,100000000,0,1,ii 0,0,2.0.0,fm12
+fm12,fm12,105449,477353,AA1,EUR,0.15,5700000,0,AA1,0,0,10000,0,0,0,AA1,ii 1,471161,0,0,600000,0,15000000,0,1,ii 1,0,2.0.0,fm12
+fm12,fm12,105449,477353,AA1,EUR,0.15,5700000,0,AA1,0,0,10000,0,0,0,AA1,ii 2,471163,0,0,600000,0,15000000,0,1,ii 2,0,2.0.0,fm12
+fm12,fm12,105449,477354,AA1,EUR,0.15,4300000,5700000,AA1,0,0,10000,0,0,0,AA1,ii 0,471168,0,0,10000,0,100000000,0,1,ii 0,0,2.0.0,fm12
+fm12,fm12,105449,477354,AA1,EUR,0.15,4300000,5700000,AA1,0,0,10000,0,0,0,AA1,ii 1,471169,0,0,600000,0,15000000,0,1,ii 1,0,2.0.0,fm12
+fm12,fm12,105449,477354,AA1,EUR,0.15,4300000,5700000,AA1,0,0,10000,0,0,0,AA1,ii 2,471166,0,0,600000,0,15000000,0,1,ii 2,0,2.0.0,fm12
+fm12,fm12,105449,477355,AA1,EUR,0.12,15000000,10000000,AA1,0,0,10000,0,0,0,AA1,ii 0,471173,0,0,10000,0,100000000,0,1,ii 0,0,2.0.0,fm12
+fm12,fm12,105449,477355,AA1,EUR,0.12,15000000,10000000,AA1,0,0,10000,0,0,0,AA1,ii 1,471174,0,0,600000,0,15000000,0,1,ii 1,0,2.0.0,fm12
+fm12,fm12,105449,477355,AA1,EUR,0.12,15000000,10000000,AA1,0,0,10000,0,0,0,AA1,ii 2,471171,0,0,600000,0,15000000,0,1,ii 2,0,2.0.0,fm12
+fm12,fm12,105449,477356,AA1,EUR,0.22,5000000,25000000,AA1,0,0,10000,0,0,0,AA1,ii 0,471178,0,0,10000,0,100000000,0,1,ii 0,0,2.0.0,fm12
+fm12,fm12,105449,477356,AA1,EUR,0.22,5000000,25000000,AA1,0,0,10000,0,0,0,AA1,ii 1,471179,0,0,600000,0,15000000,0,1,ii 1,0,2.0.0,fm12
+fm12,fm12,105449,477356,AA1,EUR,0.22,5000000,25000000,AA1,0,0,10000,0,0,0,AA1,ii 2,471176,0,0,600000,0,15000000,0,1,ii 2,0,2.0.0,fm12
+fm12,fm12,105449,477357,AA1,EUR,0.22,20000000,30000000,AA1,0,0,10000,0,0,0,AA1,ii 0,471183,0,0,10000,0,100000000,0,1,ii 0,0,2.0.0,fm12
+fm12,fm12,105449,477357,AA1,EUR,0.22,20000000,30000000,AA1,0,0,10000,0,0,0,AA1,ii 1,471184,0,0,600000,0,15000000,0,1,ii 1,0,2.0.0,fm12
+fm12,fm12,105449,477357,AA1,EUR,0.22,20000000,30000000,AA1,0,0,10000,0,0,0,AA1,ii 2,471181,0,0,600000,0,15000000,0,1,ii 2,0,2.0.0,fm12
+fm12,fm12,105449,477358,AA1,EUR,0.1,50000000,50000000,AA1,0,0,10000,0,0,0,AA1,ii 0,471188,0,0,10000,0,100000000,0,1,ii 0,0,2.0.0,fm12
+fm12,fm12,105449,477358,AA1,EUR,0.1,50000000,50000000,AA1,0,0,10000,0,0,0,AA1,ii 1,471189,0,0,600000,0,15000000,0,1,ii 1,0,2.0.0,fm12
+fm12,fm12,105449,477358,AA1,EUR,0.1,50000000,50000000,AA1,0,0,10000,0,0,0,AA1,ii 2,471188,0,0,600000,0,15000000,0,1,ii 2,0,2.0.0,fm12
+fm12,fm12,105449,477359,AA1,EUR,0.1,100000000,100000000,AA1,0,0,10000,0,0,0,AA1,ii 0,471193,0,0,10000,0,100000000,0,1,ii 0,0,2.0.0,fm12
+fm12,fm12,105449,477359,AA1,EUR,0.1,100000000,100000000,AA1,0,0,10000,0,0,0,AA1,ii 1,471194,0,0,600000,0,15000000,0,1,ii 1,0,2.0.0,fm12
+fm12,fm12,105449,477359,AA1,EUR,0.1,100000000,100000000,AA1,0,0,10000,0,0,0,AA1,ii 2,471191,0,0,600000,0,15000000,0,1,ii 2,0,2.0.0,fm12
+fm41,fm41,1,1,AA1,EUR,1,0,0,AA1,0,0,0,0,1500000,0,AA1,1,1,0,0,50000,0,250000,0,1,1,0,2.0.0,fm41
+sc1,sc1,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294581,294581,100000,0,0,0,25000000,0,0,100K DED locs,0,2.0.0,sc1
+sc1,sc1,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294582,294582,250000,0,0,0,25000000,0,0,250K DED locs,0,2.0.0,sc1
+sc1,sc1,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294583,294583,50000,0,0,0,25000000,0,0,50K DED locs,0,2.0.0,sc1
+sc1,sc1,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294584,294584,1000000,0,0,0,25000000,0,0,1M DED locs,0,2.0.0,sc1
+sc1,sc1,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294585,294585,30000,0,0,0,25000000,0,0,30KDED locs,0,2.0.0,sc1
+sc1,sc1,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294586,294586,500000,0,0,0,25000000,0,0,500KDED locs,0,2.0.0,sc1
+sc10,sc10,1,1,AA1,USD,1,200000000,0,AA1,0,0,0,0,0,0,AA1,1,1,10000,0,0,0,0,0,1,child1,0,2.0.0,sc10
+sc10,sc10,1,1,AA1,USD,1,200000000,0,AA1,0,0,0,0,0,0,AA1,2,2,50000,0,0,0,0,0,1,child2,0,2.0.0,sc10
+sc10,sc10,1,1,AA1,USD,1,200000000,0,AA1,0,0,0,0,0,0,AA1,3,3,100000,0,0,0,0,0,1,child3,0,2.0.0,sc10
+sc10,sc10,1,1,AA1,USD,1,200000000,0,AA1,0,0,0,0,0,0,AA1,4,4,0,0,0,0,50000000,0,2,parent,0,2.0.0,sc10
+sc11,sc11,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577328,577328,0,0,0,0,5000000,0,2,ROW,0,2.0.0,sc11
+sc11,sc11,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577329,577329,50000,0,0,0,0,0,1,"FR,GB,IE",0,2.0.0,sc11
+sc11,sc11,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577330,577330,200000,0,0,0,25000000,0,1,US CAL,0,2.0.0,sc11
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577322,577322,0,0,0,0,10000000,0,1,"CH,CN",0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577323,577323,50000,0,0,0,40000000,0,1,RO US,0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577324,577324,50000,0,0,0,50000000,0,1,DE,0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577325,577325,0,0,0,0,50000000,0,1,IL,0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577326,577326,0,0,0,0,1000000,0,1,PE,0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577327,577327,0,0,0,0,4000000,0,1,"TR, MX",0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577328,577328,0,0,0,0,5000000,0,2,ROW,0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577329,577329,50000,0,0,0,0,0,1,"FR,GB,IE",0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577330,577330,200000,0,0,0,25000000,0,1,US CAL,0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577331,577331,50000,0,0,0,20000000,0,1,"US NM,CA,JP",0,2.0.0,sc12
+sc12,sc12,17,A,AA1,USD,0.45,50000000,0,AA1,0,0,0,0,0,0,AA1,577332,577332,0,0,0,0,2000000,0,1,"CL, CO",0,2.0.0,sc12
+sc13,sc13,5803,5965,AA1,USD,0.77,666175000,0,AA1,0,0,13323500,0,0,0,AA1,414,1,0,0,10000000,0,500000000,0,1,,0,2.0.0,sc13
+sc13,sc13,5803,5965,AA1,USD,0.77,666175000,0,AA1,0,0,13323500,0,0,0,AA1,593,1,0,0,10000000,0,500000000,0,1,,0,2.0.0,sc13
+sc13,sc13,5803,5966,AA1,USD,0.77,1998525000,666175000,AA1,0,0,13323500,0,0,0,AA1,189,2,0,0,0,0,500000000,0,1,,0,2.0.0,sc13
+sc13,sc13,5803,5966,AA1,USD,0.77,1998525000,666175000,AA1,0,0,13323500,0,0,0,AA1,414,1,0,0,10000000,0,500000000,0,1,,0,2.0.0,sc13
+sc13,sc13,5803,5966,AA1,USD,0.77,1998525000,666175000,AA1,0,0,13323500,0,0,0,AA1,593,1,0,0,10000000,0,500000000,0,1,,0,2.0.0,sc13
+sc14,sc14,5803,5965,AA1,USD,0.77,666175000,0,AA1,0,0,13323500,0,0,0,AA1,414,1,0,0,10000000,0,500000000,0,1,,0,2.0.0,sc14
+sc14,sc14,5803,5965,AA1,USD,0.77,666175000,0,AA1,0,0,13323500,0,0,0,AA1,593,1,0,0,10000000,0,500000000,0,1,,0,2.0.0,sc14
+sc14,sc14,5803,5966,AA1,USD,0.77,1998525000,666175000,AA1,0,0,13323500,0,0,0,AA1,189,2,0,0,0,0,500000000,0,1,,0,2.0.0,sc14
+sc14,sc14,5803,5966,AA1,USD,0.77,1998525000,666175000,AA1,0,0,13323500,0,0,0,AA1,414,1,0,0,10000000,0,500000000,0,1,,0,2.0.0,sc14
+sc14,sc14,5803,5966,AA1,USD,0.77,1998525000,666175000,AA1,0,0,13323500,0,0,0,AA1,593,1,0,0,10000000,0,500000000,0,1,,0,2.0.0,sc14
+sc2,sc2,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294581,294581,100000,0,0,0,25000000,0,0,100K DED locs,0,2.0.0,sc2
+sc2,sc2,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294582,294582,250000,0,0,0,25000000,0,0,250K DED locs,0,2.0.0,sc2
+sc2,sc2,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294583,294583,50000,0,0,0,25000000,0,0,50K DED locs,0,2.0.0,sc2
+sc2,sc2,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294584,294584,1000000,0,0,0,25000000,0,0,1M DED locs,0,2.0.0,sc2
+sc2,sc2,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294585,294585,30000,0,0,0,25000000,0,0,30KDED locs,0,2.0.0,sc2
+sc2,sc2,9,A,AA1,USD,0.15,25000000,0,AA1,0,0,25000,0,0,0,AA1,294586,294586,500000,0,0,0,25000000,0,0,500KDED locs,0,2.0.0,sc2
+sc3,sc3,15,101,AA1,CAD,0.1,50000000,0,AA1,0,0,500000,0,0,0,AA1,1,499046,1000000,0,0,0,50000000,0,0,WS_UD1_50M_1MDED,0,2.0.0,sc3
+sc3,sc3,15,102,AA1,CAD,0.09,50000000,50000000,AA1,0,0,500000,0,0,0,AA1,1,499047,1000000,0,0,0,100000000,0,0,WS_UD1_100M_1MDED,0,2.0.0,sc3
+sc3,sc3,15,103,AA1,CAD,0.17,150000000,100000000,AA1,0,0,500000,0,0,0,AA1,1,499048,1000000,0,0,0,250000000,0,0,WS_UD1_250M_1MDED,0,2.0.0,sc3
+sc3,sc3,15,104,AA1,CAD,0.14,250000000,250000000,AA1,0,0,500000,0,0,0,AA1,1,499049,1000000,0,0,0,500000000,0,0,WS_UD1_500M_1MDED,0,2.0.0,sc3
+sc4,sc4,15,101,AA1,CAD,0.1,50000000,0,AA1,0,0,500000,0,0,0,AA1,1,499046,1000000,0,0,0,50000000,0,0,WS_UD1_50M_1MDED,0,2.0.0,sc4
+sc4,sc4,15,102,AA1,CAD,0.09,50000000,50000000,AA1,0,0,500000,0,0,0,AA1,1,499047,1000000,0,0,0,100000000,0,0,WS_UD1_100M_1MDED,0,2.0.0,sc4
+sc4,sc4,15,103,AA1,CAD,0.17,150000000,100000000,AA1,0,0,500000,0,0,0,AA1,1,499048,1000000,0,0,0,250000000,0,0,WS_UD1_250M_1MDED,0,2.0.0,sc4
+sc4,sc4,15,104,AA1,CAD,0.14,250000000,250000000,AA1,0,0,500000,0,0,0,AA1,1,499049,1000000,0,0,0,500000000,0,0,WS_UD1_500M_1MDED,0,2.0.0,sc4
+sc5,sc5,11,A,AA1,USD,1,2500000,0,AA1,0,0,0,0,0,0,AA1,366450,366450,0,0,0,0,0,0,0,EXCL NM LOCS,1,2.0.0,sc5
+sc6,sc6,11,A,AA1,USD,1,2500000,0,AA1,0,0,0,0,0,0,AA1,366450,366450,0,0,0,0,0,0,0,EXCL NM LOCS,1,2.0.0,sc6
+sc7,sc7,10,A,AA1,USD,0.5,5000000,0,AA1,0,0,100000,0,0,0,AA1,1,331826,0,0,0,0,0,0,0,EXCLUDE CA EQ,1,2.0.0,sc7
+sc7,sc7,10,B,AA1,USD,0.1418,25000000,25000000,AA1,0,0,100000,0,0,0,AA1,1,331828,0,0,0,0,0,0,0,EXCLUDE CA EQ,1,2.0.0,sc7
+sc8,sc8,10,A,AA1,USD,0.5,5000000,0,AA1,0,0,100000,0,0,0,AA1,1,331826,0,0,0,0,0,0,0,EXCLUDE CA EQ,1,2.0.0,sc8
+sc8,sc8,10,B,AA1,USD,0.1418,25000000,25000000,AA1,0,0,100000,0,0,0,AA1,1,331828,0,0,0,0,0,0,0,EXCLUDE CA EQ,1,2.0.0,sc8
+sc9,sc9,1,1,AA1,USD,1,200000000,0,AA1,0,0,0,0,0,0,AA1,1,1,10000,0,0,0,0,0,1,child1,0,2.0.0,sc9
+sc9,sc9,1,1,AA1,USD,1,200000000,0,AA1,0,0,0,0,0,0,AA1,2,2,50000,0,0,0,0,0,1,child2,0,2.0.0,sc9
+sc9,sc9,1,1,AA1,USD,1,200000000,0,AA1,0,0,0,0,0,0,AA1,3,3,100000,0,0,0,0,0,1,child3,0,2.0.0,sc9
+sc9,sc9,1,1,AA1,USD,1,200000000,0,AA1,0,0,0,0,0,0,AA1,4,4,0,0,0,0,50000000,0,2,parent,0,2.0.0,sc9