Commit 312ebb62 authored by Alex Nunes's avatar Alex Nunes

Merge branch 'hotfix' into 'master'

Hotfix for REI normalization

See merge request otndc/resonate!31
parents 1002ab1b d90f01f5
......@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [1.0.6]
### Fixed
- Minor fix to ensure normailzation of REI
## [1.0.5]
......
package:
name: resonate
version: "1.0.5"
version: "1.0.6"
source:
git_rev: master
......
......@@ -76,9 +76,9 @@ copyright = u'2017 Ocean Tracking Network. All Rights Reserved.'
# built documents.
#
# The short X.Y version.
version = 'v1.0.5'
version = 'v1.0.6'
# The full version, including alpha/beta/rc tags.
release = 'v1.0.5'
release = 'v1.0.6'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -29,4 +29,3 @@ Or use the standard plotting function to save as HTML:
.. code:: python
abacus_plot(df, ipython_display=False, filename='example.html')
......@@ -59,4 +59,3 @@ you’d like to create a subset from.
# Output the subset data to a new CSV in the indicated directory
data_column_subset.to_csv(directory+column+"_"+value.replace(" ", "_")+"_"+filename, index=False)
......@@ -68,4 +68,3 @@ file to a desired location.
.. code:: python
interval.to_csv('/path/to/output.csv', index=False)
......@@ -15,16 +15,10 @@ project-specific designs to large-scale, multispecies, cooperative
networks <https://doi.org/10.1016/j.fishres.2018.09.015>`__. Each
receiver’s index is calculated on the formula of:
.. raw:: html
<div class="large-math">
REI =
:math:`\frac{T_r}{T_a} \times \frac{S_r}{S_a} \times \frac{DD_r}{DD_a} \times \frac{D_a}{D_r}`
.. raw:: html
.. container:: large-math
</div>
REI =
:math:`\frac{T_r}{T_a} \times \frac{S_r}{S_a} \times \frac{DD_r}{DD_a} \times \frac{D_a}{D_r}`
.. raw:: html
......
__author__ = "Alex Nunes"
__credits__ = ["Alex Nunes", "Jon Pye", "Brian Jones", "Marta Mihoff"]
__license__ = "GPL"
__version__ = "1.0.5"
__version__ = "1.0.6"
__maintainer__ = "Alex Nunes"
__email__ = "anunes@dal.ca"
__status__ = "Production"
......@@ -98,7 +98,7 @@ def REI(detections, deployments):
print("No valid deployment record for " + name)
# Normalize REIs to value from 0 to 1
# station_reis.rei = station_reis.rei / station_reis.rei.sum()
station_reis.rei = station_reis.rei / station_reis.rei.sum()
# Cleanup and return the station REI's
del deployments
......
......@@ -12,7 +12,7 @@ with open('LICENSE') as f:
setup(
name='resonATe',
version='1.0.5',
version='1.0.6',
description='resonate data analysis package',
long_description=readme,
author='Alex Nunes',
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment