Merge remote-tracking branch 'upstream/master' into graphabstraction (95e2f071) · Commits · aflab / astrogeology / Autocnet

autocnet/cg/tests/test_cg.py

+1 −3

Original line number	Diff line number	Diff line
		@@ -5,8 +5,6 @@ sys.path.insert(0, os.path.abspath('..'))

		import numpy as np

		from autocnet.examples import get_path

		from .. import cg

+3 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ class C(pd.DataFrame):
		>>> C = control.C(data, index=multi_index, columns=columns)

		"""

		def __init__(self, args, *kwargs):
		super(C, self).__init__(args, *kwargs)
		self._creationdate = strftime("%Y-%m-%d %H:%M:%S", gmtime())

+4 −5

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ from time import gmtime, strftime
		import unittest

		import numpy as np
		import pandas as pd

		sys.path.insert(0, os.path.abspath('..'))

+3 −5

Original line number	Diff line number	Diff line
		import math
		import warnings
		from collections import MutableMapping

		@@ -121,7 +120,6 @@ class Edge(dict, MutableMapping):
		else:
		mask = pd.Series(True, self.matches.index)


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

		@@ -260,7 +258,7 @@ class Edge(dict, MutableMapping):
		"""
		matches = self.matches
		for column, default in {'x_offset': 0, 'y_offset': 0, 'correlation': 0, 'reference': -1}.items():
		if not column in self.matches.columns:
		if column not in self.matches.columns:
		self.matches[column] = default

		# Build up a composite mask from all of the user specified masks

+13 −14

Original line number	Diff line number	Diff line
		import os
		import sys
		import unittest
		import warnings

		sys.path.insert(0, os.path.abspath('..'))