wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-02 07:21:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adding high speed test for n>=12

Browse Source
This commit is contained in:
Ankit Agrawal
2013-08-20 02:33:29 +05:30
committed by Johannes Schönberger
parent 5c6420d584
commit cfcefe192c
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/feature/fast_cy.pyx
+15 -2
View File
@@ -8,7 +8,7 @@ import numpy as np
from ..util import img_as_float
def _corner_response_fast(double[:, ::1] image, int n, double threshold):
def _corner_fast(double[:, ::1] image, int n, double threshold):
cdef int[:] rp = (np.round(3 * np.sin(2 * np.pi * np.arange(16, dtype=np.double) / 16))).astype(np.int32)
cdef int[:] cp = (np.round(3 * np.cos(2 * np.pi * np.arange(16, dtype=np.double) / 16))).astype(np.int32)
@@ -19,7 +19,8 @@ def _corner_response_fast(double[:, ::1] image, int n, double threshold):
cdef Py_ssize_t i, j, k, l, m
cdef char[:] bins
cdef int consecutive_count = 0
cdef int consecutive_count, speed_sum_b, speed_sum_d
cdef int sp
cdef double sum_b
cdef double sum_d
cdef double[:, ::1] corner_response = np.zeros((rows, cols), dtype=np.double)
@@ -30,6 +31,8 @@ def _corner_response_fast(double[:, ::1] image, int n, double threshold):
for j in range(3, cols - 3):
bins = np.zeros(16, dtype='S1')
speed_sum_b = 0
speed_sum_d = 0
sum_b = 0
sum_d = 0
@@ -45,6 +48,16 @@ def _corner_response_fast(double[:, ::1] image, int n, double threshold):
# Similar pixel
bins[k] = 's'
# High speed test for n>=12
if n >= 12:
for k in range(4):
if bins[4 * k] == 'b':
speed_sum_b += 1
elif bins[4 * k] == 'd':
speed_sum_d += 1
if speed_sum_d < 3 and speed_sum_b < 3:
continue
consecutive_count = 0
for l in range(15 + n):
if bins[l % 16] == 'b':