From 32afefef2336eda736ff5f305b24927d7535b790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sun, 26 Aug 2012 00:08:29 +0200 Subject: [PATCH] Fix doc string of texture detection --- skimage/feature/_texture.pyx | 3 ++- skimage/feature/texture.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/skimage/feature/_texture.pyx b/skimage/feature/_texture.pyx index 0e82c306..5fb53e90 100644 --- a/skimage/feature/_texture.pyx +++ b/skimage/feature/_texture.pyx @@ -95,7 +95,8 @@ def _local_binary_pattern(np.ndarray[double, ndim=2] image, R : float Radius of circle (spatial resolution of the operator). method : {'D', 'R', 'U', 'V'} - Method to determine the pattern:: + Method to determine the pattern. + * 'D': 'default' * 'R': 'ror' * 'U': 'uniform' diff --git a/skimage/feature/texture.py b/skimage/feature/texture.py index aa970d18..22b5d0d8 100644 --- a/skimage/feature/texture.py +++ b/skimage/feature/texture.py @@ -139,7 +139,6 @@ def greycoprops(P, prop='contrast'): `P[i,j,d,theta]` is the number of times that grey-level j occurs at a distance d and at an angle theta from grey-level i. - prop : {'contrast', 'dissimilarity', 'homogeneity', 'energy', \ 'correlation', 'ASM'}, optional The property of the GLCM to compute. The default is 'contrast'. @@ -241,8 +240,9 @@ def local_binary_pattern(image, P, R, method='default'): angular space). R : float Radius of circle (spatial resolution of the operator). - method : {'D', 'R', 'U', 'V'} - Method to determine the pattern:: + method : {'default', 'ror', 'uniform', 'var'} + Method to determine the pattern. + * 'default': original local binary pattern which is gray scale but not rotation invariant. * 'ror': extension of default implementation which is gray scale and