Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cpp code #84

Merged
merged 5 commits into from
Oct 12, 2018
Merged

Add cpp code #84

merged 5 commits into from
Oct 12, 2018

Conversation

molpopgen
Copy link
Collaborator

  1. Add the code from my repo
  2. Add a README for this repo

Copy link
Collaborator

@jeromekelleher jeromekelleher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me!

@@ -0,0 +1,32 @@
# To get msprime integration working:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe drop this file?

conda config --add channels bioconda
conda config --add channels conda-forge
conda install gcc fwdpy11==0.1.4 msprime==0.5.0 pybind11==2.2.1 pandas
git clone https://github.com/molpopgen/fwdpy11_arg_example
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete next two lines, right?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or at least, the clone and 'cd' are now redundant. Could say at the start to make sure CWD is where this readme is.

@petrelharp
Copy link
Owner

Looks good! We should perhaps explicitly clarify that the example actually does need msprime 0.5.0 to run, and some minor changes would be needed to run with the current version: I just tested it with a more recent version and got

    trees.dump_tables(nodes=self.__nodes, edges=self.__edges)
TypeError: dump_tables() got an unexpected keyword argument 'nodes'

How about

**Note:** This code uses msprime version 0.5.0 (installed in the example below using conda). To make it work with a more recent msprime version, some minor changes would be needed.

@molpopgen
Copy link
Collaborator Author

molpopgen commented Oct 11, 2018 via email

@ashander
Copy link
Collaborator

Looks good to me. Thanks Kevin!

@petrelharp
Copy link
Owner

Rad; thanks.

@petrelharp petrelharp merged commit ecdcf45 into petrelharp:master Oct 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants