FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Eliminate last occurrences of deprecated read_-methods everywhere · bjkindia/climada_python@eff303e · GitHub

  1. bjkindia
  2. climada_python

Repository navigation

Commit eff303e

Browse files
Thomas Vogt
committed
Eliminate last occurrences of deprecated read_-methods everywhere
1 parent 4e90697 commit eff303e

23 files changed

Lines changed: 85 additions & 150 deletions

‎climada/engine/calibration_opt.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -454,10 +454,8 @@ def specific_calib(x):
454454
#
455455
#
456456
# ## tryout calib_all
457-
# hazard = TropCyclone()
458-
# hazard.read_hdf5('C:/Users/ThomasRoosli/tc_NA_hazard.hdf5')
459-
# exposure = LitPop()
460-
# exposure.read_hdf5('C:/Users/ThomasRoosli/DOM_LitPop.hdf5')
457+
# hazard = TropCyclone.from_hdf5('C:/Users/ThomasRoosli/tc_NA_hazard.hdf5')
458+
# exposure = LitPop.from_hdf5('C:/Users/ThomasRoosli/DOM_LitPop.hdf5')
461459
# impf_name_or_instance = 'emanuel'
462460
# param_full_dict = {'v_thresh': [25.7, 20], 'v_half': [70], 'scale': [1, 0.8]}
463461
#
@@ -471,10 +469,8 @@ def specific_calib(x):
471469
#
472470
#
473471
# ## tryout calib_optimize
474-
# hazard = TropCyclone()
475-
# hazard.read_hdf5('C:/Users/ThomasRoosli/tc_NA_hazard.hdf5')
476-
# exposure = LitPop()
477-
# exposure.read_hdf5('C:/Users/ThomasRoosli/DOM_LitPop.hdf5')
472+
# hazard = TropCyclone.from_hdf5('C:/Users/ThomasRoosli/tc_NA_hazard.hdf5')
473+
# exposure = LitPop.from_hdf5('C:/Users/ThomasRoosli/DOM_LitPop.hdf5')
478474
# impf_name_or_instance = 'emanuel'
479475
# param_dict = {'v_thresh': 25.7, 'v_half': 70, 'scale': 0.6}
480476
# year_range = [2004, 2017]

‎climada/engine/impact.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,7 @@ def calc(self, exposures, impact_funcs, hazard, save_mat=False):
150150
151151
>>> haz = Hazard.from_mat(HAZ_DEMO_MAT) # Set hazard
152152
>>> haz.check()
153-
>>> ent = Entity() # Load entity with default values
154-
>>> ent.read_excel(ENT_TEMPLATE_XLS) # Set exposures
153+
>>> ent = Entity.from_excel(ENT_TEMPLATE_XLS) # Set exposures
155154
>>> ent.check()
156155
>>> imp = Impact()
157156
>>> imp.calc(ent.exposures, ent.impact_funcs, haz)
@@ -161,8 +160,7 @@ def calc(self, exposures, impact_funcs, hazard, save_mat=False):
161160
162161
>>> haz = Hazard.from_mat(HAZ_DEMO_MAT) # Set hazard
163162
>>> haz.check()
164-
>>> funcs = ImpactFuncSet()
165-
>>> funcs.read_excel(ENT_TEMPLATE_XLS) # Set impact functions
163+
>>> funcs = ImpactFuncSet.from_excel(ENT_TEMPLATE_XLS) # Set impact functions
166164
>>> funcs.check()
167165
>>> exp = Exposures(pd.read_excel(ENT_TEMPLATE_XLS)) # Set exposures
168166
>>> exp.check()

‎climada/engine/test/test_cost_benefit.py‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ def test_calc_impact_measures_pass(self):
4444
hazard = Hazard.from_mat(HAZ_TEST_MAT)
4545

