Commit Graph

153 Commits

Author SHA1 Message Date
Vighnesh Birodkar 7215936f5c First working copy 2014-08-05 23:33:22 +05:30
Steven Silvester 2a339fe69c Improve import behavior for rag fallback 2014-08-04 07:40:37 -05:00
Steven Silvester 04e53f124f Remove confusing dummy variable 2014-08-04 07:30:13 -05:00
Steven Silvester 208afc3837 Move version_requirements to _shared and remove skipif from require. 2014-08-02 11:09:46 -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
blink1073 5677dafe41 Move away from random.random in favor of random.rand 2014-07-19 18:18:23 -05:00
Vighnesh Birodkar df1d61e461 Spelling correction. 2014-07-03 09:55:17 +05:30
Vighnesh Birodkar fb706d12d5 made RAG public and hyperlinked networkx.Graph documentation 2014-07-03 01:55:09 +05:30
Vighnesh Birodkar a4bf278c5b Doctest Passing 2014-07-03 00:26:22 +05:30
Vighnesh Birodkar e558854dec docstring change 2014-07-02 23:28:14 +05:30
Vighnesh Birodkar c1cf8e6347 Got doctest to pass and docstring changes 2014-07-02 23:13:17 +05:30
Vighnesh Birodkar 6003ab2c7d Typos 2014-07-02 00:31:01 +05:30
Vighnesh Birodkar 486f935db8 Rename methods and edit docstrings 2014-07-02 00:19:11 +05:30
Vighnesh Birodkar 6abf194dd6 Use sets instead of dictionaries in merge_nodes 2014-06-28 21:02:25 +05:30
Vighnesh Birodkar dd67b3fce7 Changed max_edge in example/plot_rag.py 2014-06-28 11:06:30 +05:30
Vighnesh Birodkar f71ad51f57 Got Py3 test to pass 2014-06-28 10:35:14 +05:30
Vighnesh Birodkar 87465d91d7 test_rag.py formatting 2014-06-28 01:39:28 +05:30
Vighnesh Birodkar e63ae9450a merge_nodes docstring change 2014-06-28 01:35:41 +05:30
Vighnesh Birodkar 1982a3246c Docstring changes. 2014-06-28 01:32:55 +05:30
Vighnesh Birodkar c8480d3f6d Change merge_nodes code and test case 2014-06-28 01:17:44 +05:30
Vighnesh Birodkar c08a6876d6 Added comment about footprint 2014-06-26 02:05:20 +05:30
Vighnesh Birodkar bb874074c4 None comparison 2014-06-26 00:58:54 +05:30
Vighnesh Birodkar b1284ee180 update test for py3 2014-06-26 00:57:50 +05:30
Vighnesh Birodkar cbfa8aa6e1 docstring corrections 2014-06-26 00:54:16 +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 66d3ec3831 removed commented stataments 2014-06-23 01:28:10 +05:30
Vighnesh Birodkar c14021a9cb Formatting and typos 2014-06-23 01:16:57 +05:30
Vighnesh Birodkar a1bc2e95fd Made test Python3 compatible 2014-06-23 01:15:00 +05:30
Vighnesh Birodkar 0efca40747 Added connectivity parameter and a function input to merge_nodes 2014-06-23 00:58:13 +05:30
Vighnesh Birodkar 3db0a2f81f Naming changes and formatting 2014-06-22 20:27:44 +05:30
Vighnesh Birodkar 319530fb89 Used mapping in graph_cut.py 2014-06-22 19:48:52 +05:30
Vighnesh Birodkar 0e35c422b3 Graph can now merge non adjacent nodes 2014-06-22 13:58:00 +05:30
Vighnesh Birodkar 711de464e5 Formatting changes 2014-06-19 18:03:44 +05:30
Vighnesh Birodkar 76d3dbad57 added merge_nodes test 2014-06-19 17:57:07 +05:30
Vighnesh Birodkar d0e7a26f6f Added RAG merge_nodes test case 2014-06-19 16:36:17 +05:30
Vighnesh Birodkar 20cefcf50a Added comments and switched try with if 2014-06-19 16:18:53 +05:30
Vighnesh Birodkar 410aecb354 type casting to double instead of long 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 53330496f8 Added references 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 78397bf54d reverted benfo.info and setup.py 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 9b8e1333e8 Corrected rag import 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar f5f93f8ce3 Removed cython file and added nd python function for RAG construction 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 53318c44df CHanges to get Python3 working 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar bf89726c49 removed comments 2014-06-19 02:50:24 +05:30
Vighnesh Birodkar 18a6535089 Corrected test mistake 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