Merge branch 'dev' of github.com:stschiff/msmc into dev

stschiff · Feb 23, 2018 · 4e58918 · 4e58918
2 parents 32fc109 + 570f59e
commit 4e58918
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Set this variable to your static gsl libraries
-# GSL = /usr/local/lib/libgsl.a /usr/local/lib/libgslcblas.a
-GSL=/usr/local/lib/libgsl.a /usr/local/lib/libgslcblas.a
+GSL = /usr/lib/libgsl.a /usr/lib/libgslcblas.a
+# GSL=/usr/local/lib/libgsl.a /usr/local/lib/libgslcblas.a
 
 build/msmc : model/*.d powell.d brent.d maximization_step.d expectation_step.d msmc.d branchlength.d logger.d
 	dmd -O ${GSL} -odbuild -ofbuild/msmc $^

diff --git a/msmc.d b/msmc.d
@@ -81,6 +81,9 @@ auto helpString = format("This is MSMC Version %s. Usage: msmc [options] <datafi
     -R, --fixedRecombination : keep recombination rate fixed [recommended, but not set by default]
     -I, --indices: indices (comma-separated) of alleles in the data file to run over
     -s, --skipAmbiguous: skip sites with ambiguous phasing. Recommended for gene flow analysis
+    --unboundedCrossCoal: do not bound the relative cross coalescence rate to be <=1.
+    --loBoundLambda: Give a lower bound for lambda rates (default=0)
+    --hiBoundLambda: Give an upper bound for lambda rates (default=infinity)
     -h, --help: show this message", versionString);
 
 void main(string[] args) {