molpopgen / fwdpy

forward-time population genetic simulation in python
http://molpopgen.github.io/fwdpy/
GNU General Public License v3.0
18 stars 3 forks source link

Jss ESFS #1

Closed jsanjak closed 8 years ago

jsanjak commented 8 years ago

Hey Kevin,

Here is a pull request for the changes I have made so far. The reason is can’t auto merge is totally stupid. There are two conflicts. One is basically a space difference in the position of comment. The other is that I added make_GaussianDFE and make_ExponentialDFE myself. Git hub doesn’t seem to like it.

I could resolve the conflicts and commit to master, but I thought it best to allow you to make this decision. Also, maybe you don’t want to take the .cpp files.