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

General bugfixing

parent 81e4d706

bin/image_match.py

+59 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ def parse_arguments(): 
    return args



def match_images(args, config_dict):

    print(find_in_dict(config_dict, 'ratio'))

    # Matches the images in the input file using various candidate graph methods

    # produces two files usable in isis
@@ -30,15 +31,15 @@ def match_images(args, config_dict): 
        cg = CandidateGraph.from_filelist(find_in_dict(config_dict, 'inputfile_path') + args.input_file)



    # Apply SIFT to extract features

    cg.extract_features(method=find_in_dict(config_dict, 'extract_features')['method'],

    cg.extract_features(method=config_dict['extract_features']['method'],

                        extractor_parameters=find_in_dict(config_dict, 'extractor_parameters'))



    # Match

    cg.match_features(k=find_in_dict(config_dict, 'match_features')['k'])

    cg.match_features(k=config_dict['match_features']['k'])



    # Apply outlier detection

    cg.apply_func_to_edges('symmetry_check')

    cg.apply_func_to_edges('ratio_check', clean_keys=(find_in_dict(config_dict, 'ratio_checks')['clean_keys']),

    cg.apply_func_to_edges('ratio_check',

                    ratio=find_in_dict(config_dict, 'ratio'),

                    mask_name=find_in_dict(config_dict, 'mask_name'),

                    single=find_in_dict(config_dict, 'single'))
@@ -80,3 +81,58 @@ if __name__ == '__main__': 
    config = read_yaml('image_match_config.yml')

    command_line_args = parse_arguments()

    match_images(command_line_args, config)



'''

try:

        cg = CandidateGraph.from_adjacency(find_in_dict(config_dict, 'inputfile_path') +

                                           args.input_file, basepath=find_in_dict(config_dict, 'basepath'))

    except:

        cg = CandidateGraph.from_filelist(find_in_dict(config_dict, 'inputfile_path') + args.input_file)



    # Apply SIFT to extract features

    cg.extract_features(method=config_dict['extract_features']['method'],

                        extractor_parameters=find_in_dict(config_dict, 'extractor_parameters'))



    # Match

    cg.match_features(k=config_dict['match_features']['k'])



    # Apply outlier detection

    cg.apply_func_to_edges('symmetry_check')

    cg.apply_func_to_edges('ratio_check',

                    ratio=find_in_dict(config_dict, 'ratio'),

                    mask_name=find_in_dict(config_dict, 'mask_name'),

                    single=find_in_dict(config_dict, 'single'))



    # Compute a homography and apply RANSAC

    cg.apply_func_to_edges('compute_fundamental_matrix', clean_keys=find_in_dict(config_dict, 'fundamental_matrices')['clean_keys'],

                                    method=find_in_dict(config_dict, 'fundamental_matrices')['method'],

                                    reproj_threshold=find_in_dict(config_dict, 'reproj_threshold'),

                                    confidence=find_in_dict(config_dict, 'confidence'))



    cg.apply_func_to_edges('subpixel_register', clean_keys=find_in_dict(config_dict, 'subpixel_register')['clean_keys'],

                         template_size=find_in_dict(config_dict, 'template_size'),

                         threshold=find_in_dict(config_dict, 'threshold_size'),

                         search_size=find_in_dict(config_dict, 'search_size'),

                         max_x_shift=find_in_dict(config_dict, 'max_x_shift'),

                         max_y_shift=find_in_dict(config_dict, 'max_y_shift'),

                         tiled=find_in_dict(config_dict, 'tiled'))



    cg.apply_func_to_edges('suppress', clean_keys=find_in_dict(config_dict, 'suppress')['clean_keys'],

                k=find_in_dict(config_dict, 'suppress')['k'],

                min_radius=find_in_dict(config_dict, 'min_radius'),

                error_k=find_in_dict(config_dict, 'error_k'))



    cnet = cg.to_cnet(clean_keys=find_in_dict(config_dict, 'cnet_conversion')['clean_keys'],

                      isis_serials=True)



    filelist = cg.to_filelist()



    write_filelist(filelist, find_in_dict(config_dict, 'outputfile_path') + args.output_file + '.lis')



    to_isis(find_in_dict(config_dict, 'outputfile_path') + args.output_file + '.net', cnet,

            mode='wb',

            networkid=find_in_dict(config_dict, 'networkid'),

            targetname=find_in_dict(config_dict, 'targetname'),

            description=find_in_dict(config_dict, 'description'),

            username=find_in_dict(config_dict, 'username'))

'''

image_match_config.yml

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ system_paths: 
extract_features:

    method: sift

    extractor_parameters:

        nfeatures: 500

        nfeatures: 1000



match_features:

    k: 50
@@ -14,8 +14,9 @@ match_features: 
# Any clean keys being passed in requires a method to have been used on the candidate graph object

# before the key can be passed in



ratio_checks:

ratio_check:

    clean_keys:

        -



# Keyword arguments

    ratio: 0.8