Commit 6a5a9c68 authored by jlaura's avatar jlaura
Browse files

Merge pull request #21 from kree/master 

documentation and other tweaks
parents f1983505 77b040cd

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ install: 
  - source activate test-env



  # Install the non-conda packages if required, requirements.txt duplicates are ignored

  - conda install -c https://conda.binstar.org/menpo opencv3

  - conda install -c https://conda.binstar.org/menpo opencv3=3.0.0

  - conda install -c osgeo proj4

  - pip install -r requirements.txt

  - pip install coverage

autocnet/fileio/io_json.py

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ def read_json(inputfile): 


    Returns

    =======

    jobs : list

           of dictionaries of jobs, one entry per image

    jobs : dict

           returns a dictionary 



    >>> inputs = readinputfile('testfiles/sampleinput.json')

    >>> k = inputs.keys()

autocnet/matcher/matcher.py

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class FlannMatcher(object): 
        Returns

        -------

        matched : dataframe

                  containing matched points with columns containg:

                  containing matched points with columns containing:

                  matched image name, query index, train index, and

                  descriptor distance

        """

functional_tests/test_two_image.py

+1 −1

File changed.

Contains only whitespace changes.