version 1.0-29

cran · May 1, 2013 · a253c73 · a253c73
1 parent 81f9e37
commit a253c73
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/CHANGES b/CHANGES
@@ -176,3 +176,7 @@ fixed partial matches of args
 Version 1.0.28
 remove synopsis from Rd files
 
+-----------------------------------------
+
+Version 1.0.29
+fix memory access error in condreg.c
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: bqtl
-Version: 1.0-28
-Date: 2013-04-13
+Version: 1.0-29
+Date: 2013-04-30
 Title: Bayesian QTL mapping toolkit
 Author: Charles C. Berry <cberry@ucsd.edu>
 Maintainer: Charles C. Berry <cberry@ucsd.edu>
@@ -9,7 +9,7 @@ Description: QTL mapping toolkit for inbred crosses and recombinant
 Depends: R (>= 2.6.0)
 License: GPL (>= 2)
 URL: http://famprevmed.ucsd.edu/faculty/cberry/bqtl/
-Packaged: 2013-04-13 18:33:46 UTC; cberry
+Packaged: 2013-04-30 22:54:27 UTC; cberry
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2013-04-14 07:24:20
+Date/Publication: 2013-05-01 07:22:03
diff --git a/MD5 b/MD5
@@ -1,5 +1,5 @@
-9e24268005d3aa6e652b830ad0194f3c *CHANGES
-474e53c9e3ea390aab2411b4432fc951 *DESCRIPTION
+8fb667808895747aec7e76acd896089d *CHANGES
+8841ddbcd0d1c7317ee3ad1d9c39f18d *DESCRIPTION
 d55a7488d58470d86a039986b62b6451 *INDEX
 afa08f942babdaa7141b084ab35df607 *NAMESPACE
 cfff5211f481c6d8c261a88ab2ec7173 *R/add.s
@@ -110,8 +110,8 @@ c218cb643f39714530b8447394a5fa7f *man/varcov.Rd
 82dfbc505e1e88cf1edfcab48cbd30f5 *src/Makevars
 25aff088fcd39ca5df11c174599f3940 *src/bc1wt.c
 e51eba1e25e53309bfc0225ec05d4836 *src/conCk.c
-53ca60c0fc6196d722c9d0d8a2f27a8f *src/condreg.c
-b516edffabd30bba99eb0dcbf0aa2a7e *src/f2wt2.c
+f893faffb16a59c9485cd96c86f009fa *src/condreg.c
+ae3000e91ca117e2673175d230517147 *src/f2wt2.c
 d9cc0bdb295486cdae6dae678c569127 *src/hessup.f
 87c36ebebf9a29a65280eac731fb3ebe *src/hkreg.c
 46091ffaea7f17d3fb564e59e1a03b64 *src/lapWHL.c

diff --git a/src/condreg.c b/src/condreg.c
@@ -146,7 +146,7 @@ void condreg(double *varx, double *covxy, double *vary, double *df,
 	curcoefs = &coefs[imodel*(*optmax+*nin)];/* pt to coefs*/
 	curvars = &optvars[imodel**optmax];      /* pt to extra vars */
 
-	for (j=0; (j<*optmax) & (curvars[j] >= 0L) ;j++); /* neg vals ==> no entry*/
+	for (j=0; (j<*optmax) && (curvars[j] >= 0L) ;j++); /* neg vals ==> no entry*/
 	nvars = j;
 
 	vrload(varx,zz,curvars,curvars,&nvars,&nvars,nrx); /* regressor varmat */

diff --git a/src/f2wt2.c b/src/f2wt2.c
@@ -35,7 +35,7 @@ static void adj33(double a[3], double b[3], double lambda[1], double tab[9],
 
   MaxAdj = 2.0*tol[0]; MinAdj=0.0;
 
-  for (i=0 ; (i<maxIter[0])& (MaxAdj-MinAdj>tol[0]) ; i++) {
+  for (i=0 ; (i<maxIter[0]) && (MaxAdj-MinAdj>tol[0]) ; i++) {
 
     ColAdj = b[0]/ (tab[0]+tab[1]+tab[2]);
     MinAdj=ColAdj;