From 96ba7eb4bddd5e96e0a85b48a899ca1e624bea96 Mon Sep 17 00:00:00 2001
From: Tony S Yu <tsyu80@gmail.com>
Date: Thu, 2 Feb 2012 22:45:23 -0500
Subject: [PATCH] Move harris corner detection from filter to feature
 subpackage.

---
 doc/examples/plot_harris.py                      | 2 +-
 skimage/feature/__init__.py                      | 1 +
 skimage/{filter => feature}/harris.py            | 4 ++--
 skimage/{filter => feature}/tests/test_harris.py | 2 +-
 skimage/filter/__init__.py                       | 1 -
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename skimage/{filter => feature}/harris.py (95%)
 rename skimage/{filter => feature}/tests/test_harris.py (97%)

diff --git a/doc/examples/plot_harris.py b/doc/examples/plot_harris.py
index 2d818e41..0e0222cb 100644
--- a/doc/examples/plot_harris.py
+++ b/doc/examples/plot_harris.py
@@ -13,7 +13,7 @@ detection in multiple directions.
 from matplotlib import pyplot as plt
 
 from skimage import data, img_as_float
-from skimage.filter import harris
+from skimage.feature import harris
 
 
 def plot_harris_points(image, filtered_coords):
diff --git a/skimage/feature/__init__.py b/skimage/feature/__init__.py
index c63a773d..49721c73 100644
--- a/skimage/feature/__init__.py
+++ b/skimage/feature/__init__.py
@@ -1,3 +1,4 @@
 from hog import hog
 from greycomatrix import greycomatrix, greycoprops
 from peak import peak_local_max
+from harris import harris
diff --git a/skimage/filter/harris.py b/skimage/feature/harris.py
similarity index 95%
rename from skimage/filter/harris.py
rename to skimage/feature/harris.py
index feb848ac..1a7e3b6d 100644
--- a/skimage/filter/harris.py
+++ b/skimage/feature/harris.py
@@ -6,7 +6,7 @@ http://www.janeriksolem.net/2009/01/harris-corner-detector-in-python.html
 """
 from scipy import ndimage
 
-from skimage import feature
+from . import peak
 
 
 def _compute_harris_response(image, eps=1e-6, gaussian_deviation=1):
@@ -79,7 +79,7 @@ def harris(image, min_distance=10, threshold=0.1, eps=1e-6,
     """
     harrisim = _compute_harris_response(image, eps=eps,
                     gaussian_deviation=gaussian_deviation)
-    coordinates = feature.peak_local_max(harrisim, min_distance=min_distance,
+    coordinates = peak.peak_local_max(harrisim, min_distance=min_distance,
                                         threshold=threshold)
     return coordinates
 
diff --git a/skimage/filter/tests/test_harris.py b/skimage/feature/tests/test_harris.py
similarity index 97%
rename from skimage/filter/tests/test_harris.py
rename to skimage/feature/tests/test_harris.py
index 16204e0f..4715ee25 100644
--- a/skimage/filter/tests/test_harris.py
+++ b/skimage/feature/tests/test_harris.py
@@ -3,7 +3,7 @@ import numpy as np
 from skimage import data
 from skimage import img_as_float
 
-from skimage.filter import harris
+from skimage.feature import harris
 
 
 def test_square_image():
diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py
index 529331f0..1acc33f2 100644
--- a/skimage/filter/__init__.py
+++ b/skimage/filter/__init__.py
@@ -5,4 +5,3 @@ from edges import sobel, hsobel, vsobel, hprewitt, vprewitt, prewitt
 from tv_denoise import tv_denoise
 from rank_order import rank_order
 from thresholding import threshold_otsu
-from harris import harris