adjust tests and pylint clean-up

adjust tests and pylint clean-up

Author: samluethi

climada/entity/impact_funcs/base.py

@@ -96,7 +96,7 @@ def plot(self, axis=None, **kwargs):
         axis.set_xlim((self.intensity.min(), self.intensity.max()))
         axis.legend()
         return axis
-    
+
     def check(self):
         """Check consistent instance data.
 
@@ -129,14 +129,14 @@ def check(self):
 
     def set_step_impf(self, intensity, mdd=(0, 1), paa=(1, 1), impf_id=1):
 
-        """ Step function type impact function. 
-        
+        """ Step function type impact function.
+
         By default, everything is destroyed above the step.
         Useful for high resolution modelling.
-        
+
         This method modifies self (climada.entity.impact_funcs instance)
         by assigning an id, intensity, mdd and paa to the impact function.
-        
+
         Parameters
         ----------
         intensity: tuple(float, float, float)
@@ -160,11 +160,11 @@ def set_step_impf(self, intensity, mdd=(0, 1), paa=(1, 1), impf_id=1):
 
     def set_sigmoid_impf(self, intensity, L, k, x0, if_id=1):
 
-        """ Sigmoid type impact function hinging on three parameter. 
-        
-        This type of impact function is very flexible for any sort of study, 
+        """ Sigmoid type impact function hinging on three parameter.
+
+        This type of impact function is very flexible for any sort of study,
         hazard and resolution. The sigmoid is defined as:
-        
+
         .. math::
             f(x) = \frac{L}{1+exp^{-k(x-x0)}}
 

climada/entity/impact_funcs/test/test_base.py

@@ -35,19 +35,21 @@ def test_calc_mdr_pass(self):
         imp_fun.mdd = np.arange(0, 1, 0.1)
         new_inten = 17.2
         self.assertEqual(imp_fun.calc_mdr(new_inten), 0.029583999999999996)
-        
+
     def test_set_step(self):
         """Check default impact function: step function"""
+        inten = (0, 5, 10)
         imp_fun = ImpactFunc()
-        imp_fun.set_step_ImpF(5, 0, 10)
+        imp_fun.set_step_impf(inten)
         self.assertTrue(np.array_equal(imp_fun.paa, np.ones(4)))
         self.assertTrue(np.array_equal(imp_fun.mdd, np.array([0, 0, 1, 1])))
         self.assertTrue(np.array_equal(imp_fun.intensity, np.array([0, 5, 5, 10])))
 
     def test_set_sigmoid(self):
         """Check default impact function: sigmoid function"""
+        inten = (0, 100, 5)
         imp_fun = ImpactFunc()
-        imp_fun.set_sigmoid_ImpF(50., 2., 1.0, 0, 100)
+        imp_fun.set_sigmoid_impf(inten, L=1.0, k=2., x0=50.)
         self.assertTrue(np.array_equal(imp_fun.paa, np.ones(20)))
         self.assertEqual(imp_fun.mdd[10], 0.5)
         self.assertEqual(imp_fun.mdd[-1], 1.0)
@@ -57,3 +59,6 @@ def test_set_sigmoid(self):
 if __name__ == "__main__":
     TESTS = unittest.TestLoader().loadTestsFromTestCase(TestInterpolation)
     unittest.TextTestRunner(verbosity=2).run(TESTS)
+
+
+