Skip to content

Commit

Permalink
Updates to documentation location (readthedocs.io) and new version
Browse files Browse the repository at this point in the history
  • Loading branch information
wade committed Apr 4, 2019
1 parent e32c5c8 commit 574668c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
29 changes: 13 additions & 16 deletions HydroErr/HydroErr.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def mae(simulated_array, observed_array, replace_nan=None, replace_inf=None,
.. image:: /pictures/MAE.png
**Range:** 0 ≤ MAE < inf, data units, smaller is better, does not indicate bias.
**Range:** 0 ≤ MAE < inf, data units, smaller is better.
**Notes:** The ME measures the absolute difference between the simulated data and the observed
data. For the mean abolute error, a smaller number indicates a better fit to the original data.
Expand Down Expand Up @@ -189,7 +189,7 @@ def mse(simulated_array, observed_array, replace_nan=None, replace_inf=None,
.. image:: /pictures/MSE.png
**Range:** 0 ≤ MSE < inf, data units squared, smaller is better, does not indicate bias.
**Range:** 0 ≤ MSE < inf, data units squared, smaller is better.
**Notes:** Random errors do not cancel, highlights larger errors, also referred to as a
squared L2-norm.
Expand Down Expand Up @@ -264,9 +264,9 @@ def mle(simulated_array, observed_array, replace_nan=None, replace_inf=None,
.. image:: /pictures/MLE.png
**Range:** -inf < MLE < inf, data units, closer to zero is better, indicates bias.
**Range:** -inf < MLE < inf, data units, closer to zero is better.
**Notes** Same as ME only use log ratios as the error term. Limits the impact of outliers, more
**Notes** Same as the mean erro (ME) only use log ratios as the error term. Limits the impact of outliers, more
evenly weights high and low data values.
Parameters
Expand Down Expand Up @@ -344,7 +344,7 @@ def male(simulated_array, observed_array, replace_nan=None, replace_inf=None,
.. image:: /pictures/MALE.png
**Range:** 0 ≤ MALE < inf, data units squared, smaller is better, does not indicate bias.
**Range:** 0 ≤ MALE < inf, data units squared, smaller is better.
**Notes** Same as MAE only use log ratios as the error term. Limits the impact of outliers,
more evenly weights high and low flows.
Expand Down Expand Up @@ -424,7 +424,7 @@ def msle(simulated_array, observed_array, replace_nan=None, replace_inf=None,
.. image:: /pictures/MSLE.png
**Range:** 0 ≤ MSLE < inf, data units squared, smaller is better, does not indicate bias.
**Range:** 0 ≤ MSLE < inf, data units squared, smaller is better.
**Notes** Same as the mean squared error (MSE) only use log ratios as the error term. Limits
the impact of outliers, more evenly weights high and low values.
Expand Down Expand Up @@ -580,9 +580,8 @@ def mdae(simulated_array, observed_array, replace_nan=None, replace_inf=None,
**Range** 0 ≤ MdAE < inf, closer to zero is better.
**Notes** This metric does not indicates bias. Random errors (noise) do not cancel.
It is similar to the mean absolute error (MAE), only it takes the median rather than
the mean. Median measures reduces the impact of outliers.
**Notes** Random errors (noise) do not cancel. It is the same as the mean absolute error (MAE), only it takes the
median rather than the mean. Median measures reduces the impact of outliers.
Parameters
----------
Expand Down Expand Up @@ -655,9 +654,8 @@ def mdse(simulated_array, observed_array, replace_nan=None, replace_inf=None,
**Range** 0 ≤ MdSE < inf, closer to zero is better.
**Notes** This metric does not indicates bias. Random errors (noise) do not cancel.
It is similar to the mean squared error (MSE), only it takes the median rather than
the mean. Median measures reduces the impact of outliers.
**Notes** Random errors (noise) do not cancel. It is the same as the mean squared error (MSE), only it takes the
median rather than the mean. Median measures reduces the impact of outliers.
Parameters
----------
Expand Down Expand Up @@ -729,7 +727,7 @@ def ed(simulated_array, observed_array, replace_nan=None, replace_inf=None,
.. image:: /pictures/ED.png
**Range** 0 ≤ ED < inf, smaller is better.
**Notes** This metric does not indicate bias. It is also sometimes referred to as the L2-norm.
**Notes** Also sometimes referred to as the L2-norm.
Parameters
----------
Expand Down Expand Up @@ -806,8 +804,7 @@ def ned(simulated_array, observed_array, replace_nan=None, replace_inf=None,
**Range** 0 ≤ NED < inf, smaller is better.
**Notes** This metric does not indicate bias. It is also sometimes referred to as the squared
L2-norm.
**Notes** Also sometimes referred to as the squared L2-norm.
Parameters
----------
Expand Down Expand Up @@ -966,7 +963,7 @@ def rmsle(simulated_array, observed_array, replace_nan=None, replace_inf=None,
**Range:** 0 ≤ RMSLE < inf. Smaller is better, and it does not indicate bias.
**Notes:** Random errors do not cancel while using this metric. This metric also limits the
**Notes:** Random errors do not cancel while using this metric. This metric limits the
impact of outliers by more evenly weighting high and low values. To calculate the log values,
each value in the observed and simulated array is increased by one unit in order to avoid
run-time errors and nan values (function np.log1p).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Goodness of fit metrics for use in comparison studies, specifically for use in the field of hydrology

- **Documentation:** https://BYU-Hydroinformatics.github.io/HydroErr/
- **Documentation:** https://hydroerr.readthedocs.io/en/stable/
- **Source:** https://github.com/BYU-Hydroinformatics/HydroErr
- **Bug reports:** https://github.com/BYU-Hydroinformatics/HydroErr/issues

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
author = 'Wade Roberts, Gustavious Williams'

# The short X.Y version
version = '1.22'
version = '1.23'
# The full version, including alpha/beta/rc tags
release = ''

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
setup(
name='HydroErr',
packages=['HydroErr'],
version='1.22',
version='1.23',
description='Goodness of fit metrics for use in comparison studies, specifically for use in the field '
'of hydrology',
long_description=long_description,
long_description_content_type='text/markdown',
author='Wade Roberts',
author_email='[email protected]',
url='https://github.com/waderoberts123/HydroErr',
download_url='https://github.com/waderoberts123/Hydrostats/archive/1.22.tar.gz',
keywords=['hydrology', 'error', 'metrics', 'comparison', 'statistics', 'forecast', 'observed'],
classifiers=["Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.5",
Expand Down

0 comments on commit 574668c

Please sign in to comment.