Commit 8db9b16c authored by kberry's avatar kberry
Browse files

merge with upstream

parents d620de29 ca7a5527

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -67,3 +67,8 @@ target/ 


# Vim

*.swp



#Data and output files

.csv

.png

.SAV
 
 No newline at end of file

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ install: 
  - conda info -a



  # Create a virtual env and install dependencies

  - conda create -y -q -n test-env python=$TRAVIS_PYTHON_VERSION nose numpy pillow scipy pandas networkx scikit-image sqlalchemy

  - conda create -y -q -n test-env python=$TRAVIS_PYTHON_VERSION nose numpy pillow scipy pandas networkx scikit-image sqlalchemy numexpr dill

  # Activate the env

  - source activate test-env

autocnet/examples/Apollo15/adjacency.json

+24 −24
Original line number Diff line number Diff line 
{"autocnet/examples/Apollo15/AS15-M-0297_SML.png"

 : ["autocnet/examples/Apollo15/AS15-M-0298_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0300_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0299_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0296_SML.png"],

 "autocnet/examples/Apollo15/AS15-M-0300_SML.png"

 : ["autocnet/examples/Apollo15/AS15-M-0298_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0297_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0299_SML.png"],

 "autocnet/examples/Apollo15/AS15-M-0299_SML.png"

 : ["autocnet/examples/Apollo15/AS15-M-0298_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0297_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0300_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0296_SML.png"],

 "autocnet/examples/Apollo15/AS15-M-0295_SML.png"

{"AS15-M-0297_SML.png"

 : ["AS15-M-0298_SML.png",

    "AS15-M-0300_SML.png",

    "AS15-M-0299_SML.png",

    "AS15-M-0296_SML.png"],

 "AS15-M-0300_SML.png"

 : ["AS15-M-0298_SML.png",

    "AS15-M-0297_SML.png",

    "AS15-M-0299_SML.png"],

 "AS15-M-0299_SML.png"

 : ["AS15-M-0298_SML.png",

    "AS15-M-0297_SML.png",

    "AS15-M-0300_SML.png",

    "AS15-M-0296_SML.png"],

 "AS15-M-0295_SML.png"

 : [], 

 "autocnet/examples/Apollo15/AS15-M-0296_SML.png"

 : ["autocnet/examples/Apollo15/AS15-M-0298_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0297_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0299_SML.png"],

 "autocnet/examples/Apollo15/AS15-M-0298_SML.png"

 : ["autocnet/examples/Apollo15/AS15-M-0297_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0300_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0299_SML.png",

    "autocnet/examples/Apollo15/AS15-M-0296_SML.png"]}
 
 "AS15-M-0296_SML.png"

 : ["AS15-M-0298_SML.png",

    "AS15-M-0297_SML.png",

    "AS15-M-0299_SML.png"],

 "AS15-M-0298_SML.png"

 : ["AS15-M-0297_SML.png",

    "AS15-M-0300_SML.png",

    "AS15-M-0299_SML.png",

    "AS15-M-0296_SML.png"]}

autocnet/examples/Apollo15/three_image_adjacency.json

+2 −2
Original line number Diff line number Diff line 
{"AS15-M-0297_SML.png": ["AS15-M-0298_SML.png", "AS15-M-0299_SML.png"],

"AS15-M-0298_SML.png": ["AS15-M-0297_SML.png", "AS15-M-0299_SML.png"],

"AS15-M-0299_SML.png": ["AS15-M-0297_SML.png", "AS15-M-0298_SML.png"]}
 
"AS15-M-0298_SML.png": ["AS15-M-0299_SML.png", "AS15-M-0297_SML.png"],

"AS15-M-0299_SML.png": ["AS15-M-0298_SML.png", "AS15-M-0297_SML.png"]}

autocnet/fileio/header_parser.py

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

"""

Created on Tue Nov 24 13:35:56 2015



@author: rbanderson

"""



def header_parser(row,delim):

    #get rid of various unwanted characters

    badlist=['#','^',"'",'*']

    for i in badlist:

        row=row.replace(i,'')

    row.strip()   



    if delim in row:    

        tmp=row.split(delim)

        label=tmp[0].strip().lower().replace('  ','_').replace(' ','_')

        data=row.split(tmp[0]+delim)[1].strip() 

        headinfo={label:data}

    else:

        headinfo={}

    return headinfo
 
 No newline at end of file