Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/WhatIsAnARG_workbook2.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
"import demesdraw\n",
"\n",
"try:\n",
" # This requires msprime >= 1.3.5, not yet on pyodide\n",
" # This requires msprime >= 1.4, not yet on pyodide\n",
" cmd, parameters = msprime.provenance.parse_provenance(arg.provenance(0), arg)\n",
" assert cmd == \"sim_ancestry\" # just check we have the right (zeroth) provenance entry\n",
"except ValueError:\n",
Expand Down
Binary file added content/data/msprime_param_hack.pkl
Binary file not shown.
2 changes: 1 addition & 1 deletion content/json/WhatIsAnARG/Workbook1/Q6.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"type": "many_choice",
"answers": [
{"answer": "green", "correct": true, "feedback": "Yes, the deepest divergences are African: in fact, even between the European genomes, some coalescences trace back into Africa"},
{"answer": "blue", "correct": false},
{"answer": "blue", "correct": false}
]
}]
8 changes: 4 additions & 4 deletions content/json/WhatIsAnARG/Workbook2/Q13.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
{"answer": "Green", "correct": true},
{"answer": "Blue", "correct": false},
{"answer": "Red", "correct": false},
{"answer": "Cyan", "correct": false},
{"answer": "Cyan", "correct": false}
]},{
"question": "What colour are partly-coalescent nodes in the graph above?",
"type": "many_choice",
"answers": [
{"answer": "Green", "correct": false},
{"answer": "Blue", "correct": true},
{"answer": "Red", "correct": false},
{"answer": "Cyan", "correct": false},
{"answer": "Cyan", "correct": false}
]},{
"question": "What colour are non-coalescent CA nodes in the graph above?",
"type": "many_choice",
"answers": [
{"answer": "Green", "correct": false},
{"answer": "Blue", "correct": false},
{"answer": "Red", "correct": false, "feedback": "Not quite: red nodes are indeed non-coalescent, but they are RE nodes"},
{"answer": "Cyan", "correct": true, "feedback": "Correct (the other non-coalescent nodes are the red RE nodes)"},
{"answer": "Cyan", "correct": true, "feedback": "Correct (the other non-coalescent nodes are the red RE nodes)"}
]},{
"question": "Are non-coalescent CA event nodes always above a diamond?",
"type": "many_choice",
"answers": [
{"answer": "No", "correct": true, "feedback": "Node 35 is not above a diamond, and it is non-coalescent in every local tree in which it is seen."},
{"answer": "Yes", "correct": false},
{"answer": "Yes", "correct": false}
]
}]
4 changes: 2 additions & 2 deletions content/json/WhatIsAnARG/Workbook2/Q16.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"type": "many_choice",
"answers": [
{"answer": "No", "correct": true},
{"answer": "Yes", "correct": false},
{"answer": "Yes", "correct": false}
]}, {
"question": "In the simplified ARG, do we know the order of the two coalescent events immediately below the root node 22",
"type": "many_choice",
"answers": [
{"answer": "No", "correct": true},
{"answer": "Yes", "correct": false},
{"answer": "Yes", "correct": false}
]}]
2 changes: 1 addition & 1 deletion content/json/WhatIsAnARG/Workbook2/Q21.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"answers": [
{"answer": "Yes: there is no change to the genetic data encoded", "correct": true},
{"answer": "No", "correct": false},
{"answer": "Sometimes", "correct": false},
{"answer": "Sometimes", "correct": false}
]
}]
2 changes: 1 addition & 1 deletion content/json/WhatIsAnARG/Workbook2/Q22.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
{"answer": "fwdpy11", "correct": false},
{"answer": "simuPOP", "correct": false},
{"answer": "scrm", "correct": false},
{"answer": "fastsimcoal2", "correct": false},
{"answer": "fastsimcoal2", "correct": false}
]
}]
2 changes: 1 addition & 1 deletion content/json/WhatIsAnARG/Workbook2/Q28.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"answers": [
{"answer": "central", "correct": true},
{"answer": "western", "correct": false},
{"answer": "bonobo", "correct": false},
{"answer": "bonobo", "correct": false}
]}, {
"question": "Does the diversity vary across the genome in any of the populations?",
"type": "many_choice",
Expand Down
2 changes: 1 addition & 1 deletion content/json/WhatIsAnARG/Workbook2/Q29.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"answers": [
{"answer": "The founding of the wester population at ~30,000 generations ago", "correct": true},
{"answer": "A sudden increase in the western population size", "correct": false},
{"answer": "A sudden drop in the central population size", "correct": false},
{"answer": "A sudden drop in the central population size", "correct": false}
]
}]
Loading