greenelab / staNMF

A python implementation of Stability NMF
BSD 3-Clause "New" or "Revised" License
6 stars 3 forks source link

Adding folder clearing function to staNMF.py, adjusting staNMF.py #11

Closed amyecampbell closed 7 years ago

amyecampbell commented 7 years ago

In this pull request (to be followed with one with cluster driving scripts), I add the ClearDirectory() method to fulfill the enhancement suggested by @gwaygenomics, and update staNMF.py to allow it to be more easily parallelized. I do so with the following changes:

amyecampbell commented 7 years ago

@dhimmel @gwaygenomics how do I follow a new pull request for the newest script? would I have had to merge this one first, then file a new one for the driver script I added?

dhimmel commented 7 years ago

@dhimmel @gwaygenomics how do I follow a new pull request for the newest script? would I have had to merge this one first, then file a new one for the driver script I added?

You can have multiple open pull requests at once. You need to use branches. It's easiest if the pull requests don't modify the same files and especially the same lines within the same file.

amyecampbell commented 7 years ago

@dhimmel ok, so If I've already pushed a commit with the staNMF_driver.py script, I can branch that and file a PR on it? Or do I have to first pull a branch from the repo, push the driver script to it, and then file a PR on that?

dhimmel commented 7 years ago

ok, so If I've already pushed a commit with the staNMF_driver.py script, I can branch that and file a PR on it?

If you create a branch from amyecampbell:master (which has your commit a185ff909590cf004a1d6cd65cfd39d3fc624319 that added staNMF_driver.py) and create a pull request from the branch, that pull request will be identical to this one.

What you probably want is to create a branch from the latest commit in greenelab:master and then cherry pick a185ff909590cf004a1d6cd65cfd39d3fc624319. This way the two pull requests will be independent.

However, note the branch names will get confusing. I never make commits directly to my master branch. Instead I fast forward my master branch to match the upstream master. Since you based this pull request off your master, things will be a bit more confusing.

Maybe we should wait until Monday. It may help for you to familiarize yourself with https://gist.github.com/Chaser324/ce0505fbed06b947d962.