4646
self.assertTrue(ENT_TEST_MAT.is_file(), "{} is not a file".format(ENT_TEST_MAT))
47-
entity = Entity()
48-
entity.read_mat(ENT_TEST_MAT)
47+
entity = Entity.from_mat(ENT_TEST_MAT)
4948
entity.check()
5049
entity.measures._data['TC'] = entity.measures._data.pop('XX')
5150
for meas in entity.measures.get_measure('TC'):
@@ -226,8 +225,7 @@ def test_cb_one_meas_fut_pass(self):
226225
def test_calc_cb_no_change_pass(self):
227226
"""Test _calc_cost_benefit without present value against reference value"""
228227
hazard = Hazard.from_mat(HAZ_TEST_MAT)
229-
entity = Entity()
230-
entity.read_mat(ENT_TEST_MAT)
228+
entity = Entity.from_mat(ENT_TEST_MAT)
231229
entity.measures._data['TC'] = entity.measures._data.pop('XX')
232230
for meas in entity.measures.get_measure('TC'):
233231
meas.haz_type = 'TC'
@@ -263,8 +261,7 @@ def test_calc_cb_no_change_pass(self):
263261
def test_calc_cb_change_pass(self):
264262
"""Test _calc_cost_benefit with present value against reference value"""
265263
hazard = Hazard.from_mat(HAZ_TEST_MAT)
266-
entity = Entity()
267-
entity.read_mat(ENT_TEST_MAT)
264+
entity = Entity.from_mat(ENT_TEST_MAT)
268265
entity.measures._data['TC'] = entity.measures._data.pop('XX')
269266
for meas in entity.measures.get_measure('TC'):
270267
meas.haz_type = 'TC'
@@ -275,8 +272,7 @@ def test_calc_cb_change_pass(self):
275272
entity.impact_funcs, when='present',
276273
risk_func=risk_aai_agg, save_imp=False)
277274

278-
ent_future = Entity()
279-
ent_future.read_excel(ENT_DEMO_FUTURE)
275+
ent_future = Entity.from_excel(ENT_DEMO_FUTURE)
280276
ent_future.check()
281277

282278
haz_future = copy.deepcopy(hazard)
@@ -441,8 +437,7 @@ def test_norm_value(self):
441437
def test_combine_fut_pass(self):
442438
"""Test combine_measures with present and future"""
443439
hazard = Hazard.from_mat(HAZ_TEST_MAT)
444-
entity = Entity()
445-
entity.read_excel(ENT_DEMO_TODAY)
440+
entity = Entity.from_excel(ENT_DEMO_TODAY)
446441
entity.check()
447442
entity.exposures.ref_year = 2018
448443

@@ -502,8 +497,7 @@ def test_combine_fut_pass(self):
502497
def test_combine_current_pass(self):
503498
"""Test combine_measures with only future"""
504499
hazard = Hazard.from_mat(HAZ_TEST_MAT)
505-
entity = Entity()
506-
entity.read_excel(ENT_DEMO_TODAY)
500+
entity = Entity.from_excel(ENT_DEMO_TODAY)
507501
entity.check()
508502
entity.exposures.ref_year = 2018
509503
cost_ben = CostBenefit()
@@ -543,8 +537,7 @@ def test_combine_current_pass(self):
543537
def test_apply_transf_current_pass(self):
544538
"""Test apply_risk_transfer with only future"""
545539
hazard = Hazard.from_mat(HAZ_TEST_MAT)
546-
entity = Entity()
547-
entity.read_excel(ENT_DEMO_TODAY)
540+
entity = Entity.from_excel(ENT_DEMO_TODAY)
548541
entity.check()
549542
entity.exposures.ref_year = 2018
550543
cost_ben = CostBenefit()
@@ -594,8 +587,7 @@ def test_apply_transf_current_pass(self):
594587
def test_apply_transf_cost_fact_pass(self):
595588
"""Test apply_risk_transfer with only future annd cost factor"""
596589
hazard = Hazard.from_mat(HAZ_TEST_MAT)
597-
entity = Entity()
598-
entity.read_excel(ENT_DEMO_TODAY)
590+
entity = Entity.from_excel(ENT_DEMO_TODAY)
599591
entity.check()
600592
entity.exposures.ref_year = 2018
601593
cost_ben = CostBenefit()
@@ -643,8 +635,7 @@ def test_apply_transf_cost_fact_pass(self):
643635
def test_apply_transf_future_pass(self):
644636
"""Test apply_risk_transfer with present and future"""
645637
hazard = Hazard.from_mat(HAZ_TEST_MAT)
646-
entity = Entity()
647-
entity.read_excel(ENT_DEMO_TODAY)
638+
entity = Entity.from_excel(ENT_DEMO_TODAY)
648639
entity.check()
649640
entity.exposures.ref_year = 2018
650641

