Commit 7b5ea872 authored by Adam Paquette's avatar Adam Paquette
Browse files

merging

parent 4ad0c57e

autocnet/graph/network.py

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ class CandidateGraph(nx.Graph): 
            with open(filelist, 'r') as f:

                filelist = f.readlines()

                filelist = map(str.rstrip, filelist)

                print(list(filelist))



        # TODO: Reject unsupported file formats + work with more file formats

bin/image_match.py

+5 −9
Original line number Diff line number Diff line
@@ -13,10 +13,8 @@ def parse_arguments(): 
    parser = argparse.ArgumentParser()

    parser.add_argument('-i', action='store', dest='input_file', default='No_Input', help='Provide the name of the file list/adjacency list')

    parser.add_argument('-o', action='store', dest='output_file', help='Provide the name of the output file')

    parser.add_argument('-l', '--list', nargs='*', dest='list', default=[], required=False)

    args = parser.parse_args()

    print(args)

    print(len(args.list))



    return args
@@ -25,12 +23,10 @@ def match_images(args): 


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

    # produces two files usable in isis

    if len(args.list) > 1:

        cg = CandidateGraph.from_filelist(args.list)

    else:

    try:

        cg = CandidateGraph.from_adjacency(args.input_file, basepath='/home/acpaquette/Desktop/')

    except:

        print('here')

        cg = CandidateGraph.from_filelist(args.input_file)



    # Apply SIFT to extract features