Commit Graph

48 Commits

Author SHA1 Message Date
Juan Nunez-Iglesias 25d6c58674 Merge pull request #1087 from vighneshbirodkar/rag_draw
RAG drawing function
2014-08-18 10:05:58 -05:00
Vighnesh Birodkar 103f48bc00 Spelling error 2014-08-18 19:58:02 +05:30
Vighnesh Birodkar 12b1a91c70 remove self loops in rag 2014-08-18 18:42:23 +05:30
Vighnesh Birodkar 344e2a51c0 cast labels in ncut 2014-08-15 17:52:25 +05:30
Vighnesh Birodkar afa345f363 Update graph_cut.py 2014-08-14 23:47:00 +05:30
Vighnesh Birodkar ab60edcdf7 Fix Reference format 2014-08-10 20:31:22 +05:30
Vighnesh Birodkar 4a231cfd35 Minor changes 2014-08-10 20:07:34 +05:30
Vighnesh Birodkar 03d3873cc4 docstring of _label_all 2014-08-09 22:08:27 +05:30
Vighnesh Birodkar 3973b30300 docstring changes and code movement 2014-08-09 21:29:41 +05:30
Vighnesh Birodkar 6d0bf723d7 Docstring changes and typos 2014-08-08 23:16:38 +05:30
Vighnesh Birodkar 9371c4f0e7 Fixed potential import error 2014-08-06 22:38:18 +05:30
Vighnesh Birodkar 35c9746b74 comment 2014-08-06 02:48:03 +05:30
Vighnesh Birodkar 69fec94326 rag copy in threshold cut 2014-08-06 02:46:29 +05:30
Vighnesh Birodkar 452921d9f2 API changes, comments and docstrings 2014-08-06 02:44:33 +05:30
Vighnesh Birodkar 07cb79cd27 Cut cost is computed by Cython code 2014-08-05 23:35:32 +05:30
Vighnesh Birodkar 7e2f33cb11 Refer sections of paper in comments 2014-08-05 23:33:23 +05:30
Vighnesh Birodkar f261e51faa rename method to cut_normalized 2014-08-05 23:33:23 +05:30
Vighnesh Birodkar 6cc0cf4a88 use map_array instead of modifying graph 2014-08-05 23:33:23 +05:30
Vighnesh Birodkar 62f0909776 Remove unused except caluses 2014-08-05 23:33:23 +05:30
Vighnesh Birodkar fc9e8c4670 doc string correction 2014-08-05 23:33:22 +05:30
Vighnesh Birodkar d398b7fd96 used standard eignen solver 2014-08-05 23:33:22 +05:30
Vighnesh Birodkar c915aef759 Updated bento file 2014-08-05 23:33:22 +05:30
Vighnesh Birodkar 2017e350ff Comments to graph_cut.py 2014-08-05 23:33:22 +05:30
Vighnesh Birodkar 1e39dfc7a1 rectified threshold mistake 2014-08-05 23:33:22 +05:30
Vighnesh Birodkar b05646e201 Docstring of graph_cut.py 2014-08-05 23:33:22 +05:30
Vighnesh Birodkar 68b087ca48 Docstrings 2014-08-05 23:33:22 +05:30
Vighnesh Birodkar ddf11bdfe8 pep8 changes 2014-08-05 23:33:22 +05:30
Vighnesh Birodkar 7215936f5c First working copy 2014-08-05 23:33:22 +05:30
Steven Silvester 04e53f124f Remove confusing dummy variable 2014-08-04 07:30:13 -05:00
blink1073 b6dcf3c336 Update Travis build to use Anaconda.
Update Travis build to use Anaconda

Travis updates and fixes

More travis fixes

Another travis attempt

Revert changes

Use PIL and Pillow

Refactor travis into 4 different builds

Fix activation error

Remove explicit mpl in build_versions.py

Make matplotlib an explicit requirement

Rearrange travis

Make pillow a hard requirement

Try again to make Pillow optional

Fix bash syntax error

Fix bash syntax error

Bump required cython version

More rearrangments

Remove mpl from build_versions, rearrange travis

Fix version check

Make matplotlib explicit again

Conda install into test env

Check for proper install

Allow tests to skip if networkx is not available

Allow tests to skip if networkx is not available

Try swapping pillow for matplotlib

Allow tests to pass when matplotlib is not present

Remove matplotlib from build_versions

Print PIL version

Get pillow from PIP

Allow tests to skip if matplotlib is not present.

Allow tests to skip if networkx is not present.

travis fix

Remove unused mpl import that caused test error

Use nose-cov and do not run doctests without optional libs

Bump required numpy version and fix nose calls

Make overlay test repeatable

bump numpy version again

Move low-end numpy to python 2.7

Play with minimum versions

Add version requirements and use functions

Add version requirements and use functions

Allow require to skip a test

More implementation of require decorator