@@ -700,8 +691,7 @@ def test_apply_transf_future_pass(self):
700691
def test_remove_measure(self):
701692
"""Test remove_measure method"""
702693
hazard = Hazard.from_mat(HAZ_TEST_MAT)
703-
entity = Entity()
704-
entity.read_excel(ENT_DEMO_TODAY)
694+
entity = Entity.from_excel(ENT_DEMO_TODAY)
705695
entity.check()
706696
entity.exposures.ref_year = 2018
707697
cost_ben = CostBenefit()
@@ -729,15 +719,13 @@ def test_calc_change_pass(self):
729719
"""Test calc with future change"""
730720
# present
731721
hazard = Hazard.from_mat(HAZ_TEST_MAT)
732-
entity = Entity()
733-
entity.read_excel(ENT_DEMO_TODAY)
722+
entity = Entity.from_excel(ENT_DEMO_TODAY)
734723
entity.exposures.gdf.rename(columns={'impf_': 'impf_TC'}, inplace=True)
735724
entity.check()
736725
entity.exposures.ref_year = 2018
737726

738727
# future
739-
ent_future = Entity()
740-
ent_future.read_excel(ENT_DEMO_FUTURE)
728+
ent_future = Entity.from_excel(ENT_DEMO_FUTURE)
741729
ent_future.check()
742730
ent_future.exposures.ref_year = 2040
743731

@@ -788,8 +776,7 @@ def test_calc_change_pass(self):
788776
def test_calc_no_change_pass(self):
789777
"""Test calc without future change"""
790778
hazard = Hazard.from_mat(HAZ_TEST_MAT)
791-
entity = Entity()
792-
entity.read_excel(ENT_DEMO_TODAY)
779+
entity = Entity.from_excel(ENT_DEMO_TODAY)
793780
entity.check()
794781
entity.exposures.ref_year = 2018
795782
cost_ben = CostBenefit()
@@ -817,8 +804,7 @@ class TestRiskFuncs(unittest.TestCase):
817804
"""Test risk functions definitions"""
818805

819806
def test_impact(self):
820-
ent = Entity()
821-
ent.read_excel(ENT_DEMO_TODAY)
807+
ent = Entity.from_excel(ENT_DEMO_TODAY)
822808
ent.check()
823809
hazard = Hazard.from_mat(HAZ_TEST_MAT)
824810
impact = Impact()

‎climada/engine/test/test_impact.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ def test_ref_value_insure_pass(self):
116116
"""Test result against reference value"""
117117
# Read demo entity values
118118
# Set the entity default file to the demo one
119-
ent = Entity()
120-
ent.read_excel(ENT_DEMO_TODAY)
119+
ent = Entity.from_excel(ENT_DEMO_TODAY)
121120
ent.check()
122121

123122
# Read default hazard file
@@ -413,7 +412,7 @@ def test_write_read_exp_test(self):
413412
0, len([i for i, j in zip(imp_write.event_name, imp_read.event_name) if i != j]))
414413
self.assertIsInstance(imp_read.crs, str)
415414

416-
def test_write_read_excel_pass(self):
415+
def test_excel_io(self):
417416
"""Test write and read in excel"""
418417
ent = Entity.from_excel(ENT_DEMO_TODAY)
419418
ent.check()
@@ -469,7 +468,7 @@ def test_local_exceedance_imp_pass(self):
469468

470469
# Read default hazard file
471470
hazard = Hazard.from_mat(HAZ_TEST_MAT)
472-
471+
473472
# Create impact object
474473
impact = Impact()
475474
# Assign centroids to exposures

