Skip to content

Commit

Permalink
Update to exception handling
Browse files Browse the repository at this point in the history
  • Loading branch information
tjkessler authored Jun 9, 2018
1 parent f1c0d4e commit 256c321
Showing 1 changed file with 5 additions and 16 deletions.
21 changes: 5 additions & 16 deletions ecnet/error_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ def calc_rmse(y_hat, y):
try:
return(np.sqrt(((np.asarray(y_hat)-np.asarray(y))**2).mean()))
except:
print("Error in calculating RMSE. Check input data format.")
raise
sys.exit()
raise ValueError("Error in calculating RMSE. Check input data format.")

# Calculates the mean average error between two arguments of equal length
def calc_mean_abs_error(y_hat, y):
Expand All @@ -31,9 +29,7 @@ def calc_mean_abs_error(y_hat, y):
try:
return(abs(np.asarray(y_hat)-np.asarray(y)).mean())
except:
print("Error in calculating mean average error. Check input data format.")
raise
sys.exit()
raise ValueError("Error in calculating mean average error. Check input data format.")

# Calculates the median absoltute error between two arguments of equal length
def calc_med_abs_error(y_hat, y):
Expand All @@ -43,10 +39,7 @@ def calc_med_abs_error(y_hat, y):
try:
return(np.median(np.absolute(np.asarray(y_hat)-np.asarray(y))))
except:
return("Error in calculating median absolute error. Check input data format.")
raise
sys.exit()

raise ValueError("Error in calculating median absolute error. Check input data format.")

# Calculates the correlation of determination, or r-squared value, between two arguments of equal length
def calc_r2(y_hat, y):
Expand All @@ -59,9 +52,7 @@ def calc_r2(y_hat, y):
y_form.append(y[i][0])
y_mean = sum(y_form)/len(y_form)
except:
print("Error in calculating r-squared. Check input data format.")
raise
sys.exit()
raise ValueError("Error in calculating r-squared. Check input data format.")
try:
s_res = np.sum((y_hat-y)**2)
s_tot = np.sum((y-y_mean)**2)
Expand All @@ -72,6 +63,4 @@ def calc_r2(y_hat, y):
s_tot = np.sum((np.asarray(y)-y_mean)**2)
return(1 - (s_res/s_tot))
except:
print("Error in calculating r-squared. Check input data format.")
raise
sys.exit()
raise ValueError("Error in calculating r-squared. Check input data format.")

0 comments on commit 256c321

Please sign in to comment.