[Robast-commits] r1050 - branches/robast-1.1/pkg/RobLox/inst/scripts branches/robast-1.2/pkg/RobLox/inst/scripts pkg/RobLox/inst/scripts
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jul 24 13:17:23 CEST 2018
Author: ruckdeschel
Date: 2018-07-24 13:17:22 +0200 (Tue, 24 Jul 2018)
New Revision: 1050
Modified:
branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R
branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R
branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R
branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R
branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R
branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R
pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R
pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R
pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R
Log:
[RobLox] added RobLox::: to access non exported variables in scripts in RobLox
Modified: branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R
===================================================================
--- branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -18,10 +18,10 @@
a <- -0.6277527697*A2/sd
mse <- A1 + A2
}else{
- A1 <- sd^2*.getA1.locsc(r)
- A2 <- sd^2*.getA2.locsc(r)
- a <- sd*.geta.locsc(r)
- b <- sd*.getb.locsc(r)
+ A1 <- sd^2*RobLox:::.getA1.locsc(r)
+ A2 <- sd^2*RobLox:::.getA2.locsc(r)
+ a <- sd*RobLox:::.geta.locsc(r)
+ b <- sd*RobLox:::.getb.locsc(r)
mse <- A1 + A2
}
robEst <- .kstep.locsc.matrix(x = x, initial.est = cbind(mean, sd),
Modified: branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R
===================================================================
--- branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -15,10 +15,10 @@
b <- sd*sqrt(pi/2)
A <- b^2*(1+r^2)
}else{
- A <- sd^2*.getA.loc(r)
- b <- sd*.getb.loc(r)
+ A <- sd^2*RobLox:::.getA.loc(r)
+ b <- sd*RobLox:::.getb.loc(r)
}
- robEst <- as.matrix(.kstep.loc.matrix(x = x, initial.est = mean, A = A, b = b, sd = sd, k = k))
+ robEst <- as.matrix(RobLox:::.kstep.loc.matrix(x = x, initial.est = mean, A = A, b = b, sd = sd, k = k))
colnames(robEst) <- "mean"
return(robEst)
}
Modified: branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R
===================================================================
--- branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ branches/robast-1.1/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -15,11 +15,11 @@
A <- b^2*(1+r^2)
a <- (qnorm(0.75)^2 - 1)/sd*A
}else{
- A <- sd^2*.getA.sc(r)
- a <- sd*.geta.sc(r)
- b <- sd*.getb.sc(r)
+ A <- sd^2*RobLox:::.getA.sc(r)
+ a <- sd*RobLox:::.geta.sc(r)
+ b <- sd*RobLox:::.getb.sc(r)
}
- robEst <- .kstep.sc.matrix(x = x, initial.est = sd, A = A, a = a, b = b, mean = mean, k = k)
+ robEst <- RobLox:::.kstep.sc.matrix(x = x, initial.est = sd, A = A, a = a, b = b, mean = mean, k = k)
robEst$est <- as.matrix(robEst$est)
colnames(robEst$est) <- "sd"
return(robEst$est)
@@ -104,7 +104,7 @@
gc()
if(round(r.fi[i,j], 2) > 3 | i == length(eps)) break
}
- save.image(file = "FiniteSampleScale1.RData")
+# save.image(file = "FiniteSampleScale1.RData")
cat("Dauer:\t", proc.time() - ptm, "\n")
}
Modified: branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R
===================================================================
--- branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -18,10 +18,10 @@
a <- -0.6277527697*A2/sd
mse <- A1 + A2
}else{
- A1 <- sd^2*.getA1.locsc(r)
- A2 <- sd^2*.getA2.locsc(r)
- a <- sd*.geta.locsc(r)
- b <- sd*.getb.locsc(r)
+ A1 <- sd^2*RobLox:::.getA1.locsc(r)
+ A2 <- sd^2*RobLox:::.getA2.locsc(r)
+ a <- sd*RobLox:::.geta.locsc(r)
+ b <- sd*RobLox:::.getb.locsc(r)
mse <- A1 + A2
}
robEst <- .kstep.locsc.matrix(x = x, initial.est = cbind(mean, sd),
Modified: branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R
===================================================================
--- branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -15,10 +15,10 @@
b <- sd*sqrt(pi/2)
A <- b^2*(1+r^2)
}else{
- A <- sd^2*.getA.loc(r)
- b <- sd*.getb.loc(r)
+ A <- sd^2*RobLox:::.getA.loc(r)
+ b <- sd*RobLox:::.getb.loc(r)
}
- robEst <- as.matrix(.kstep.loc.matrix(x = x, initial.est = mean, A = A, b = b, sd = sd, k = k))
+ robEst <- as.matrix(RobLox:::.kstep.loc.matrix(x = x, initial.est = mean, A = A, b = b, sd = sd, k = k))
colnames(robEst) <- "mean"
return(robEst)
}
Modified: branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R
===================================================================
--- branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ branches/robast-1.2/pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -15,11 +15,11 @@
A <- b^2*(1+r^2)
a <- (qnorm(0.75)^2 - 1)/sd*A
}else{
- A <- sd^2*.getA.sc(r)
- a <- sd*.geta.sc(r)
- b <- sd*.getb.sc(r)
+ A <- sd^2*RobLox:::.getA.sc(r)
+ a <- sd*RobLox:::.geta.sc(r)
+ b <- sd*RobLox:::.getb.sc(r)
}
- robEst <- .kstep.sc.matrix(x = x, initial.est = sd, A = A, a = a, b = b, mean = mean, k = k)
+ robEst <- RobLox:::.kstep.sc.matrix(x = x, initial.est = sd, A = A, a = a, b = b, mean = mean, k = k)
robEst$est <- as.matrix(robEst$est)
colnames(robEst$est) <- "sd"
return(robEst$est)
@@ -104,7 +104,7 @@
gc()
if(round(r.fi[i,j], 2) > 3 | i == length(eps)) break
}
- save.image(file = "FiniteSampleScale1.RData")
+# save.image(file = "FiniteSampleScale1.RData")
cat("Dauer:\t", proc.time() - ptm, "\n")
}
Modified: pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R
===================================================================
--- pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactor.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -18,10 +18,10 @@
a <- -0.6277527697*A2/sd
mse <- A1 + A2
}else{
- A1 <- sd^2*.getA1.locsc(r)
- A2 <- sd^2*.getA2.locsc(r)
- a <- sd*.geta.locsc(r)
- b <- sd*.getb.locsc(r)
+ A1 <- sd^2*RobLox:::.getA1.locsc(r)
+ A2 <- sd^2*RobLox:::.getA2.locsc(r)
+ a <- sd*RobLox:::.geta.locsc(r)
+ b <- sd*RobLox:::.getb.locsc(r)
mse <- A1 + A2
}
robEst <- .kstep.locsc.matrix(x = x, initial.est = cbind(mean, sd),
Modified: pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R
===================================================================
--- pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorLocation.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -15,10 +15,10 @@
b <- sd*sqrt(pi/2)
A <- b^2*(1+r^2)
}else{
- A <- sd^2*.getA.loc(r)
- b <- sd*.getb.loc(r)
+ A <- sd^2*RobLox:::.getA.loc(r)
+ b <- sd*RobLox:::.getb.loc(r)
}
- robEst <- as.matrix(.kstep.loc.matrix(x = x, initial.est = mean, A = A, b = b, sd = sd, k = k))
+ robEst <- as.matrix(RobLox:::.kstep.loc.matrix(x = x, initial.est = mean, A = A, b = b, sd = sd, k = k))
colnames(robEst) <- "mean"
return(robEst)
}
Modified: pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R
===================================================================
--- pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R 2018-07-24 11:12:17 UTC (rev 1049)
+++ pkg/RobLox/inst/scripts/FiniteSampleCorrectionFactorScale.R 2018-07-24 11:17:22 UTC (rev 1050)
@@ -15,11 +15,11 @@
A <- b^2*(1+r^2)
a <- (qnorm(0.75)^2 - 1)/sd*A
}else{
- A <- sd^2*.getA.sc(r)
- a <- sd*.geta.sc(r)
- b <- sd*.getb.sc(r)
+ A <- sd^2*RobLox:::.getA.sc(r)
+ a <- sd*RobLox:::.geta.sc(r)
+ b <- sd*RobLox:::.getb.sc(r)
}
- robEst <- .kstep.sc.matrix(x = x, initial.est = sd, A = A, a = a, b = b, mean = mean, k = k)
+ robEst <- RobLox:::.kstep.sc.matrix(x = x, initial.est = sd, A = A, a = a, b = b, mean = mean, k = k)
robEst$est <- as.matrix(robEst$est)
colnames(robEst$est) <- "sd"
return(robEst$est)
@@ -104,7 +104,7 @@
gc()
if(round(r.fi[i,j], 2) > 3 | i == length(eps)) break
}
- save.image(file = "FiniteSampleScale1.RData")
+# save.image(file = "FiniteSampleScale1.RData")
cat("Dauer:\t", proc.time() - ptm, "\n")
}
More information about the Robast-commits
mailing list