search

ContextLab / quail

A python toolbox for analyzing and plotting free recall data
http://cdl-quail.readthedocs.io/en/latest/
MIT License
20 stars 10 forks source link

added metadata behavior for stacking eggs #68

Closed paxtonfitzpatrick closed 7 years ago

paxtonfitzpatrick commented 7 years ago

new keyword argument meta added to stack_eggs function default is meta='concatenate two possibilities: 'concatenate' and separate meta='separate' creates the meta data for the new egg as a list of dictionaries of meta data from the eggs to be stacked, in the order they are stacked meta='concatenate' combines meta data dictionaries for shared keys, and adds non-shared keys to meta data dictionary separately

andrewheusser commented 7 years ago

@paxtonfitzpatrick code looks great! somehow, a folder called 'build' and an ipython checkpoint made it into this PR. Before I merge this, we'll want to remove those files. The only file that should be included in this PR is the helpers.py file. I think you can ammend the commit following the example below:

# Edit helpers.py
git add .
git commit
# Realize you uploaded some extra files, delete (or temporarily remove) the files 
git add .
git commit --amend --no-edit

You can do this right on the new branch you made and it should update the PR