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
IVIM #1058
Merged
Merged
IVIM #1058
Changes from all commits
Commits
Show all changes
96 commits
Select commit
Hold shift + click to select a range
11b2700
Initial ivim simulations and tests
951c19f
fixes for tests
5e19275
testing with Federau values
b8570fb
initial guess added
49eaad3
Removed redundant imports
449f119
Added guess parameters as keyword to fit method
1ce3c3d
Added tests for multivoxel fit and guess
c955cab
pass S0 to multi_tensor
834c2da
Replaced nlls with leastsq, en route to two stage fit
00a485d
fixed import error
0cae14b
minimize as the fit function
3f23734
Added bounds and other params for fit
f7e7823
leastsq is back
f51b297
Added tolerances for minimize
02c3f2c
Implemented two stage fitting
d65b1f8
Tests for two stage, optimize omitted
41820ac
Generate b vectors using disperse_charges
4bac6e9
Fetcher for ivim data, needs md5
ae90bd1
x0 should be flattened
quantshah 927e981
Added read_ivim to __init__
quantshah 762c34e
Example for the ivim module
quantshah bd59df4
Use dipy.core.optimize for optimization
quantshah fc44889
added f guess
quantshah 27bb444
Some edits to test parameters
quantshah f8a89a4
f_guess = 1 - S/S_
quantshah c74ad47
Resolved conflict in generate_bvecs
78ba6ff
One stage fitting works with optimize
84d302d
Error function returns only residual, sq in minimize
38f4bf0
D* guess is 10 timens D, added S0 estimation from dti
230ce3e
Added predict and test for predict
5437825
Guess f using DTI
de22db5
Tests for two stage
a431db3
f guess update
f6a9574
pep-8 for predict
quantshah fe0c406
Merge branch 'master' of https://github.com/nipy/dipy into ivim_dev
quantshah 93ba045
Upper bound for S0 is not 1
quantshah 61e4ac5
Use generate_bvecs from gradients
quantshah 4826103
Flatten x0 and add guess for S0 as S(b=0)
quantshah 7951e6b
S0 values according to real data
quantshah 7885c7f
Separate func for D_guess
quantshah 7bae1a4
Changed test parameters
quantshah d1c933b
Added maxiter for scipy version less than 0.12
quantshah e08d62f
Updated fetcher init for better coverage
quantshah 4a9c1a5
jac keyword argument should be None
quantshah 0407072
Added Jacobian
quantshah 8118407
Corrected the -ve sign in derv
quantshah f581f3e
Added the test with Jacobian
quantshah 2c8f244
Updated examples, using two_stage and gray colormap
quantshah d56e525
Updating documentation
quantshah 200162e
Added options keyword
quantshah ebea630
Pre allocation of result array
quantshah a352e9a
Added fit statistics
quantshah a9f88e7
Changed fitting algorithm
quantshah 40e5974
Removed minimize, improved Jacobian and two-stage guess
quantshah 24f6240
Relative import to absolute
quantshah 93fd782
S0 normalization added
quantshah 655b3d4
Updated doc for test and removed unnecesary func in test
quantshah 88a8464
One parameter for all and doc updates
quantshah 7f9ddea
Updated example
quantshah a2be743
Added basic Jacobian test and fixed pep8
quantshah 295dd88
least_squares for scipy==0.17
quantshah 3d56fe6
Updated the Jacobian
quantshah ebba0f2
All initializations in IvimModel, updated examples
quantshah 89efc60
Optimized the Jacobian function
quantshah af11496
Bounds for Scipy 0.17, test and example updated
quantshah 6202f99
Refactoring of checks in init and more tests
quantshah 8af6ef7
Pre initialize Jacbian array, lower thresholds
quantshah 4d8b760
Documentation updates
quantshah 3babc2c
Removed Jac, one stage, updated docs and example
quantshah 89c39ae
bounds on f
quantshah 00c0201
Major refactoring, used multi_voxel decorator, updated tests
quantshah 4fe12ef
Moved all fitting in one class under fit
quantshah 283d166
Tests for S0=1000
quantshah f28c609
Polishing final documentation
quantshah 98af7b7
docstring of IvimModel init updated
quantshah ac34b78
Removed x0. Estimated by 'estimate_x0'
quantshah 3e34b1c
Check unfeasible x0 values
quantshah fbff13a
Updated example and documentation
quantshah 0d2fb35
Removed execution of fetcher in docstring for test_bounds
quantshah a78e9d9
Added sphinx code directive
quantshah 31a784b
pep8 fixes
quantshah 625b6a8
Added test statement for mask and bounds
quantshah 80efaab
Added tests for predict, check_bounds and get_item
quantshah 7d014d6
Test for get_item and shape
quantshah 3f99e3f
Changed ivim function to predict with gtab as parameter.
quantshah 5da4913
Interpolation set to None
quantshah 2f9134d
replaced data[0] with mean of data[b0_mask]
quantshah 295f987
Added functions for getting individual parameters
quantshah d38feca
Updated examples
quantshah ca13dee
removed unnecessary import
quantshah d21d90f
Updated example
quantshah 3f2bdb3
Faster tests: Defined global fits
quantshah a6441b2
Estimate x0 using linear log fit
quantshah 84cce70
Added test for multiple b0 signals
quantshah 6913b8e
Added check and test for no b0 case
quantshah e07a989
Set interpolation to nearest for better visualization
quantshah File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe add to the doc "Download IVIM dataset consisting of an image, bvalue and bvector files"? Not sure how specific @arokem wants these to be tho.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add the data_size as input?