Commit 0644aa30 authored by Adam Paquette's avatar Adam Paquette
Browse files

further implimentation based on the yaml file

parent 346e6abe
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ sys.path.insert(0, os.path.abspath('../autocnet'))

from autocnet.graph.network import CandidateGraph
from autocnet.fileio.io_controlnetwork import to_isis, write_filelist
import autocnet.fileio.io_yaml
from autocnet.fileio.io_yaml import read_yaml


def read_config(yaml_file):
@@ -30,9 +30,9 @@ def match_images(args):
    # Matches the images in the input file using various candidate graph methods
    # produces two files usable in isis
    try:
        cg = CandidateGraph.from_adjacency(args.input_file, basepath=args.basepath)
        cg = CandidateGraph.from_adjacency(config[match_image][inputfile_path] + args.input_file, basepath=config[match_image][basepath])
    except:
        cg = CandidateGraph.from_filelist(args.input_file)
        cg = CandidateGraph.from_filelist(config[match_image][inputfile_path] + args.input_file)

    # Apply SIFT to extract features
    cg.extract_features(method='sift', extractor_parameters={'nfeatures': 1000})
@@ -54,9 +54,9 @@ def match_images(args):
    cnet = cg.to_cnet(clean_keys=['subpixel'], isis_serials=True)

    filelist = cg.to_filelist()
    write_filelist(filelist, args.output_file + '.lis')
    write_filelist(filelist, config[match_image][outputfile] + args.output_file + '.lis')

    to_isis(args.output_file + '.net', cnet, mode='wb', targetname='Moon')
    to_isis(config[match_image][outputfile] + args.output_file + '.net', cnet, mode='wb', targetname='Moon')

if __name__ == '__main__':
    config = read_config('/home/acpaquette/test.yml')