‎climada/engine/uncertainty_quantification/test/test_uncertainty.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ def impf_dem(x_paa=1, x_mdd=1):
5959
impf_set.append(impf)
6060
return impf_set
6161

62-
exp = Exposures()
63-
exp.read_hdf5(EXP_DEMO_H5)
62+
exp = Exposures.from_hdf5(EXP_DEMO_H5)
6463
def exp_dem(x_exp=1, exp=exp):
6564
exp_tmp = exp.copy(deep=True)
6665
exp_tmp.gdf.value *= x_exp
@@ -94,15 +93,13 @@ def make_input_vars():
9493

9594

9695
def ent_dem():
97-
entity = Entity()
98-
entity.read_excel(ENT_DEMO_TODAY)
96+
entity = Entity.from_excel(ENT_DEMO_TODAY)
9997
entity.exposures.ref_year = 2018
10098
entity.check()
10199
return entity
102100

103101
def ent_fut_dem():
104-
entity = Entity()
105-
entity.read_excel(ENT_DEMO_FUTURE)
102+
entity = Entity.from_excel(ENT_DEMO_FUTURE)
106103
entity.exposures.ref_year = 2040
107104
entity.check()
108105
return entity

‎climada/entity/impact_funcs/impact_func_set.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ def from_excel(cls, file_name, description='', var_names=DEF_VAR_EXCEL):
372372

