Skip to content

Commit

Permalink
fixed incorrect dir path in buildignore. Exported 2 functions.
Browse files Browse the repository at this point in the history
  • Loading branch information
kohleth committed Jan 21, 2016
1 parent 8107be8 commit 6447e7b
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
^.*\.Rproj$
^\.Rproj\.user$
.\temp
.\test
^\./test$
^\./temp$
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# Generated by roxygen2: do not edit by hand

export(fitCReml)
export(recl)
3 changes: 2 additions & 1 deletion R/fitCReml.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
#' @param init named vector of initial value for optimiation of \code{recl}. Must (at least) contain named elements \emph{sigma2} and \emph{phi}. Can also contain \emph{nugget} and \emph{kappa}.
#' @param poinstj A list of row numbers that indicates which row belongs to block j (block j is itself a union of block k and block l). See Details.
#' @param pointsjpair A list of pair integers from \code{1} to \code{length(pointsj)}. Each pair indicates which pairs of \code{pointjs} components should be bundled together in the variance calculation. See Details.
#' @param pointsk
#' @param pointsk not used.
#' @param cov.model character string that specifies the spatial covariance model. See \code{?geoR::cov.spatial}
#' @param lower Numeric vector of lower bound for the estimating parameters. Default to NULL (no lower bound).
#'
#' @export


fitCReml=function(form,data,dS,coordsMat,init,pointsj,pointsjpair,pointsk,cov.model=cov.model,lower=NULL){
Expand Down
2 changes: 2 additions & 0 deletions R/recl.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#' @param Xmat the design matrix (not the data.frame)
#' @param pointsj A list. Each list contains the row number of the data matrix (Y or Xmat or coordsMat) that correspond to the (k,l) block.
#' @param cov.model This is passed to \code{geoR::cov.spatial}
#'
#' @export

recl=function(theta,coordsMat,Y,Xmat,pointsj,cov.model="exp",...){
if(length(unique(c(nrow(coordsMat),length(Y),nrow(Xmat))))>1)stop("coordsMat, Y, and X must be of the same length (or have the same number of rows).")
Expand Down
12 changes: 12 additions & 0 deletions man/calcAB.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions man/dSdtausq.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion man/fitCReml.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions man/grHs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions man/summary.spCReml.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6447e7b

Please sign in to comment.