Commit 7afe625e authored by Jason R Laura's avatar Jason R Laura Committed by jay
Browse files

Initial coupled decomp

parent 9221d887
Loading
Loading
Loading
Loading
+24 −2
Changes for autocnet/graph/edge.py: 24 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ from collections import MutableMapping

import numpy as np
import pandas as pd
from scipy.spatial.distance import cdist

import autocnet
from autocnet.utils import utils
@@ -98,6 +99,7 @@ class Edge(dict, MutableMapping):
        pass

    def match(self, k=2, **kwargs):

        """
        Given two sets of descriptors, utilize a FLANN (Approximate Nearest
        Neighbor KDTree) matcher to find the k nearest matches.  Nearness is
@@ -112,8 +114,6 @@ class Edge(dict, MutableMapping):
        """
        pass



    def symmetry_check(self):
        if hasattr(self, 'matches'):
            mask = od.mirroring_test(self.matches)
@@ -480,3 +480,25 @@ class Edge(dict, MutableMapping):
        total_overlap_coverage = (convex_poly.GetArea()/intersection_area)

        return total_overlap_coverage

    def decompose(self, maxiterations=3):
        """
        Apply coupled decomposition to the images and
        match identified sub-images

        Parameters
        ----------
        maxiterations : int
                        The number of iterations. Appropriate values:

                        | Number of megapixels | k |
                        |----------------------|---|
                        | m < 10               |1-2|
                        | 10 < m < 30          | 3 |
                        | 30 < m < 100         | 4 |
                        | 100 < m < 1000       | 5 |
                        | m > 1000             | 6 |


        """
        pass
+2 −1
Changes for autocnet/transformation/decompose.py: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ def reproject_image_into_polar(data, origin=None):

def coupled_decomposition(sdata, ddata, sorigin=(), dorigin=(), M=4, sub_skp=None):
    """
    Apply coupled decomposition to two 2d images=.

    Apply coupled decomposition to two 2d images.

    sdata : ndarray
            (n,m) array of values to decompose