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.

Sign up for GitHub

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

Jump to bottom

Xval #335

Merged
merged 47 commits into from Jul 2, 2014
Merged

Xval #335

merged 47 commits into from Jul 2, 2014

Commits on Jun 25, 2014

  1. WIP: Started implementing cross-validation from model predictions.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    6d290f1 View commit details
    Browse the repository at this point in the history

  2. ENH: A bit more work on cross-validation.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    134e7cd View commit details
    Browse the repository at this point in the history

  3. BF: The order of the output needs to be like the order of the data... 

    Also: some more flexibility on the model API that is accepted.
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    eb0dd61 View commit details
    Browse the repository at this point in the history

  4. PEP8 

    Before I start mucking about here.
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    460e7fe View commit details
    Browse the repository at this point in the history

  5. PEP8

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    eda3ebb View commit details
    Browse the repository at this point in the history

  6. PEP8

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    96bf19f View commit details
    Browse the repository at this point in the history

  7. BF: Predict properly, by separating b0s and diffusion-weighted samples.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    d9105d5 View commit details
    Browse the repository at this point in the history

  8. WIP: Work towards xval prediction in csdeconv.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    88c73bb View commit details
    Browse the repository at this point in the history

  9. DOC: optional arguments and their default values.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    3b42633 View commit details
    Browse the repository at this point in the history

  10. RF: Make this part of the reconst module, instead of its own thing.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    687338e View commit details
    Browse the repository at this point in the history

  11. RF + TST: Predict the signal from CSD model, check with kfold xval.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    126d1e8 View commit details
    Browse the repository at this point in the history

  12. TST + DOC: Fixed test for csd xval, added reference for xvalidation o… 

    …n DWI.
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    35c51f4 View commit details
    Browse the repository at this point in the history

  13. RF: Removed some cruft. 

    This is related to prediction of DKI, which I leave for some other day.
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    d290c80 View commit details
    Browse the repository at this point in the history

  14. PY3K

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    d4156e4 View commit details
    Browse the repository at this point in the history

  15. TST: as long as it runs...

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    e812396 View commit details
    Browse the repository at this point in the history

  16. Minor: this test is DTI-specific.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    49c247e View commit details
    Browse the repository at this point in the history

  17. ENH: Generalize kfold xval to multi-voxel CSD.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    061d33e View commit details
    Browse the repository at this point in the history

  18. Small one: PEP8.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    9a8b82e View commit details
    Browse the repository at this point in the history

  19. TST: Adding a test for informative error with models that don't have … 

    …`predict`
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    23dddee View commit details
    Browse the repository at this point in the history

  20. TST: Implementation of error raising for models with no predict.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    2adcc40 View commit details
    Browse the repository at this point in the history

  21. RF: Kick the predict method up one level to SHM.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    279c7ce View commit details
    Browse the repository at this point in the history

  22. Reverted some overkill in reduced importing.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    312e436 View commit details
    Browse the repository at this point in the history

  23. RF: Added a fall-back default response function for SH-based models. 

    This is so that models other than CSD can also be x-validated.
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    7c90de6 View commit details
    Browse the repository at this point in the history

  24. RF: Pulled out the prediction from the TensorFit. 

    Now it can be used by either the Fit or the Model objects (which is the next
thing).
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    abd1638 View commit details
    Browse the repository at this point in the history

  25. NF: Implement and test the TensorModel predict method.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    ff29642 View commit details
    Browse the repository at this point in the history

  26. TST: A bit more test coverage.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    baea0bd View commit details
    Browse the repository at this point in the history

  27. RF: Reimplement prediction for the Fit model of csdeconv. 

    In the process, I also reorganized the csdeconv module, to put function
definitions at the top, and moved a couple of functions into the shm
module. This should not have too much of an ill effect, I'd think.
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    25cae70 View commit details
    Browse the repository at this point in the history

  28. RF : move the response estimation back to csdeconv. 

    Also : seems like the normalization of the prediction matrix by the response
function S0 is a way to normalize the prediction so that this now works rather
nicely. Backed off of making this work for ODF models with no `R`.
    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    2418097 View commit details
    Browse the repository at this point in the history

  29. RF: Some simplifications. Thanks @MrBago!

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    db24b80 View commit details
    Browse the repository at this point in the history

  30. White space.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    e93336b View commit details
    Browse the repository at this point in the history

  31. White space.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    80c2598 View commit details
    Browse the repository at this point in the history

  32. DOC: First pass of an example of kfold cross-validation.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    be5897c View commit details
    Browse the repository at this point in the history

  33. DOC: Cross-validation example.

    @arokem
    arokem committed Jun 25, 2014
    Copy the full SHA
    0995e69 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2014

  1. DOC: Return values of csd_predict.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    da5683e View commit details
    Browse the repository at this point in the history

  2. DOC: inline with mathdollar.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    a86ac3c View commit details
    Browse the repository at this point in the history

  3. DOC: full stop.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    136bc03 View commit details
    Browse the repository at this point in the history

  4. RF: Better to use an explicit test.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    3467cc9 View commit details
    Browse the repository at this point in the history

  5. DOC: Clarify.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    a17ad90 View commit details
    Browse the repository at this point in the history

  6. DOC: Clarify.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    341a79f View commit details
    Browse the repository at this point in the history

  7. DOC: Explicitly state the dimensions of the SH representation.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    2edf7bf View commit details
    Browse the repository at this point in the history

  8. DOC: back-ticks n' stuff.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    774885f View commit details
    Browse the repository at this point in the history

  9. DOC: Descriptions of input parameters.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    54e02d2 View commit details
    Browse the repository at this point in the history

  10. DOC + RF: Variable descriptions, names. A few changes in example.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    628d292 View commit details
    Browse the repository at this point in the history

  11. RF: Changed the name of this module to be clearer.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    24b9242 View commit details
    Browse the repository at this point in the history

  12. DOC: Clarification.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    73697d8 View commit details
    Browse the repository at this point in the history

  13. TST: Added roundtrip testing of CSD prediction API.

    @arokem
    arokem committed Jun 27, 2014
    Copy the full SHA
    a05799f View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2014

  1. RF: Moved the class definitions back to the top of the file.

    @arokem
    arokem committed Jul 2, 2014
    Copy the full SHA
    5c6bb90 View commit details
    Browse the repository at this point in the history