Commit c5b934d3 authored by Kelvin's avatar Kelvin
Browse files

Ciratefi is now callable from sub_pixel

parent 9202f7a0

autocnet/matcher/ciratefi.py

+16 −8
Changes for autocnet/matcher/ciratefi.py: 16 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -481,8 +481,8 @@ def tefi(template, search_image, candidate_pixels, best_scales, best_angles, 


    # check for upsampling

    if upsampling > 1:

        template = zoom(template, upsampling, order=3)

        search_image = zoom(search_image, upsampling, order=3)

        u_template = zoom(template, upsampling, order=3)

        u_search_image = zoom(search_image, upsampling, order=3)



    alpha_list = np.arange(0, 2*math.pi, alpha)

    candidate_pixels *= int(upsampling)
@@ -505,13 +505,13 @@ def tefi(template, search_image, candidate_pixels, best_scales, best_angles, 


        max_coeff = -math.inf

        for j in range(scalesxalphas.shape[0]):

            transformed_template = imresize(template, scalesxalphas[j][0])

            transformed_template = imresize(u_template, scalesxalphas[j][0])

            transformed_template = rotate(transformed_template, scalesxalphas[j][1])



            y_window, x_window = (math.floor(transformed_template.shape[0]/2),

                                  math.floor(transformed_template.shape[1]/2))



            cropped_search = search_image[y-y_window:y+y_window+1, x-x_window:x+x_window+1]

            cropped_search = u_search_image[y-y_window:y+y_window+1, x-x_window:x+x_window+1]



            if(y < y_window or x < x_window or cropped_search.shape < transformed_template.shape or

               cropped_search.shape != transformed_template.shape):
@@ -531,16 +531,24 @@ def tefi(template, search_image, candidate_pixels, best_scales, best_angles, 
    if use_percentile:

        thresh = np.percentile(tefi_coeffs, int(thresh))



    candidate_pixels = candidate_pixels/upsampling

    result_points = candidate_pixels[np.where(tefi_coeffs >= thresh)]

    result_coeffs = tefi_coeffs[np.where(tefi_coeffs >= thresh)]



    results = candidate_pixels[np.where(tefi_coeffs >= thresh)]

    x = result_points[0][1]

    y = result_points[0][0]



    ideal_y = u_search_image.shape[0] / 2

    ideal_x = u_search_image.shape[1] / 2



    if verbose:  # pragma: no cover

        plt.imshow(image_pixels, interpolation='none')

        plt.scatter(y=results[:, 0], x=results[:, 1], c='w', s=80)

        plt.scatter(y=y/upsampling, x=x/upsampling, c='w', s=80)

        plt.show()



    return results

    x = (ideal_x - x)/upsampling

    y = (ideal_y - y)/upsampling



    return x, y, result_coeffs[0]





def ciratefi(template, search_image, upsampling=1, cifi_thresh=95, rafi_thresh=95, tefi_thresh=100,

autocnet/matcher/subpixel.py

+7 −2
Changes for autocnet/matcher/subpixel.py: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line 
import numpy as np



from autocnet.matcher import naive_template

from autocnet.matcher import ciratefi





# TODO: look into KeyPoint.size and perhaps use to determine an appropriately-sized search/template.
@@ -49,7 +51,7 @@ def clip_roi(img, center, img_size): 
    return clipped_img





def subpixel_offset(template, search, **kwargs):

def subpixel_offset(template, search, method='naive', **kwargs):

    """

    Uses a pattern-matcher on subsets of two images determined from the passed-in keypoints and optional sizes to

    compute an x and y offset from the search keypoint to the template keypoint and an associated strength.
@@ -74,7 +76,10 @@ def subpixel_offset(template, search, **kwargs): 
               Strength of the correspondence in the range [-1, 1]

    """



    x_offset, y_offset, strength = naive_template.pattern_match(template, search, **kwargs)

    functions = { 'naive' : naive_template.pattern_match,

                  'ciratefi' : ciratefi.ciratefi}



    x_offset, y_offset, strength = functions[method](template, search, **kwargs)

    return x_offset, y_offset, strength



'''

notebooks/Ciratefi.ipynb

+65 −26

File changed.

Preview size limit exceeded, changes collapsed.