373373
def read_excel(self, *args, **kwargs):
374374
"""This function is deprecated, use ImpactFuncSet.from_excel instead."""
375-
LOGGER.warning("The use of ImpactFuncSet.read?excel is deprecated." +
375+
LOGGER.warning("The use of ImpactFuncSet.read_excel is deprecated." +
376376
"Use ImpactFuncSet.from_excel instead.")
377377
self.__dict__ = ImpactFuncSet.from_excel(*args, **kwargs).__dict__
378378

‎climada/entity/measures/measure_set.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ def __init__(self):
114114
115115
Read measures from file and checks consistency data:
116116
117-
>>> meas = MeasureSet()
118-
>>> meas.read_excel(ENT_TEMPLATE_XLS)
117+
>>> meas = MeasureSet.from_excel(ENT_TEMPLATE_XLS)
119118
"""
120119
self.clear()
121120

‎climada/entity/measures/test/test_base.py‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ class TestApply(unittest.TestCase):
4545
"""Test implement measures functions."""
4646
def test_change_imp_func_pass(self):
4747
"""Test _change_imp_func"""
48-
meas = MeasureSet()
49-
meas.read_mat(ENT_TEST_MAT)
48+
meas = MeasureSet.from_mat(ENT_TEST_MAT)
5049
act_1 = meas.get_measure(name='Mangroves')[0]
5150

5251
imp_set = ImpactFuncSet()
@@ -76,17 +75,15 @@ def test_change_imp_func_pass(self):
7675

7776
def test_cutoff_hazard_pass(self):
7877
"""Test _cutoff_hazard_damage"""
79-
meas = MeasureSet()
80-
meas.read_mat(ENT_TEST_MAT)
78+
meas = MeasureSet.from_mat(ENT_TEST_MAT)
8179
act_1 = meas.get_measure(name='Seawall')[0]
8280

8381
haz = Hazard.from_mat(HAZ_TEST_MAT)
8482
exp = Exposures.from_mat(ENT_TEST_MAT)
8583
exp.gdf.rename(columns={'impf': 'impf_TC'}, inplace=True)
8684
exp.check()
8785

88-
imp_set = ImpactFuncSet()
89-
imp_set.read_mat(ENT_TEST_MAT)
86+
imp_set = ImpactFuncSet.from_mat(ENT_TEST_MAT)
9087

9188
new_haz = act_1._cutoff_hazard_damage(exp, imp_set, haz)
9289

@@ -110,8 +107,7 @@ def test_cutoff_hazard_pass(self):
110107

111108
def test_cutoff_hazard_region_pass(self):
112109
"""Test _cutoff_hazard_damage in specific region"""
113-
meas = MeasureSet()
114-
meas.read_mat(ENT_TEST_MAT)
110+
meas = MeasureSet.from_mat(ENT_TEST_MAT)
115111
act_1 = meas.get_measure(name='Seawall')[0]
116112
act_1.exp_region_id = [1]
117113

@@ -121,8 +117,7 @@ def test_cutoff_hazard_region_pass(self):
121117
exp.gdf.region_id.values[10:] = 1
122118
exp.check()
123119

124-
imp_set = ImpactFuncSet()
125-
imp_set.read_mat(ENT_TEST_MAT)
120+
imp_set = ImpactFuncSet.from_mat(ENT_TEST_MAT)
126121

127122
new_haz = act_1._cutoff_hazard_damage(exp, imp_set, haz)
128123

@@ -255,8 +250,7 @@ def test_filter_exposures_pass(self):
255250
exp.gdf.region_id[0] = 4
256251
exp.check()
257252

258-
imp_set = ImpactFuncSet()
259-
imp_set.read_mat(ENT_TEST_MAT)
253+
imp_set = ImpactFuncSet.from_mat(ENT_TEST_MAT)
260254

261255
haz = Hazard.from_mat(HAZ_TEST_MAT)
262256
exp.assign_centroids(haz)
@@ -343,8 +337,7 @@ def test_apply_ref_pass(self):
343337
"""Test apply method: apply all measures but insurance"""
344338
hazard = Hazard.from_mat(HAZ_TEST_MAT)
345339

346-
entity = Entity()
347-
entity.read_mat(ENT_TEST_MAT)
340+
entity = Entity.from_mat(ENT_TEST_MAT)
348341
entity.measures._data['TC'] = entity.measures._data.pop('XX')
349342
for meas in entity.measures.get_measure('TC'):
350343
meas.haz_type = 'TC'
@@ -380,8 +373,7 @@ def test_calc_impact_pass(self):
380373

381374
hazard = Hazard.from_mat(HAZ_TEST_MAT)
382375

383-
entity = Entity()
384-
entity.read_mat(ENT_TEST_MAT)
376+
entity = Entity.from_mat(ENT_TEST_MAT)
385377
entity.exposures.gdf.rename(columns={'impf': 'impf_TC'}, inplace=True)
386378
entity.measures._data['TC'] = entity.measures._data.pop('XX')
387379
entity.measures.get_measure(name='Mangroves', haz_type='TC').haz_type = 'TC'
@@ -418,8 +410,7 @@ def test_calc_impact_transf_pass(self):
418410

419411
hazard = Hazard.from_mat(HAZ_TEST_MAT)
420412

421-
entity = Entity()
422-
entity.read_mat(ENT_TEST_MAT)
413+
entity = Entity.from_mat(ENT_TEST_MAT)
423414
entity.exposures.gdf.rename(columns={'impf': 'impf_TC'}, inplace=True)
424415
entity.measures._data['TC'] = entity.measures._data.pop('XX')
425416
for meas in entity.measures.get_measure('TC'):

‎climada/entity/test/test_entity.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ def test_default_pass(self):
5555
self.assertTrue(isinstance(def_entity.impact_funcs, ImpactFuncSet))
5656
self.assertTrue(isinstance(def_entity.measures, MeasureSet))
5757

58-
def test_read_mat(self):
58+
def test_from_mat(self):
5959
"""Read entity from mat file produced by climada."""
6060
entity_mat = Entity.from_mat(ENT_TEST_MAT)
6161
self.assertEqual(entity_mat.exposures.tag.file_name, str(ENT_TEST_MAT))
6262
self.assertEqual(entity_mat.disc_rates.tag.file_name, str(ENT_TEST_MAT))
6363
self.assertEqual(entity_mat.measures.tag.file_name, str(ENT_TEST_MAT))
6464
self.assertEqual(entity_mat.impact_funcs.tag.file_name, str(ENT_TEST_MAT))
6565

66-
def test_read_excel(self):
66+
def test_from_excel(self):
6767
"""Read entity from an xls file following the template."""
6868
entity_xls = Entity.from_excel(ENT_TEMPLATE_XLS)
6969
self.assertEqual(entity_xls.exposures.tag.file_name, str(ENT_TEMPLATE_XLS))

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL