Commit 267e4229 authored by Jay's avatar Jay
Browse files

Addes operation level retries.

parent 0a0a09c0

autocnet/matcher/subpixel.py

+4 −3
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ import warnings 
import logging

import logging





import numpy as np

import numpy as np

import pvl

from scipy.ndimage import center_of_mass

from scipy.ndimage import center_of_mass

from skimage import transform as tf

from skimage import transform as tf

from skimage import registration

from skimage import registration
@@ -20,11 +19,11 @@ from sqlalchemy.sql.expression import bindparam 
from sqlalchemy import inspect

from sqlalchemy import inspect

from matplotlib import pyplot as plt

from matplotlib import pyplot as plt





from autocnet.matcher.naive_template import pattern_match, pattern_match_autoreg

from autocnet.matcher.naive_template import pattern_match

from autocnet.matcher.mutual_information import mutual_information

from autocnet.matcher.mutual_information import mutual_information

from autocnet.io import isis

from autocnet.io.geodataset import AGeoDataset

from autocnet.io.geodataset import AGeoDataset

from autocnet.io.db.model import Measures, Points, Images, JsonEncoder

from autocnet.io.db.model import Measures, Points, Images, JsonEncoder

from autocnet.io.db.connection import retry

from autocnet.graph.node import NetworkNode

from autocnet.graph.node import NetworkNode

from autocnet.transformation import roi

from autocnet.transformation import roi

from autocnet.transformation.affine import estimate_local_affine

from autocnet.transformation.affine import estimate_local_affine
@@ -800,6 +799,7 @@ def fourier_mellen(ref_image, moving_image, affine=tf.AffineTransform(), verbose 




    return subpixel_affine, error, diffphase

    return subpixel_affine, error, diffphase





@retry(max_retries=5)

def subpixel_register_point_smart(point,

def subpixel_register_point_smart(point,

                                  session=None,

                                  session=None,

                                  cost_func=lambda x,y: 1/x**2 * y,

                                  cost_func=lambda x,y: 1/x**2 * y,
@@ -1240,6 +1240,7 @@ def validate_candidate_measure(measure_to_register, 
        dists.append(dist)

        dists.append(dist)

    return dists

    return dists





@retry(max_retries=5)

def smart_register_point(point, 

def smart_register_point(point, 

                         session=None,

                         session=None,

                         parameters=[], 

                         parameters=[],

autocnet/spatial/overlap.py

+2 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ from subprocess import CalledProcessError 
from autocnet.cg import cg as compgeom

from autocnet.cg import cg as compgeom

from autocnet.graph.node import NetworkNode

from autocnet.graph.node import NetworkNode

from autocnet.io.db.model import Images, Measures, Overlay, Points, JsonEncoder

from autocnet.io.db.model import Images, Measures, Overlay, Points, JsonEncoder

from autocnet.io.db.connection import retry

from autocnet.transformation import roi

from autocnet.transformation import roi

from autocnet.matcher.cpu_extractor import extract_most_interesting

from autocnet.matcher.cpu_extractor import extract_most_interesting

from autocnet.matcher.validation import is_valid_lroc_image

from autocnet.matcher.validation import is_valid_lroc_image
@@ -143,6 +144,7 @@ def find_interesting_point(nodes, lon, lat, size=71, **kwargs): 
    log.debug(f'Current reference index: {reference_index}.')

    log.debug(f'Current reference index: {reference_index}.')

    return reference_index, shapely.geometry.Point(sample, line)

    return reference_index, shapely.geometry.Point(sample, line)





@retry(max_retries=5)

def place_points_in_overlap(overlap,

def place_points_in_overlap(overlap,

                            identifier="place_points_in_overlaps",

                            identifier="place_points_in_overlaps",

                            interesting_func=find_interesting_point,

                            interesting_func=find_interesting_point,