Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The changes proposed by Jan Benda have been edited #31

Merged
merged 15 commits into from
Jun 21, 2016

Conversation

tillraab
Copy link

I removed some for loops that have not been necessary. Furthermore the plot functions had been removed from the main functions of the modules in several cases. And the loops now work with range() instead of np.arange() for better performance.

Till Raab added 5 commits June 13, 2016 09:51
…alysis) the funcion is included in the main fundtion as plot_data_func. Furthermore the loops now work with range() instead of np.arange()
…ment for fresolution. Furthermore the dcumentation has been edited.
@coveralls
Copy link

Coverage Status

Coverage increased (+0.07%) to 13.392% when pulling df601c4 on tillraab:eodanalysis into 9e6156a on bendalab:master.

Till Raab added 2 commits June 20, 2016 13:14
…tead of lists). Furthermore the extract_fundamentals function now can extract the fundamentals from single fishlists or multiple fishlists in a list. The documentation has also been edited.
if np.sum(np.abs(fundamentals[list] - fundamental) < df_th) > 0:
consistency_help[enu] += 1

index = np.arange(len(fundamentals[0]))[consistency_help == len(fundamentals)]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is what the numpy.nonzero function does

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. numpy.nonzero gives back the indices where the array is not zero. Here we are looking for the indices where value is the same as the number of given fishlists.

Till Raab added 6 commits June 21, 2016 11:08
…he threshold also used by Juan in the ckeckfishtype modul. Furthermore some code parts have been made smoother. Documentaion has also been edited.
…tentfishes modul to the harmoni groups modul.
…ndamental_freqs function has been movved there.
… the noverlap for the numpy.psd function is calculated.
@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 13.414% when pulling 09f8420 on tillraab:eodanalysis into 9e6156a on bendalab:master.

@jfsehuanes jfsehuanes merged commit 95016d7 into bendalab:master Jun 21, 2016
@tillraab tillraab deleted the eodanalysis branch July 11, 2016 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants