Merge pull request #391 from cmu-delphi/add-exceptions

Add specific exceptions to bare excepts

Author: krivard

changehc/delphi_changehc/weekday.py

@@ -7,6 +7,7 @@
 # third party
 import cvxpy as cp
 import numpy as np
+from cvxpy.error import SolverError
 
 # first party
 from .config import Config
@@ -83,7 +84,7 @@ def get_params(data):
         try:
             prob = cp.Problem(cp.Minimize(-ll + lmbda * penalty))
             _ = prob.solve()
-        except:
+        except SolverError:
             # If the magnitude of the objective function is too large, an error is
             # thrown; Rescale the objective function
             prob = cp.Problem(cp.Minimize((-ll + lmbda * penalty) / 1e5))

claims_hosp/delphi_claims_hosp/weekday.py

@@ -7,6 +7,7 @@
 # third party
 import cvxpy as cp
 import numpy as np
+from cvxpy.error import SolverError
 
 # first party
 from .config import Config
@@ -83,7 +84,7 @@ def get_params(data):
         try:
             prob = cp.Problem(cp.Minimize(-ll + lmbda * penalty))
             _ = prob.solve()
-        except:
+        except SolverError:
             # If the magnitude of the objective function is too large, an error is
             # thrown; Rescale the objective function
             prob = cp.Problem(cp.Minimize((-ll + lmbda * penalty) / 1e5))

emr_hosp/delphi_emr_hosp/weekday.py

@@ -7,6 +7,7 @@
 # third party
 import cvxpy as cp
 import numpy as np
+from cvxpy.error import SolverError
 
 # first party
 from .config import Config
@@ -83,7 +84,7 @@ def get_params(data):
         try:
             prob = cp.Problem(cp.Minimize(-ll + lmbda * penalty))
             _ = prob.solve()
-        except:
+        except SolverError:
             # If the magnitude of the objective function is too large, an error is
             # thrown; Rescale the objective function
             prob = cp.Problem(cp.Minimize((-ll + lmbda * penalty) / 1e5))