[Robast-commits] r1126 - in branches/robast-1.2/pkg/RobRex: R inst
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Aug 11 16:56:46 CEST 2018
Author: ruckdeschel
Date: 2018-08-11 16:56:46 +0200 (Sat, 11 Aug 2018)
New Revision: 1126
Modified:
branches/robast-1.2/pkg/RobRex/R/rgsOptIC_AL.R
branches/robast-1.2/pkg/RobRex/R/rgsOptIC_ALc.R
branches/robast-1.2/pkg/RobRex/R/rgsOptIC_ALs.R
branches/robast-1.2/pkg/RobRex/R/rgsOptIC_M.R
branches/robast-1.2/pkg/RobRex/R/rgsOptIC_MK.R
branches/robast-1.2/pkg/RobRex/inst/NEWS
Log:
[RobRex] branch 1.2
+ now specified that we want to use distr::solve
Modified: branches/robast-1.2/pkg/RobRex/R/rgsOptIC_AL.R
===================================================================
--- branches/robast-1.2/pkg/RobRex/R/rgsOptIC_AL.R 2018-08-11 14:53:01 UTC (rev 1125)
+++ branches/robast-1.2/pkg/RobRex/R/rgsOptIC_AL.R 2018-08-11 14:56:46 UTC (rev 1126)
@@ -92,7 +92,7 @@
.ALrgsGetAz <- function(K, b, A.rg, z.sc, A.sc){
A.rg1 <- E(K, .ALrgsGetArg, b = b, A.rg = A.rg,
z.sc = z.sc, A.sc = A.sc)
- A.rg <- solve(A.rg1)
+ A.rg <- distr::solve(A.rg1)
A.sc1 <- E(K, .ALrgsGetAsc, b = b, A.rg = A.rg,
z.sc = z.sc, A.sc = A.sc)
@@ -139,7 +139,7 @@
A.sc <- A.sc.start; z.sc <- a.sc.start/A.sc + 1
if(missing(A.rg.start))
- A.rg <- solve(Reg2Mom)
+ A.rg <- distr::solve(Reg2Mom)
else
A.rg <- A.rg.start
Modified: branches/robast-1.2/pkg/RobRex/R/rgsOptIC_ALc.R
===================================================================
--- branches/robast-1.2/pkg/RobRex/R/rgsOptIC_ALc.R 2018-08-11 14:53:01 UTC (rev 1125)
+++ branches/robast-1.2/pkg/RobRex/R/rgsOptIC_ALc.R 2018-08-11 14:56:46 UTC (rev 1126)
@@ -88,7 +88,7 @@
for(i in 1:nrow(supp)){
summe <- summe + prob[i]*supp[i,]%*%t(supp[i,])*A.rg1[i]
}
- A.rg <- solve(summe)
+ A.rg <- distr::solve(summe)
A.sc1 <- apply(z.sc.x, 1, .ALcrgsGetAsc, b = b, A.rg = A.rg, A.sc = A.sc)
A.sc <- 1/sum(prob*A.sc1)
@@ -141,7 +141,7 @@
else
z.sc <- a.sc.start/A.sc + 1
if(missing(A.rg.start))
- A.rg <- solve(Reg2Mom)
+ A.rg <- distr::solve(Reg2Mom)
else
A.rg <- A.rg.start
Modified: branches/robast-1.2/pkg/RobRex/R/rgsOptIC_ALs.R
===================================================================
--- branches/robast-1.2/pkg/RobRex/R/rgsOptIC_ALs.R 2018-08-11 14:53:01 UTC (rev 1125)
+++ branches/robast-1.2/pkg/RobRex/R/rgsOptIC_ALs.R 2018-08-11 14:56:46 UTC (rev 1126)
@@ -76,7 +76,7 @@
.ALsrgsGetArg <- function(K, b.rg, A.rg){
A.rg1 <- E(K, .ALsrgsGetArg1, b.rg = b.rg, A.rg = A.rg)
- return(solve(A.rg1))
+ return(distr::solve(A.rg1))
}
@@ -104,7 +104,7 @@
"is (numerically) not positive definite")
if(missing(A.rg.start))
- A.rg <- solve(Reg2Mom)
+ A.rg <- distr::solve(Reg2Mom)
else
A.rg <- A.rg.start
@@ -166,8 +166,8 @@
cat("MSE equation for eta.sc:\t", rvgl.sc, "\n")
}
- k <- dimension(img(K))
- vec.A <- as.vector(A.rg)
+ k <- dimension(img(K))
+ vec.A <- as.vector(A.rg)
w <- .ALsrgsGetwrg
fct1 <- function(x){
A.rg <- matrix(vec.A, ncol = k)
Modified: branches/robast-1.2/pkg/RobRex/R/rgsOptIC_M.R
===================================================================
--- branches/robast-1.2/pkg/RobRex/R/rgsOptIC_M.R 2018-08-11 14:53:01 UTC (rev 1125)
+++ branches/robast-1.2/pkg/RobRex/R/rgsOptIC_M.R 2018-08-11 14:56:46 UTC (rev 1126)
@@ -243,10 +243,10 @@
k <- dimension(img(K))
Gk <- .duplicationMatrix(dimn = k)
- Hk <- solve(t(Gk) %*% Gk)%*%t(Gk)
+ Hk <- distr::solve(t(Gk) %*% Gk)%*%t(Gk)
h5 <- Hk %*% h5 %*% Gk
- vech.B <- solve(h5) %*% vech.D
+ vech.B <- distr::solve(h5) %*% vech.D
B <- matrix(0, nrow = k , ncol = k)
B[row(B) >= col(B)] <- vech.B
B[row(B) < col(B)] <- B[row(B) > col(B)]
@@ -305,7 +305,7 @@
###############################################################################
.MrgsGetba1a3B <- function(r, K, A, gg, a1, a3, B, bUp, delta, itmax){
C1 <- E(K, .MrgsGetC1, A = A, gg = gg)
- C2 <- solve(A) - gg^2*E(K, .MrgsGetC2, A = A, gg = gg)
+ C2 <- distr::solve(A) - gg^2*E(K, .MrgsGetC2, A = A, gg = gg)
C3 <- 1 + 1/gg - gg^2*E(K, .MrgsGetC3, A = A, gg = gg)
b <- try(uniroot(.MrgsGetr, lower = gg, upper = bUp,
@@ -442,7 +442,7 @@
stop("Regressor is a.e. K concentrated on a conic")
if(missing(A.start))
- A <- solve(Reg2Mom)
+ A <- distr::solve(Reg2Mom)
else
A <- A.start
@@ -474,7 +474,7 @@
if(check){
C1 <- E(K, .MrgsGetC1, A = A, gg = gg)
- C2 <- solve(A) - gg^2*E(K, .MrgsGetC2, A = A, gg = gg)
+ C2 <- distr::solve(A) - gg^2*E(K, .MrgsGetC2, A = A, gg = gg)
C3 <- 1 + 1/gg - gg^2*E(K, .MrgsGetC3, A = A, gg = gg)
kont1 <- try(E(K, .MrgsGetch1, A = A, gg = gg, b = b, a1 = a1,
@@ -506,7 +506,7 @@
else
cat("could not determine MSE equation:\n", rvgl ,"\n")
}
-
+
w <- .MrgsGetw
fct1 <- function(x){
B.mat <- matrix(B, ncol = k)
Modified: branches/robast-1.2/pkg/RobRex/R/rgsOptIC_MK.R
===================================================================
--- branches/robast-1.2/pkg/RobRex/R/rgsOptIC_MK.R 2018-08-11 14:53:01 UTC (rev 1125)
+++ branches/robast-1.2/pkg/RobRex/R/rgsOptIC_MK.R 2018-08-11 14:56:46 UTC (rev 1126)
@@ -37,7 +37,7 @@
if(.rgsRegressorCheck(K))
stop("Regressor is a.e. K concentrated on a conic")
- A <- solve(Reg2Mom)
+ A <- distr::solve(Reg2Mom)
if(missing(B.start)) B.start <- A %*% A
res <- optimize(.MKrgsGetmse, lower = ggLo, upper = ggUp,
@@ -54,7 +54,7 @@
if(check){
C1 <- E(K, .MrgsGetC1, A = A, gg = gg)
- C2 <- solve(A) - gg^2*E(K, .MrgsGetC2, A = A, gg = gg)
+ C2 <- distr::solve(A) - gg^2*E(K, .MrgsGetC2, A = A, gg = gg)
C3 <- 1 + 1/gg - gg^2*E(K, .MrgsGetC3, A = A, gg = gg)
kont1 <- try(E(K, .MrgsGetch1, A = A, gg = gg, b = b, a1 = a1,
@@ -86,7 +86,7 @@
else
cat("could not determine MSE equation:\n", rvgl ,"\n")
}
-
+
w <- .MrgsGetw
fct1 <- function(x){
B.mat <- matrix(B, ncol = k)
Modified: branches/robast-1.2/pkg/RobRex/inst/NEWS
===================================================================
--- branches/robast-1.2/pkg/RobRex/inst/NEWS 2018-08-11 14:53:01 UTC (rev 1125)
+++ branches/robast-1.2/pkg/RobRex/inst/NEWS 2018-08-11 14:56:46 UTC (rev 1126)
@@ -8,6 +8,13 @@
information)
#######################################
+version 1.2
+#######################################
+
+under the hood
++ now specified that we want to use distr::solve
+
+#######################################
version 1.1
#######################################
More information about the Robast-commits
mailing list