Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upConversation
lcnature
requested a review
from
TuKo
May 4, 2018
This comment has been minimized.
This comment has been minimized.
|
Jenkins, retest this please. |
This comment has been minimized.
This comment has been minimized.
|
@CameronTEllis, the Jenkins Linux failure is unrelated. I am working on it. We need tests for the new code. |
CameronTEllis
added some commits
May 4, 2018
TuKo
requested changes
May 4, 2018
Hi Cameron,
The PR looks good.
Please pay attention to the for-loops that need to be removed.
| ---------- | ||
| X : 2D array, shape=[voxels, timepoints] | ||
| The fMRI data of the new subject. |
This comment has been minimized.
This comment has been minimized.
TuKo
May 4, 2018
Contributor
Please add that should be under the same stimuli as the original subjects.
| raise ValueError("The number of timepoints(TRs) does not match the" | ||
| "one in the model.") | ||
| for i in range(self.n_iter): |
This comment has been minimized.
This comment has been minimized.
| raise ValueError("The number of timepoints(TRs) does not match the" | ||
| "one in the model.") | ||
| for i in range(self.n_iter): |
This comment has been minimized.
This comment has been minimized.
TuKo
May 4, 2018
Contributor
There is no need for a for-loop here. You should call the function once.
| @@ -98,7 +98,14 @@ def test_can_instantiate(): | ||
| "Invalid computation of SRM! (wrong # features after transform)") | ||
| assert new_s[subject].shape[1] == samples, ( | ||
| "Invalid computation of SRM! (wrong # samples after transform)") | ||
This comment has been minimized.
This comment has been minimized.
TuKo
May 4, 2018
Contributor
Let's add this as part of a new test.
Add a new test function that creates the object and tries to add the new subject
CameronTEllis
added some commits
May 4, 2018
TuKo
requested changes
May 7, 2018
@CameronTEllis thanks for the changes. Please add the missing lines to the test and that is for sure good enough. Thanks!
| X.append(Q.dot(S) + 0.1*np.random.random((voxels, samples))) | ||
| # Check that runs with 2 subject | ||
| s.fit(X) |
This comment has been minimized.
This comment has been minimized.
TuKo
May 7, 2018
Contributor
You should test that it does not succeed when the model is not computed before you call fit()
This comment has been minimized.
This comment has been minimized.
|
|
This comment has been minimized.
This comment has been minimized.
|
@CameronTEllis, you can merge this yourself after you get the tests to pass. |
CameronTEllis
added some commits
May 11, 2018
This comment has been minimized.
This comment has been minimized.
|
Jenkins, retest this please. |
This comment has been minimized.
This comment has been minimized.
|
@CameronTEllis, unfortunately, Travis does not respond to that command. Can you please login to Travis and check if you can restart the build? (I am trying to determine if Travis understands GitHub permissions for teams, but I couldn't find an answer yet.) |
This comment has been minimized.
This comment has been minimized.
|
@CameronTEllis, to cover lines 403 and 777, you should call Also, it seems to me you have the right and were able to rerun the build on Travis. Can you please confirm? |
This comment has been minimized.
This comment has been minimized.
|
@mihaic Aha thank you for that catch. Hopefully that will fix it. And yes I was able to make an account and rebuild travis thank you |
This comment has been minimized.
This comment has been minimized.
|
Great, looking good. Unfortunately I still don't have write access to this repo and can't merge the pull request. |
This comment has been minimized.
This comment has been minimized.
|
My bad. Please try again. And when you write the merge message, have a look at the style of commit messages we use: |
CameronTEllis commentedMay 4, 2018
Added code based on what is in rsrm to allow for transformation of new participant data without changing the shared response s