version 1.0-13

CHANGES

@@ -94,3 +94,9 @@ add src/Makevars for BLAS usage
 
 Version: 1.0-12
 R_Ext/Mathlib.h is deprecated - change to Rmath.h
+
+----------------------------------------
+
+Version: 1.0-13
+CoDoc updates, .C( ..., PACKAGE= ) discipline
+

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: bqtl
-Version: 1.0-12
-Date: 2003-16-09
+Version: 1.0-13
+Date: 2004-03-26
 Title: Bayesian QTL mapping toolkit 
 Author: Charles C. Berry <cberry@ucsd.edu>
 Maintainer: Charles C. Berry <cberry@ucsd.edu>

R/lapadj.s

@@ -293,7 +293,8 @@ function(reg.formula, ana.obj,
               postApprox = double(1),
               iter = as.integer(iter),
               tol = as.double(tol),
-              nem = as.integer(nem))
+              nem = as.integer(nem),
+              PACKAGE="bqtl")
       if ( (z$postApprox==0) && (z$hkApprox==0))
         adj <- 1.0
       else

R/swapbc1.c.s

@@ -105,7 +105,8 @@
             postwk=double(nopt),
             coefwk=double(nopt*nmax),
             alt.marginal=double(nopt),
-            alt.coef=double(nrx))
+            alt.coef=double(nrx),
+            PACKAGE="bqtl" )
     res <- z[c("configs","posteriors","coefs","cond","marg",
                "alt.marginal","alt.coef")]
     res$configs <- array(res$configs+1,c(nmax,nlocs,nreps))

R/swapf2.c.s

@@ -114,7 +114,8 @@
             postwk=double(nopt),
             coefwk=double(nopt*nmax),
             alt.marginal=double(nopt),
-            alt.coef=double(nrx))
+            alt.coef=double(nrx),
+            PACKAGE="bqtl" )
 
     res <- z[c("configs","posteriors","coefs","cond","marg","alt.marginal","alt.coef")]
     res$configs <- array(res$configs+1,c(nmax,nlocs,nreps))

R/twohkbc1.s

@@ -75,7 +75,7 @@
               qraux =double(nmax),
               zraux =double(nmax),
               zrank=integer(1),
-              tol=as.double(1e-10))[c("loc.2","loc.1","coefs.2","coefs.1")]
+              tol=as.double(1e-10), PACKAGE="bqtl" )[c("loc.2","loc.1","coefs.2","coefs.1")]
     dim(res$loc.2) <- c(nlocs,1)
     dim(res$loc.1) <- c(nlocs,1)
     dim(res$coefs.2) <- c(1,nlocs)

R/twohkf2.s

@@ -83,7 +83,7 @@
               qraux =double(nmax),
               zraux =double(nmax),
               zrank=integer(1),
-              tol=as.double(1e-10))[c("loc.2","loc.1","coefs.2","coefs.1")]
+              tol=as.double(1e-10), PACKAGE="bqtl" )[c("loc.2","loc.1","coefs.2","coefs.1")]
     dim(res$loc.2) <- c(nlocs,3)
     dim(res$loc.1) <- c(nlocs,3)
     dim(res$coefs.2) <- c(2,nlocs)

R/version.bqtl.R

@@ -1 +1 @@
-version.bqtl<-"Version:1.0-12"
+version.bqtl<-"Version:1.0-13"

man/swapbc1.Rd

@@ -9,8 +9,8 @@
   (backcross) designs and recombinant inbred lines.
 }
 \usage{
-swapbc1(varcov, invars, rparm, nreps, ana.obj, locs=seq(ncol(var.x)),
-locs.prior=rep(1, ncol(var.x)),tol=1e-10 )
+swapbc1(varcov, invars, rparm, nreps, ana.obj, locs=NULL,
+locs.prior=NULL, tol=1e-10 )
 
 }
 \arguments{