[Georob-commits] r7 - in pkg: R man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Jun 10 12:49:41 CEST 2013
Author: papritz
Date: 2013-06-10 12:49:41 +0200 (Mon, 10 Jun 2013)
New Revision: 7
Modified:
pkg/R/georob.S3methods.R
pkg/R/georob.exported.functions.R
pkg/R/georob.predict.R
pkg/R/georob.private.functions.R
pkg/man/georob.control.Rd
pkg/man/georobObject.Rd
Log:
error in predict.georob corrected, old names of flags for computing covariances restored
M pkg/R/georob.S3methods.R
M pkg/R/georob.predict.R
M pkg/R/georob.exported.functions.R
M pkg/R/georob.private.functions.R
M pkg/man/georob.control.Rd
M pkg/man/georobObject.Rd
Modified: pkg/R/georob.S3methods.R
===================================================================
--- pkg/R/georob.S3methods.R 2013-06-06 13:28:13 UTC (rev 6)
+++ pkg/R/georob.S3methods.R 2013-06-10 10:49:41 UTC (rev 7)
@@ -229,8 +229,8 @@
cov.bhat = TRUE, full.cov.bhat = FALSE,
cov.betahat = FALSE,
cov.bhat.betahat = FALSE,
- cov.deltabhat = FALSE, full.cov.deltabhat = FALSE,
- cov.deltabhat.betahat = FALSE,
+ cov.delta.bhat = FALSE, full.cov.delta.bhat = FALSE,
+ cov.delta.bhat.betahat = FALSE,
cov.ehat = FALSE, full.cov.ehat = FALSE,
cov.ehat.p.bhat = FALSE, full.cov.ehat.p.bhat = FALSE,
aux.cov.pred.target = FALSE,
@@ -425,8 +425,8 @@
cov.bhat = FALSE, full.cov.bhat = FALSE,
cov.betahat = FALSE,
cov.bhat.betahat = FALSE,
- cov.deltabhat = FALSE, full.cov.deltabhat = FALSE,
- cov.deltabhat.betahat = FALSE,
+ cov.delta.bhat = FALSE, full.cov.delta.bhat = FALSE,
+ cov.delta.bhat.betahat = FALSE,
cov.ehat = level == 1, full.cov.ehat = FALSE,
cov.ehat.p.bhat = level == 0, full.cov.ehat.p.bhat = FALSE,
aux.cov.pred.target = FALSE,
Modified: pkg/R/georob.exported.functions.R
===================================================================
--- pkg/R/georob.exported.functions.R 2013-06-06 13:28:13 UTC (rev 6)
+++ pkg/R/georob.exported.functions.R 2013-06-10 10:49:41 UTC (rev 7)
@@ -368,9 +368,9 @@
cov.bhat = control$cov.bhat, full.cov.bhat = control$full.cov.bhat,
cov.betahat = control$cov.betahat,
cov.bhat.betahat = control$cov.bhat.betahat,
- cov.deltabhat = control$cov.deltabhat,
- full.cov.deltabhat = control$full.cov.deltabhat,
- cov.deltabhat.betahat = control$cov.deltabhat.betahat,
+ cov.delta.bhat = control$cov.delta.bhat,
+ full.cov.delta.bhat = control$full.cov.delta.bhat,
+ cov.delta.bhat.betahat = control$cov.delta.bhat.betahat,
cov.ehat = control$cov.ehat, full.cov.ehat = control$full.cov.ehat,
cov.ehat.p.bhat = control$cov.ehat.p.bhat, full.cov.ehat.p.bhat = control$full.cov.ehat.p.bhat,
aux.cov.pred.target = control$aux.cov.pred.target,
@@ -433,9 +433,9 @@
cov.bhat = control$cov.bhat, full.cov.bhat = control$full.cov.bhat,
cov.betahat = control$cov.betahat,
cov.bhat.betahat = control$cov.bhat.betahat,
- cov.deltabhat = control$cov.deltabhat,
- full.cov.deltabhat = control$full.cov.deltabhat,
- cov.deltabhat.betahat = control$cov.deltabhat.betahat,
+ cov.delta.bhat = control$cov.delta.bhat,
+ full.cov.delta.bhat = control$full.cov.delta.bhat,
+ cov.delta.bhat.betahat = control$cov.delta.bhat.betahat,
cov.ehat = control$cov.ehat, full.cov.ehat = control$full.cov.ehat,
cov.ehat.p.bhat = control$cov.ehat.p.bhat, full.cov.ehat.p.bhat = control$full.cov.ehat.p.bhat,
aux.cov.pred.target = control$aux.cov.pred.target,
@@ -520,8 +520,8 @@
cov.bhat = FALSE, full.cov.bhat = FALSE,
cov.betahat = TRUE,
cov.bhat.betahat = FALSE,
- cov.deltabhat = TRUE, full.cov.deltabhat = TRUE,
- cov.deltabhat.betahat = TRUE,
+ cov.delta.bhat = TRUE, full.cov.delta.bhat = TRUE,
+ cov.delta.bhat.betahat = TRUE,
cov.ehat = TRUE, full.cov.ehat = FALSE,
cov.ehat.p.bhat = FALSE, full.cov.ehat.p.bhat = FALSE,
aux.cov.pred.target = FALSE,
@@ -569,10 +569,10 @@
## should be computed
## cov.bhat.betahat logical, flag controlling whether the covariance matrix of
## bhat and betahat should be computed
- ## cov.deltabhat logical, flag controlling whether the covariances of z-bhat should be computed
- ## full.cov.deltabhat logical, flag controlling whether the full covariance matrix of z-bhat
+ ## cov.delta.bhat logical, flag controlling whether the covariances of z-bhat should be computed
+ ## full.cov.delta.bhat logical, flag controlling whether the full covariance matrix of z-bhat
## is computed (TRUE) or only the diagonal elements (FALSE)
- ## cov.deltabhat.betahat logical, flag controlling whether the covariance matrix of z-bhat
+ ## cov.delta.bhat.betahat logical, flag controlling whether the covariance matrix of z-bhat
## and betahat should be computed
## cov.ehat logical, flag controlling whether the covariances of the resdiuals should be computed
## full.cov.ehat logical, flag controlling whether the full covariance matrix of the residuals
@@ -621,8 +621,8 @@
cov.bhat = cov.bhat, full.cov.bhat = full.cov.bhat,
cov.betahat = cov.betahat,
cov.bhat.betahat = cov.bhat.betahat,
- cov.deltabhat = cov.deltabhat, full.cov.deltabhat = full.cov.deltabhat,
- cov.deltabhat.betahat = cov.deltabhat.betahat,
+ cov.delta.bhat = cov.delta.bhat, full.cov.delta.bhat = full.cov.delta.bhat,
+ cov.delta.bhat.betahat = cov.delta.bhat.betahat,
cov.ehat = cov.ehat, full.cov.ehat = full.cov.ehat,
cov.ehat.p.bhat = cov.ehat.p.bhat, full.cov.ehat.p.bhat = full.cov.ehat.p.bhat,
aux.cov.pred.target = aux.cov.pred.target,
Modified: pkg/R/georob.predict.R
===================================================================
--- pkg/R/georob.predict.R 2013-06-06 13:28:13 UTC (rev 6)
+++ pkg/R/georob.predict.R 2013-06-10 10:49:41 UTC (rev 7)
@@ -93,7 +93,7 @@
locations.coords, betahat, bhat,
pred.X, pred.coords, newdata,
variogram.model, param, aniso,
- cov.deltabhat.betahat.l, cov.betahat.l, cov.bhat.betahat, cov.p.t, Valpha.objects,
+ cov.delta.bhat.betahat.l, cov.betahat.l, cov.bhat.betahat, cov.p.t, Valpha.objects,
pwidth, pheight, napp,
signif,
extended.output, full.covmat
@@ -385,8 +385,8 @@
## compute uk variance (= (co-)variance of prediction errors)
aux <- cbind(
- gammaValphai %*% cov.deltabhat.betahat.l[1:n, 1:n] - pred.X[!ex, , drop = FALSE ] %*% cov.deltabhat.betahat.l[-(1:n), 1:n],
- - pred.X[!ex, , drop = FALSE ] %*% cov.deltabhat.betahat.l[-(1:n), -(1:n)]
+ gammaValphai %*% cov.delta.bhat.betahat.l[1:n, 1:n] - pred.X[!ex, , drop = FALSE ] %*% cov.delta.bhat.betahat.l[-(1:n), 1:n],
+ - pred.X[!ex, , drop = FALSE ] %*% cov.delta.bhat.betahat.l[-(1:n), -(1:n)]
)
if( full.covmat ){
@@ -630,16 +630,16 @@
## if needed compute missing covariance matrices
cov.betahat <- is.null( object[["cov"]][["cov.betahat"]] )
- cov.deltabhat <- is.null( object[["cov"]][["cov.deltabhat"]] ) ||
- !is.matrix( object[["cov"]][["cov.deltabhat"]] )
- cov.deltabhat.betahat <- is.null( object[["cov"]][["cov.deltabhat.betahat"]] )
+ cov.delta.bhat <- is.null( object[["cov"]][["cov.delta.bhat"]] ) ||
+ !is.matrix( object[["cov"]][["cov.delta.bhat"]] )
+ cov.delta.bhat.betahat <- is.null( object[["cov"]][["cov.delta.bhat.betahat"]] )
cov.bhat <- extended.output & (
is.null( object[["cov"]]$cov.bhat ) || !is.matrix( object[["cov"]]$cov.bhat )
)
cov.bhat.betahat <- extended.output & is.null( object[["cov"]]$cov.bhat.betahat )
cov.p.t <- extended.output & is.null( object[["cov"]]$aux.cov.pred.target )
- if( any( c( cov.betahat, cov.deltabhat, cov.deltabhat.betahat,
+ if( any( c( cov.betahat, cov.delta.bhat, cov.delta.bhat.betahat,
extended.output & ( cov.bhat || cov.bhat.betahat || cov.p.t )
)
)
@@ -676,8 +676,8 @@
cov.bhat = cov.bhat, full.cov.bhat = cov.bhat,
cov.betahat = cov.betahat,
cov.bhat.betahat = cov.bhat.betahat,
- cov.deltabhat = cov.deltabhat, full.cov.deltabhat = cov.deltabhat,
- cov.deltabhat.betahat = cov.deltabhat.betahat,
+ cov.delta.bhat = cov.delta.bhat, full.cov.delta.bhat = cov.delta.bhat,
+ cov.delta.bhat.betahat = cov.delta.bhat.betahat,
cov.ehat = FALSE, full.cov.ehat = FALSE,
cov.ehat.p.bhat = FALSE, full.cov.ehat.p.bhat = FALSE,
aux.cov.pred.target = cov.p.t,
@@ -691,9 +691,9 @@
if( is.null( object[["cov"]] ) ) object[["cov"]] <- list()
if( cov.betahat ) object[["cov"]][["cov.betahat"]] <- r.cov[["cov.betahat"]]
- if( cov.deltabhat ) object[["cov"]][["cov.delta"]] <- r.cov[["cov.delta"]]
- if( cov.deltabhat.betahat ) object[["cov"]][["cov.deltabhat.betahat"]] <-
- r.cov[["cov.deltabhat.betahat"]]
+ if( cov.delta.bhat ) object[["cov"]][["cov.delta.bhat"]] <- r.cov[["cov.delta.bhat"]]
+ if( cov.delta.bhat.betahat ) object[["cov"]][["cov.delta.bhat.betahat"]] <-
+ r.cov[["cov.delta.bhat.betahat"]]
if( extended.output && cov.bhat ) object[["cov"]][["cov.bhat"]] <- r.cov[["cov.bhat"]]
if( extended.output && cov.bhat.betahat ) object[["cov"]][["cov.bhat.betahat"]] <-
r.cov[["cov.bhat.betahat"]]
@@ -704,24 +704,23 @@
## compute lower cholesky factor of covariance matrix of delta = (b -
## bhat) and betahat - beta
-
- cov.deltabhat.betahat.l <- try(
+ cov.delta.bhat.betahat.l <- try(
t(
chol(
rbind(
cbind(
- object[["cov"]][["cov.delta"]],
- object[["cov"]][["cov.deltabhat.betahat"]]
+ object[["cov"]][["cov.delta.bhat"]],
+ object[["cov"]][["cov.delta.bhat.betahat"]]
),
cbind(
- t( object[["cov"]][["cov.deltabhat.betahat"]] ),
+ t( object[["cov"]][["cov.delta.bhat.betahat"]] ),
object[["cov"]][["cov.betahat"]]
)
)
)
), silent = TRUE
)
- if( identical( class( cov.deltabhat.betahat.l ), "try-error" ) ) stop(
+ if( identical( class( cov.delta.bhat.betahat.l ), "try-error" ) ) stop(
"covariance matrix of kriging errors 'b-bhat' and 'betahat' not positive definite"
)
@@ -890,8 +889,8 @@
},
signal = { ## signal
aux <- cbind(
- cov.deltabhat.betahat.l[1:n,1:n] - X %*% cov.deltabhat.betahat.l[-(1:n),1:n],
- - X %*% cov.deltabhat.betahat.l[-(1:n),-(1:n)]
+ cov.delta.bhat.betahat.l[1:n,1:n] - X %*% cov.delta.bhat.betahat.l[-(1:n),1:n],
+ - X %*% cov.delta.bhat.betahat.l[-(1:n),-(1:n)]
)
aux <- aux[object[["Tmat"]], , drop = FALSE]
if( full.covmat ){
@@ -1137,7 +1136,7 @@
locations.coords, betahat, bhat,
pred.X, pred.coords, newdata,
variogram.model, param, aniso,
- cov.deltabhat.betahat.l, cov.betahat.l, cov.bhat.betahat, cov.p.t, Valpha.objects,
+ cov.delta.bhat.betahat.l, cov.betahat.l, cov.bhat.betahat, cov.p.t, Valpha.objects,
pwidth, pheight, napp,
signif,
extended.output, full.covmat,
@@ -1164,7 +1163,7 @@
bhat = bhat,
pred.X = pred.X, pred.coords = pred.coords, newdata = newdata,
variogram.model = variogram.model, param = param, aniso = aniso,
- cov.deltabhat.betahat.l = cov.deltabhat.betahat.l,
+ cov.delta.bhat.betahat.l = cov.delta.bhat.betahat.l,
cov.betahat.l = cov.betahat.l,
cov.bhat.betahat = cov.bhat.betahat,
cov.p.t = cov.p.t,
@@ -1205,7 +1204,7 @@
variogram.model = object[["variogram.model"]],
param = object[["param"]],
aniso = object[["aniso"]],
- cov.deltabhat.betahat.l = cov.deltabhat.betahat.l,
+ cov.delta.bhat.betahat.l = cov.delta.bhat.betahat.l,
cov.betahat.l = cov.betahat.l,
cov.bhat.betahat = cov.bhat.betahat,
cov.p.t = cov.p.t,
@@ -1235,7 +1234,7 @@
variogram.model = object[["variogram.model"]],
param = object[["param"]],
aniso = object[["aniso"]],
- cov.deltabhat.betahat.l = cov.deltabhat.betahat.l,
+ cov.delta.bhat.betahat.l = cov.delta.bhat.betahat.l,
cov.betahat.l = cov.betahat.l,
cov.bhat.betahat = cov.bhat.betahat,
cov.p.t = cov.p.t,
@@ -1264,7 +1263,7 @@
variogram.model = object[["variogram.model"]],
param = object[["param"]],
aniso = object[["aniso"]],
- cov.deltabhat.betahat.l = cov.deltabhat.betahat.l,
+ cov.delta.bhat.betahat.l = cov.delta.bhat.betahat.l,
cov.betahat.l = cov.betahat.l,
cov.bhat.betahat = cov.bhat.betahat,
cov.p.t = cov.p.t,
Modified: pkg/R/georob.private.functions.R
===================================================================
--- pkg/R/georob.private.functions.R 2013-06-06 13:28:13 UTC (rev 6)
+++ pkg/R/georob.private.functions.R 2013-06-10 10:49:41 UTC (rev 7)
@@ -16,8 +16,8 @@
cov.bhat, full.cov.bhat,
cov.betahat,
cov.bhat.betahat,
- cov.deltabhat, full.cov.deltabhat,
- cov.deltabhat.betahat,
+ cov.delta.bhat, full.cov.delta.bhat,
+ cov.delta.bhat.betahat,
cov.ehat, full.cov.ehat,
cov.ehat.p.bhat, full.cov.ehat.p.bhat,
aux.cov.pred.target,
@@ -58,20 +58,20 @@
cov.betahat.b <- FALSE
cov.betahat.e <- FALSE
- if( any( c( cov.deltabhat, aux.cov.pred.target ))) cov.bhat.b <- TRUE
+ if( any( c( cov.delta.bhat, aux.cov.pred.target ))) cov.bhat.b <- TRUE
if( any( c( cov.ehat, aux.cov.pred.target ))) cov.bhat.e <- TRUE
- if( any( c( cov.deltabhat.betahat, cov.ehat.p.bhat, aux.cov.pred.target ))) cov.betahat.b <- TRUE
+ if( any( c( cov.delta.bhat.betahat, cov.ehat.p.bhat, aux.cov.pred.target ))) cov.betahat.b <- TRUE
if( any( c( cov.ehat, cov.ehat.p.bhat, aux.cov.pred.target ))) cov.betahat.e <- TRUE
if( any( c( cov.ehat, cov.ehat.p.bhat ) ) ) cov.betahat <- TRUE
- if( any( c( cov.deltabhat, cov.deltabhat.betahat ))){
+ if( any( c( cov.delta.bhat, cov.delta.bhat.betahat ))){
cov.bhat <- TRUE
- if( full.cov.deltabhat ) full.cov.bhat <- TRUE
+ if( full.cov.delta.bhat ) full.cov.bhat <- TRUE
}
- if( cov.deltabhat.betahat ) cov.bhat.betahat <- TRUE
+ if( cov.delta.bhat.betahat ) cov.bhat.betahat <- TRUE
if( cov.ehat ){
- cov.deltabhat.betahat <- TRUE
- cov.deltabhat <- TRUE
- if( full.cov.ehat ) full.cov.deltabhat <- TRUE
+ cov.delta.bhat.betahat <- TRUE
+ cov.delta.bhat <- TRUE
+ if( full.cov.ehat ) full.cov.delta.bhat <- TRUE
}
## compute required auxiliary items
@@ -169,8 +169,8 @@
## ... of (b - bhat) (debugging status ok)
- if( cov.deltabhat ){
- result.new$cov.deltabhat <- if( full.cov.deltabhat )
+ if( cov.delta.bhat ){
+ result.new$cov.delta.bhat <- if( full.cov.delta.bhat )
{
aux <- V + result.new$cov.bhat - cov.bhat.b - t( cov.bhat.b )
attr( aux, "struc" ) <- "sym"
@@ -189,18 +189,18 @@
## ... of (b - bhat) and betahat (debugging status ok)
- if( cov.deltabhat.betahat ){
- result.new$cov.deltabhat.betahat <- t( cov.betahat.b ) - result.new$cov.bhat.betahat
- dimnames( result.new$cov.deltabhat.betahat ) <- dimnames( XX )
+ if( cov.delta.bhat.betahat ){
+ result.new$cov.delta.bhat.betahat <- t( cov.betahat.b ) - result.new$cov.bhat.betahat
+ dimnames( result.new$cov.delta.bhat.betahat ) <- dimnames( XX )
}
## ... of ehat (debugging status ok)
if( cov.ehat ){
- aux1 <- tcrossprod( result.new$cov.deltabhat.betahat, XX )[TT,TT]
+ aux1 <- tcrossprod( result.new$cov.delta.bhat.betahat, XX )[TT,TT]
result.new$cov.ehat <- if( full.cov.ehat )
{
- aux <- bla <- result.new$cov.deltabhat[TT,TT] +
+ aux <- bla <- result.new$cov.delta.bhat[TT,TT] +
tcrossprod( tcrossprod( XX, result.new$cov.betahat ), XX )[TT,TT] -
aux1 - t(aux1) - cov.bhat.e[TT,] - t(cov.bhat.e)[,TT] -
TX.cov.betahat.e - t(TX.cov.betahat.e)
@@ -209,10 +209,10 @@
dimnames( aux ) <- list( names.yy, names.yy )
aux
} else {
- aux <- (if( full.cov.deltabhat ){
- diag( result.new$cov.deltabhat )[TT]
+ aux <- (if( full.cov.delta.bhat ){
+ diag( result.new$cov.delta.bhat )[TT]
} else {
- result.new$cov.deltabhat[TT]
+ result.new$cov.delta.bhat[TT]
}) + rowSums( XX * (XX %*% result.new$cov.betahat) )[TT] -
2 * diag( aux1 ) - 2 * diag( cov.bhat.e[TT,] ) - 2 * diag( TX.cov.betahat.e ) +
nugget
@@ -502,20 +502,20 @@
##
## ## ... of delta.z = (z - bhat) (debugging status: ok)
##
- ## if( cov.deltabhat ){
+ ## if( cov.delta.bhat ){
##
- ## if( full.cov.deltabhat ){
+ ## if( full.cov.delta.bhat ){
##
## ## full matrix
##
- ## result$cov.deltabhat <- nugget * (
+ ## result$cov.delta.bhat <- nugget * (
## M.inverse[sel, sel] %*% ValphaiP / eta +
## crossprod( sqrtD * PpXQt )
## )
- ## dimnames( result$cov.deltabhat ) <- list(
+ ## dimnames( result$cov.delta.bhat ) <- list(
## rownames( XX ), rownames( XX )
## )
- ## attr( result$cov.deltabhat, "struc" ) <- "sym"
+ ## attr( result$cov.delta.bhat, "struc" ) <- "sym"
##
## ## ## zur Kontrolle: Kovarianzmatrix UK-Vorhersagefehler
## ##
@@ -523,26 +523,26 @@
## ## t.Sigma <- t.V + nugget * diag( n )
## ## t.iSigma <- solve( t.Sigma )
## ##
- ## ## t.cov.deltabhat <- t.V - t.V %*% t.iSigma %*% t.V + t.V %*% t.iSigma %*% XX %*% solve(
+ ## ## t.cov.delta.bhat <- t.V - t.V %*% t.iSigma %*% t.V + t.V %*% t.iSigma %*% XX %*% solve(
## ## t( XX ) %*% t.iSigma %*% XX
## ## ) %*% t(XX) %*% t.iSigma %*% t.V
## ##
- ## ## print( summary( c( result$cov.deltabhat - t.cov.deltabhat ) ) )
+ ## ## print( summary( c( result$cov.delta.bhat - t.cov.delta.bhat ) ) )
##
## } else {
##
## ## diagonal elements only
##
- ## result$cov.deltabhat <- nugget * (
+ ## result$cov.delta.bhat <- nugget * (
## colSums(
## drop(
## Valpha.objects$Valpha.ilcf %*% M.inverse[sel, sel]
## )^2
## ) / eta + colSums( (sqrtD * PpXQt)^2 )
## )
- ## names( result$cov.deltabhat ) <- rownames( XX )
+ ## names( result$cov.delta.bhat ) <- rownames( XX )
##
- ## ## print( summary( c( result$cov.deltabhat - diag( t.cov.deltabhat ) ) ) )
+ ## ## print( summary( c( result$cov.delta.bhat - diag( t.cov.delta.bhat ) ) ) )
##
## }
##
@@ -551,9 +551,9 @@
##
## ## ... of delta.z = (z - bhat) and betahat (debugging status: ok)
##
- ## if( cov.deltabhat.betahat ){
+ ## if( cov.delta.bhat.betahat ){
##
- ## result$cov.deltabhat.betahat <- -nugget * (
+ ## result$cov.delta.bhat.betahat <- -nugget * (
## t(ValphaiP) %*% M.inverse[sel,-sel] / eta +
## crossprod( PpXQt, TtDT * QpXS )
## )
@@ -564,11 +564,11 @@
## ## t.Sigma <- t.V + nugget * diag( n )
## ## t.iSigma <- solve( t.Sigma )
## ##
- ## ## t.cov.deltabhat.betahat <- t.V %*% t.iSigma %*% XX %*% solve(
+ ## ## t.cov.delta.bhat.betahat <- t.V %*% t.iSigma %*% XX %*% solve(
## ## t( XX ) %*% t.iSigma %*% XX
## ## )
## ##
- ## ## print( summary( c( result$cov.deltabhat.betahat - t.cov.deltabhat.betahat ) ) )
+ ## ## print( summary( c( result$cov.delta.bhat.betahat - t.cov.delta.bhat.betahat ) ) )
##
## }
##
@@ -2454,8 +2454,8 @@
cov.bhat = TRUE, full.cov.bhat = TRUE,
cov.betahat = FALSE,
cov.bhat.betahat = FALSE,
- cov.deltabhat = FALSE, full.cov.deltabhat = FALSE,
- cov.deltabhat.betahat = FALSE,
+ cov.delta.bhat = FALSE, full.cov.delta.bhat = FALSE,
+ cov.delta.bhat.betahat = FALSE,
cov.ehat = FALSE, full.cov.ehat = FALSE,
cov.ehat.p.bhat = FALSE, full.cov.ehat.p.bhat = FALSE,
aux.cov.pred.target = FALSE,
@@ -3183,8 +3183,8 @@
cov.bhat, full.cov.bhat,
cov.betahat,
cov.bhat.betahat,
- cov.deltabhat, full.cov.deltabhat,
- cov.deltabhat.betahat,
+ cov.delta.bhat, full.cov.delta.bhat,
+ cov.delta.bhat.betahat,
cov.ehat, full.cov.ehat,
cov.ehat.p.bhat, full.cov.ehat.p.bhat,
aux.cov.pred.target,
@@ -4020,7 +4020,7 @@
if( any( c(
cov.bhat, cov.betahat, cov.bhat.betahat,
- cov.deltabhat, cov.deltabhat.betahat,
+ cov.delta.bhat, cov.delta.bhat.betahat,
cov.ehat, cov.ehat.p.bhat,
aux.cov.pred.target
)
@@ -4041,8 +4041,8 @@
cov.bhat = cov.bhat, full.cov.bhat = full.cov.bhat,
cov.betahat = cov.betahat,
cov.bhat.betahat = cov.bhat.betahat,
- cov.deltabhat = cov.deltabhat, full.cov.deltabhat = full.cov.deltabhat,
- cov.deltabhat.betahat = cov.deltabhat.betahat,
+ cov.delta.bhat = cov.delta.bhat, full.cov.delta.bhat = full.cov.delta.bhat,
+ cov.delta.bhat.betahat = cov.delta.bhat.betahat,
cov.ehat = cov.ehat, full.cov.ehat = full.cov.ehat,
cov.ehat.p.bhat = cov.ehat.p.bhat, full.cov.ehat.p.bhat = full.cov.ehat.p.bhat,
aux.cov.pred.target = aux.cov.pred.target,
@@ -4087,7 +4087,7 @@
if( any( c(
cov.bhat, cov.betahat, cov.bhat.betahat,
- cov.deltabhat, cov.deltabhat.betahat,
+ cov.delta.bhat, cov.delta.bhat.betahat,
cov.ehat, cov.ehat.p.bhat, aux.cov.pred.target
)
)
Modified: pkg/man/georob.control.Rd
===================================================================
--- pkg/man/georob.control.Rd 2013-06-06 13:28:13 UTC (rev 6)
+++ pkg/man/georob.control.Rd 2013-06-10 10:49:41 UTC (rev 7)
@@ -32,8 +32,8 @@
force.gradient = FALSE, zero.dist = sqrt(.Machine$double.eps),
cov.bhat = FALSE, full.cov.bhat = FALSE, cov.betahat = TRUE,
cov.bhat.betahat = FALSE,
- cov.deltabhat = TRUE, full.cov.deltabhat = TRUE,
- cov.deltabhat.betahat = TRUE,
+ cov.delta.bhat = TRUE, full.cov.delta.bhat = TRUE,
+ cov.delta.bhat.betahat = TRUE,
cov.ehat = TRUE, full.cov.ehat = FALSE,
cov.ehat.p.bhat = FALSE, full.cov.ehat.p.bhat = FALSE,
aux.cov.pred.target = FALSE, min.condnum = 1.e-12,
@@ -173,16 +173,16 @@
\eqn{\widehat{\mbox{\boldmath$\beta$\unboldmath}}}{hat\beta} is returned
(default \code{FALSE}).}
- \item{cov.deltabhat}{logical controlling whether the covariances of
+ \item{cov.delta.bhat}{logical controlling whether the covariances of
\eqn{\mbox{\boldmath$B$\unboldmath}-
\widehat{\mbox{\boldmath$B$\unboldmath}}}{B-hatB} are returned (default \code{TRUE}).}
- \item{full.cov.deltabhat}{logical controlling whether the full covariance
+ \item{full.cov.delta.bhat}{logical controlling whether the full covariance
matrix (\code{TRUE}) or only the variance vector of
\eqn{\mbox{\boldmath$B$\unboldmath}-
\widehat{\mbox{\boldmath$B$\unboldmath}}}{B-hatB} is returned (default \code{TRUE}).}
- \item{cov.deltabhat.betahat}{logical controlling whether the covariance
+ \item{cov.delta.bhat.betahat}{logical controlling whether the covariance
matrix of \eqn{\mbox{\boldmath$B$\unboldmath}-
\widehat{\mbox{\boldmath$B$\unboldmath}}}{B-hatB} and
\eqn{\widehat{\mbox{\boldmath$\beta$\unboldmath}}}{hat\beta} is returned
Modified: pkg/man/georobObject.Rd
===================================================================
--- pkg/man/georobObject.Rd 2013-06-06 13:28:13 UTC (rev 6)
+++ pkg/man/georobObject.Rd 2013-06-10 10:49:41 UTC (rev 7)
@@ -125,10 +125,10 @@
\eqn{\widehat{\mbox{\boldmath$B$\unboldmath}}}{hatB} and
\eqn{\widehat{\mbox{\boldmath$\beta$\unboldmath}}}{hat\beta}.
- \item \code{cov.deltabhat}: the covariances of
+ \item \code{cov.delta.bhat}: the covariances of
\eqn{\mbox{\boldmath$B$\unboldmath}- \widehat{\mbox{\boldmath$B$\unboldmath}}}{B-hatB}.
- \item \code{cov.deltabhat.betahat}: the covariances of
+ \item \code{cov.delta.bhat.betahat}: the covariances of
\eqn{\mbox{\boldmath$B$\unboldmath}- \widehat{\mbox{\boldmath$B$\unboldmath}}}{B-hatB}
and
\eqn{\widehat{\mbox{\boldmath$\beta$\unboldmath}}}{hat\beta}.
More information about the Georob-commits
mailing list