Changelog entries and args for rmtable ()HEADmaster

Added ChangeLog entries for all changes today; changed order of arguments
in rmtable () and accompanying documentation.

3 files changed, 20 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 453ba55..33cca3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2011-06-03  Joel James Adamson  <[email protected]>
+
+	* src/mating.c (rmtable): changed order of arguments so that array
+	comes first, then its length
+
+	* src/geno_func.c (ld_from_geno): did away with nloci argument; we
+	only need to pass in the length of arrays that we are passing in;
+	in this case we only need the number of genotypes; also changed
+	order of arguments so that array comes first and length comes next
+	(ld_sub_geno): added this function that calculates linkage
+	disequilibrium from a subset of the genome
+
+	* src/rec.c (rec_gen_table): did away with nloci argument; we only
+	need to pass in the length of arrays that we are passing in; in
+	this case we only need the number of genotypes; changed order of
+	arguments so that array comes first and length comes next as per
+	convention
+
 2010-12-17  Joel James Adamson  <[email protected]>
 
 	* configure.ac: changed version to "git"
diff --git a/doc/haploid.texi b/doc/haploid.texi
index 807110c..7475472 100644
--- a/doc/haploid.texi
+++ b/doc/haploid.texi
@@ -504,7 +504,7 @@ all new relative frequencies are found, @code{rec_mating} divides each
 new entry by the total sum of the new entries.
 @end deftypefn
 
-@deftypefn {Library Function} double ** rmtable (int geno, double * freq)
+@deftypefn {Library Function} double ** rmtable (double * freq, size_t geno)
 
 @code{rmtable} returns a mating table to reflect random mating,
 i.e. products of the entries in @var{freq}.  @var{geno} provides the
diff --git a/src/mating.c b/src/mating.c
index fb322da..9a6a476 100644
--- a/src/mating.c
+++ b/src/mating.c
@@ -35,7 +35,7 @@
 #include <math.h>
 
 double **
-rmtable (size_t geno, double * freq)
+rmtable (double * freq, size_t geno)
 {
   /* random mating table */
   double ** table = malloc (geno * sizeof (double *));