Update require decorator and clean up tests

Only use requires decorator when needed

Fix python3 error in version_requirements

Fix build errors

Fix handling of require with tests

More fixes for require handler

Use latest miniconda

Fix more build errors

Fix another dict comprehension and travis file.

Fix missing imports

Fix dictionary again

Fix import warning

Fix last failing test on 2.6

Skip doc examples on python2.6

Do not run doctests on python2.6

Fix typo in travis.yml

Make numpy-1.6 compatibility changes

Use numpy-1.6 in travis python2.6

Add tests for version requirements

Fix line noise in PR

Add additional io plugins

Fix simpleitk test.

Fix python 3 error in freeimage_plugin.

Install imread in Travis.

Put matplotlib settings in XDG recommended directory

Fix formatting in travis yml

Fix formatting in travis yml

Make sure to close PIL file atexit

Fix name of apt package xcftools

Fix pil fp closing

Fix matplotlibrc creation

Only download SimpleITK on py2x, run coverage on py27

Fix travis yml syntax error

Run coveralls on py2.7

Install SimpleITK on py3.3 and run coverage on py3.3

Make simpleitk install quiet

Use standard nose and clean up incantation

Fix travis yml syntax error

Put in miniconda workout for libc error.

Fix imread plugin.

Fix travis syntax

Remove unused import

Remove miniconda libpng in favor of system png

Fix imread install and move libm removal to after optional pkg install.

Fix png header copy in travis yml

Another attempt to use png headers

Debug freeimage

Add jpeg library for freeimage and debug imread.

More debug for imread and freeimage

More freeimage and imread debugging

More debugging

Use correct paths for test env

Make sure imread is tied to libpng15

Add a TODO note for simpleitk test causing error.

Fix typo in yml

Cleanup and add more comments to travis yml

Update comment

Try and add 3.2 support.

Docstring formatting

Add more travis comments.

Try numpy 1.6 on python 2.7

Fix travis syntax error

Rename CONDA to ENV for clarity

Alias python on python 3.2

Use python 3.2 as the system python

Clean up libfreeimage install

Fix order on py3.2 pre_install

Move old numpy back to py26

Use the appropriate python calls.

Debug 3.2 build.

Update comment

Fix syntax error

Another fix for syntax error.

Install scipy after downloading import tools

More debugging for py32

Do not install conda on py3.2 (duh)

Fix typo in travis yml

Fix py32 qt install, separate pyfits and imread to find error

Fix syntax error and front-load option lib check for debug

pyfits is not supported in py3.2, try imread now

imread is also not supported on py3.2

install imread before pyfits to show relationship with libs

Make pip builds quiet

Minor formatting to retrigger build

Allow simpleitk to fail to download without breaking the build

Use travis_retry for SimpleITK

See what breaks when we keep libm in

Now remove libm again
2014-08-02 06:47:09 -05:00
Vighnesh Birodkar a4bf278c5b Doctest Passing 2014-07-03 00:26:22 +05:30
Vighnesh Birodkar 486f935db8 Rename methods and edit docstrings 2014-07-02 00:19:11 +05:30
Vighnesh Birodkar b1f59fceee Changed prototype of weight_func 2014-06-26 00:11:49 +05:30
Vighnesh Birodkar bd9ab8f0fd Switch label_image to labels 2014-06-23 23:04:16 +05:30
Vighnesh Birodkar 27831d8e2f Formatting and docstring changes 2014-06-23 22:26:53 +05:30
Vighnesh Birodkar c14021a9cb Formatting and typos 2014-06-23 01:16:57 +05:30
Vighnesh Birodkar 319530fb89 Used mapping in graph_cut.py 2014-06-22 19:48:52 +05:30
Vighnesh Birodkar 20cefcf50a Added comments and switched try with if 2014-06-19 16:18:53 +05:30
Vighnesh Birodkar 53330496f8 Added references 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 2a7ec3afd4 Renamed _construct.pyx to _build_rag.pyx and some code corrections 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar bf89726c49 removed comments 2014-06-19 02:50:24 +05:30
Vighnesh Birodkar c08d96d2b5 Minor Foramtting 2014-06-19 02:50:24 +05:30
Vighnesh Birodkar 3ea78096e7 Formatting changes 2014-06-19 02:50:24 +05:30
Vighnesh Birodkar 1ad8ad733b Added examples in docstring 2014-06-19 02:50:24 +05:30
Vighnesh Birodkar 850f835114 Docs formatting 2014-06-19 02:50:24 +05:30
Vighnesh Birodkar 10f91fe8b0 Added docs 2014-06-19 02:50:24 +05:30
Vighnesh Birodkar abcb9cf2ef Added testcase 2014-06-19 02:50:24 +05:30
Vighnesh Birodkar 53077c9f22 Added edge threshold cut 2014-06-19 02:50:24 +05:30