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

[MRG] ReNA_mrg #1983

Merged
merged 63 commits into from
May 14, 2019
Merged

[MRG] ReNA_mrg #1983

merged 63 commits into from
May 14, 2019

Conversation

ja-che
Copy link
Contributor

@ja-che ja-che commented Apr 15, 2019

Continue #1336

@ja-che
Copy link
Contributor Author

ja-che commented Apr 15, 2019

#1336 (comment)

@ja-che
Copy link
Contributor Author

ja-che commented Apr 16, 2019

Hello,

@GaelVaroquaux or @bthirion
I would need a review on that, please.
Should we move ReNA in another module folder ?

Thanks

@GaelVaroquaux
Copy link
Member

Can you add ReNA to the end of examples/03_connectivity/plot_rest_parcellations.py as use this as the sole example for ReNA.

https://4066-1235740-gh.circle-artifacts.com/0/home/circleci/project/doc/_build/html/auto_examples/03_connectivity/plot_rest_parcellations.html#sphx-glr-auto-examples-03-connectivity-plot-rest-parcellations-py

@GaelVaroquaux
Copy link
Member

I left a bunch of comments, but this is all I have. Thanks!

@GaelVaroquaux
Copy link
Member

GaelVaroquaux commented May 2, 2019 via email

@kchawla-pi
Copy link
Collaborator

kchawla-pi commented May 2, 2019 via email

@ja-che
Copy link
Contributor Author

ja-che commented May 2, 2019

No to me, "tolerance" is the good nomenclature when optimizing something, here it is a precision parameter:

# Dealing with eccentricities, there are probably many neares neighbors
edge_mask = connectivity_.data > 1 - threshold

and

weights_ = np.maximum(threshold, weights_)

@kchawla-pi
Copy link
Collaborator

kchawla-pi commented May 2, 2019 via email

@kchawla-pi
Copy link
Collaborator

kchawla-pi commented May 2, 2019 via email

@GaelVaroquaux
Copy link
Member

GaelVaroquaux commented May 2, 2019 via email

@kchawla-pi
Copy link
Collaborator

kchawla-pi commented May 2, 2019 via email

@GaelVaroquaux
Copy link
Member

GaelVaroquaux commented May 2, 2019 via email

@ja-che
Copy link
Contributor Author

ja-che commented May 3, 2019

@kchawla-pi
I don't get that one:

Warning, treated as error:
/home/circleci/project/nilearn/regions/parcellations.py:docstring of nilearn.regions.Parcellations:117:Unknown target name: "labels_img".

@ja-che
Copy link
Contributor Author

ja-che commented May 6, 2019

@kchawla-pi
After rebuilding the error is different but still weird

@kchawla-pi
Copy link
Collaborator

I don't have a system at hand. Will look at it once I return, if it is still a problem.

@ja-che
Copy link
Contributor Author

ja-che commented May 7, 2019

@GaelVaroquaux @bthirion @kchawla-pi
All lights are green, all comments are adressed, merge ?

@kchawla-pi
Copy link
Collaborator

@GaelVaroquaux I will give this one more glance but at this point it should be good to go. You have anything more to say?

@kchawla-pi kchawla-pi merged commit 51fa5a6 into nilearn:master May 14, 2019
@GaelVaroquaux
Copy link
Member

Great! Congratulations!!

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.

6 participants