diff --git a/CHANGES b/CHANGES index 0c3d711..a3ca5c8 100644 --- a/CHANGES +++ b/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 + diff --git a/DESCRIPTION b/DESCRIPTION index 0f0cc43..5697484 100644 --- a/DESCRIPTION +++ b/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 Maintainer: Charles C. Berry diff --git a/R/lapadj.s b/R/lapadj.s index 8097936..2a32ada 100644 --- a/R/lapadj.s +++ b/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 diff --git a/R/swapbc1.c.s b/R/swapbc1.c.s index 7d0d86e..b3fb1fd 100644 --- a/R/swapbc1.c.s +++ b/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)) diff --git a/R/swapf2.c.s b/R/swapf2.c.s index 13f259a..4a5c020 100644 --- a/R/swapf2.c.s +++ b/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)) diff --git a/R/twohkbc1.s b/R/twohkbc1.s index 69d3ff6..909ff43 100644 --- a/R/twohkbc1.s +++ b/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) diff --git a/R/twohkf2.s b/R/twohkf2.s index cb699ef..004787b 100644 --- a/R/twohkf2.s +++ b/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) diff --git a/R/version.bqtl.R b/R/version.bqtl.R index 0c22e44..6f4c239 100644 --- a/R/version.bqtl.R +++ b/R/version.bqtl.R @@ -1 +1 @@ -version.bqtl<-"Version:1.0-12" +version.bqtl<-"Version:1.0-13" diff --git a/data/00Index b/data/00Index deleted file mode 100644 index 87a2a21..0000000 --- a/data/00Index +++ /dev/null @@ -1,9 +0,0 @@ -little.ana.bc A simulated dataset -little.ana.f2 A simulated dataset -little.bc.markers Simulated Marker Data -little.bc.pheno Simulated Phenotype Data -little.dx Marker Map Description for Simulated Data -little.f2.markers Simulated Marker Data -little.f2.pheno Simulated Phenotype Data -little.map.frame Package of Simulated Marker Map Information -little.mf.5 Package of Simulated Marker Map Information diff --git a/man/swapbc1.Rd b/man/swapbc1.Rd index 60a8ea8..4c4f49b 100644 --- a/man/swapbc1.Rd +++ b/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{