Commit b3749a4e authored by Adam Paquette's avatar Adam Paquette
Browse files

Reverted the majority of the line lenth changes made by autopep8

parent 5027f7ff
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ class Edge(dict, MutableMapping):

            _, mask = self._clean(clean_keys)


            self.distance_ratio = od.DistanceRatio(self.matches)
            self.distance_ratio.compute(mask=mask, **kwargs)

+4 −3
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ def mcl(g, expand_factor=2, inflate_factor=2, max_loop=10, mult_factor=1):
        arr = _expand(arr, expand_factor)

        # Check for convergence
        if _stop(arr, i): break
        if _stop(arr, i):
            break

    clusters = _get_clusters(arr)
    return arr, clusters
+9 −11
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ class CandidateGraph(nx.Graph):

        return cls(adjacency_dict)


    @classmethod
    def from_adjacency(cls, input_adjacency, basepath=None):
        """
@@ -556,7 +555,6 @@ class CandidateGraph(nx.Graph):
                m1 = (source, int(row['source_idx']))
                m2 = (destination, int(row['destination_idx']))


                values.append([kp1.loc[m1_pid]['x'],
                               kp1.loc[m1_pid]['y'],
                               m1,
+3 −3
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ class Node(dict, MutableMapping):
        Type: {}
        """.format(self.node_id, self.image_name, self.image_path,
                   self.nkeypoints, self.masks, self.__class__)

    @property
    def geodata(self):
        if not getattr(self, '_geodata', None):
@@ -337,4 +338,3 @@ class Node(dict, MutableMapping):
        mask = panel[clean_keys].all(axis=1)
        matches = self._keypoints[mask]
        return matches, mask
+1 −3
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ import unittest
from unittest.mock import Mock

import pandas as pd
import numpy as np

from .. import edge
from .. import node


class TestEdge(unittest.TestCase):

    def setUp(self):
@@ -44,5 +44,3 @@ class TestEdge(unittest.TestCase):
    def test_compute_fundamental_matrix(self):
        with self.assertRaises(AttributeError):
            self.edge.compute_fundamental_matrix()

Loading