Chintak Sheth
875e47abcc
Docstring for _dilate and _erode were interchanged
2013-07-15 18:50:06 +05:30
Johannes Schönberger
dd9f6a16ab
Merge pull request #643 from stefanv/bento_fixes
...
Fix Bento build.
2013-07-08 11:41:09 -07:00
Stefan van der Walt
5f62ad55a0
Merge pull request #614 from tonysyu/doc/local-binary-pattern
...
Add explanation to LBP example.
2013-07-08 06:52:15 -07:00
Stefan van der Walt
1b4cf9f76d
Fix Bento build.
2013-07-08 13:14:08 +02:00
Stefan van der Walt
47a0cd1a3f
Merge pull request #642 from sciunto/convex_hull_ex
...
Doc: Convex hull example. Improvement.
2013-07-08 03:41:22 -07:00
François Boulogne
acdfd8bc71
simplify modification image + comment
2013-07-07 12:21:34 +02:00
François Boulogne
7048a9c995
add original picture
2013-07-07 12:05:30 +02:00
Emmanuelle Gouillart
f3b1b39158
Merge pull request #635 from josteinbf/radon-cleanup
...
Clean up radon and iradon to improve readability
2013-07-06 12:14:25 -07:00
Jostein Bø Fløystad
bea50aa608
iradon: use util.pad for sinogram padding.
2013-07-06 20:55:54 +02:00
Jostein Bø Fløystad
b3746b9090
iradon: Cleanup by locating related code in one place.
2013-07-06 20:55:54 +02:00
Jostein Bø Fløystad
643a1bc1f5
iradon: Add test for cubic interpolation.
2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad
b90ba783ef
iradon: Only allow interpolation methods working well.
...
Of the interpolation methods provided by scipy.interpolate.interp1d,
only cubic has been found to work well with the tests in skimage (other
methods are either identical to linear or nearest, or they produce bad
reconstructions).
2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad
2be327815e
radon: Use numpy.interp/scipy.interpolate.
...
Scipy supports all interpolation kinds (nearest, linear) we need, while
numpy supports only linear interpolation. The numpy interpolation is
substantially faster, so this is used even though it complicates the
code slightly.
2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad
5955e4e612
iradon: Reduce code duplication.
2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad
ac460a9777
iradon: Use util.pad for array padding.
...
This depends on util.pad accepting 0s in pad_width, which has a proposed
solution in gh-634.
2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad
237fb989b0
radon: Use util.pad for array padding.
2013-07-06 20:55:53 +02:00
Josh Warner
6edd707a1b
Merge pull request #637 from sciunto/minorfix
...
STYLE : PEP8 + import fix in hough_transform tests
2013-07-06 11:06:48 -07:00
Emmanuelle Gouillart
15ed7bdf59
Merge pull request #584 from josteinbf/iradon-algebraic
...
SART algorithm for tomography reconstruction
2013-07-06 10:24:24 -07:00
Josh Warner
bf26ce7fae
Merge pull request #640 from sciunto/missingdoc
...
DOCFIX: add docstrings to Cython grayscale dilate/erode & make them private funcs
2013-07-06 07:16:09 -07:00
François Boulogne
cf3efba3c1
use previous import
2013-07-06 16:12:09 +02:00
François Boulogne
de9d2662b1
MIN: fix pep8
2013-07-06 14:45:54 +02:00
François Boulogne
f316abbfbe
DOC: add doctrings
2013-07-06 14:34:55 +02:00
François Boulogne
e74b971335
erode & dilate -> private functions
2013-07-06 14:30:17 +02:00
François Boulogne
2dfeab83df
PEP8 + import
2013-07-06 13:49:01 +02:00
Tony S Yu
516d6efa5d
Fix Python 3 incompatibility (also, some wording tweaks)
2013-07-06 00:55:51 -05:00
Josh Warner
e5e0c73755
Merge pull request #634 from josteinbf/arraypad-zeros
...
arraypad: allow padding with zero entries (i.e. no padding).
2013-07-05 07:33:10 -07:00
Jostein Bø Fløystad
794a4d7dae
arraypad: allow padding with zero entries (i.e. no padding).
2013-07-05 14:29:09 +02:00
Jostein Bø Fløystad
553767122b
Add SART to contributors.
2013-07-05 13:36:55 +02:00
Jostein Bø Fløystad
3cdfeccc7a
iradon_sart: flip signs to reflect changes to radon.
...
The changes to radon were introduced in gh-596.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
af47941435
iradon_sart: fix comment spelling.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
f2790d658c
iradon_sart: redefine projection center.
...
This reflects the bugfixes related to issue gh-592 implemented in
gh-596.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
06857d3b92
Radon tests: Check the correct error metric.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
e2a0f7fff8
Radon example: Declare UTF-8 encoding.
...
This is needed for non-ASCII characters in the references to papers
cited in the text.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
789c19923d
Radon example: print RMS errors of the reconstructions.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
1d611878a6
Radon example: Style fixes.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
e5dfcb0ab4
Improve the text in and add references to the Radon example.
...
Based on comments from Emmanuelle.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
9e11e453b6
radon example: Display plots when run from command line.
...
Call to matplotlib's show() was missing.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
a4870242b6
iradon_sart: Test clip functionality and add a test for it.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
a5df8d4630
Rewrite Radon example; include SART.
...
The old example had some flaws. The new example corrects these, expands
on the topic and adds content relating to the newly implemented SART
algorithm.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
dde4288865
test_radon_transform: Style fixes.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad
266b202226
iradon_sart: Style fixes.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
116e1dd571
iradon_sart: Also test accuracy with a missing wedge.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
ace07a0b18
iradon_sart: Add test for order_angles_golden_ratio.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
2082b57e41
iradon_sart: Order angles using a golden ratio approach.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
dcd31c1882
radon_transform: Declare encoding.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
8d4b1e6710
iradon_sart: Add Kaczmarz reference and reformat citations.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
89f227c5ff
iradon_sart: Remove needless memoryview/ndarray conversion.
...
image_update is not manipulated in sart_projection_update and the
conversion to memoryview will happen when it is passed to the
subroutines anyway.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
5baaf78564
iradon_sart: Reduce code duplication in interpolation.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
91aeb658dd
iradon_sart's cython exts: Use typed memoryviews, not ndarrays.
2013-07-05 13:14:38 +02:00
Jostein Bø Fløystad
c977c5974d
iradon_sart: Improve argument checking.
2013-07-05 13:14:38 +02:00