[Distr-commits] r1272 - in branches/distr-2.8/pkg: distrEllipse/R distrEllipse/inst distrMod/R distrMod/inst
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Aug 11 15:41:43 CEST 2018
Author: ruckdeschel
Date: 2018-08-11 15:41:43 +0200 (Sat, 11 Aug 2018)
New Revision: 1272
Modified:
branches/distr-2.8/pkg/distrEllipse/R/EllipticalDistribution.R
branches/distr-2.8/pkg/distrEllipse/inst/NEWS
branches/distr-2.8/pkg/distrMod/R/MCEstimator.R
branches/distr-2.8/pkg/distrMod/R/MLEstimator.R
branches/distr-2.8/pkg/distrMod/R/asCvMVarianceQtl.R
branches/distr-2.8/pkg/distrMod/R/existsPIC.R
branches/distr-2.8/pkg/distrMod/R/setAs.R
branches/distr-2.8/pkg/distrMod/inst/NEWS
Log:
[distrMod/distrEllipse] branch 2.8
+ now specified that we want to use distr::solve
Modified: branches/distr-2.8/pkg/distrEllipse/R/EllipticalDistribution.R
===================================================================
--- branches/distr-2.8/pkg/distrEllipse/R/EllipticalDistribution.R 2018-08-11 13:36:17 UTC (rev 1271)
+++ branches/distr-2.8/pkg/distrEllipse/R/EllipticalDistribution.R 2018-08-11 13:41:43 UTC (rev 1272)
@@ -5,7 +5,7 @@
ldscale <- as.numeric(determinant(as.matrix(scale),
logarithm = TRUE)$modulus)
- Iscale <- solve(scale)
+ Iscale <- distr::solve(scale)
dim0 <- length(loc)
Modified: branches/distr-2.8/pkg/distrEllipse/inst/NEWS
===================================================================
--- branches/distr-2.8/pkg/distrEllipse/inst/NEWS 2018-08-11 13:36:17 UTC (rev 1271)
+++ branches/distr-2.8/pkg/distrEllipse/inst/NEWS 2018-08-11 13:41:43 UTC (rev 1272)
@@ -14,6 +14,9 @@
user-visible CHANGES:
+ DESCRIPTION tag SVNRevision changed to VCS/SVNRevision
+under the hood:
++ now specified that we want to use distr::solve
+
##############
v 2.7
##############
Modified: branches/distr-2.8/pkg/distrMod/R/MCEstimator.R
===================================================================
--- branches/distr-2.8/pkg/distrMod/R/MCEstimator.R 2018-08-11 13:36:17 UTC (rev 1271)
+++ branches/distr-2.8/pkg/distrMod/R/MCEstimator.R 2018-08-11 13:41:43 UTC (rev 1272)
@@ -41,7 +41,7 @@
asv <- if("FisherInfo" %in% slotNames(ParamFamily)){
function(ParamFamily, param)
- solve(FisherInfo(ParamFamily, param = param))
+ distr::solve(FisherInfo(ParamFamily, param = param))
}else NULL
argList <- c(list(res0, PFam = ParamFamily,
Modified: branches/distr-2.8/pkg/distrMod/R/MLEstimator.R
===================================================================
--- branches/distr-2.8/pkg/distrMod/R/MLEstimator.R 2018-08-11 13:36:17 UTC (rev 1271)
+++ branches/distr-2.8/pkg/distrMod/R/MLEstimator.R 2018-08-11 13:41:43 UTC (rev 1272)
@@ -39,7 +39,7 @@
asv <- if("FisherInfo" %in% slotNames(ParamFamily)){
function(PFam = ParamFamily, param, ...)
- solve(FisherInfo(PFam, param = param))
+ distr::solve(FisherInfo(PFam, param = param))
}else NULL
argList <- list(res0, PFam = ParamFamily, trafo = trafo,
Modified: branches/distr-2.8/pkg/distrMod/R/asCvMVarianceQtl.R
===================================================================
--- branches/distr-2.8/pkg/distrMod/R/asCvMVarianceQtl.R 2018-08-11 13:36:17 UTC (rev 1271)
+++ branches/distr-2.8/pkg/distrMod/R/asCvMVarianceQtl.R 2018-08-11 13:41:43 UTC (rev 1272)
@@ -358,7 +358,7 @@
J <- E(object=distr, fun = Delta.0 %*%t(Delta.0))
##-t-## }))
### CvM-IC phi
- phi <- as(solve(J)%*%Delta.0,"EuclRandVariable")
+ phi <- as(distr::solve(J)%*%Delta.0,"EuclRandVariable")
## integrand phi x Ptheta in formula (51) [ibid]
@@ -453,7 +453,7 @@
E3 <- E(object=distr, fun = psi %*%t(L2deriv.0))
##-t-## }))
psi.0 <- psi - E1
- psi.01 <- as(solve(E3)%*%psi.0,"EuclRandVariable")
+ psi.01 <- as(distr::solve(E3)%*%psi.0,"EuclRandVariable")
if(withplot)
{ for(i in 1:Dim)
{ dev.new()
@@ -711,7 +711,7 @@
J <- E(object=distr, fun = Delta.0 %*%t(Delta.0))
##-t-## }))
### CvM-IC phi
- phi <- as(solve(J)%*%Delta.0,"EuclRandVariable")
+ phi <- as(distr::solve(J)%*%Delta.0,"EuclRandVariable")
## integrand phi x Ptheta in formula (51) [ibid]
@@ -778,7 +778,7 @@
E3 <- E(object=distr, fun = psi %*%t(L2deriv))
##-t-## }))
psi.0 <- psi - E1
- psi.01 <- as(solve(E3)%*%psi.0,"EuclRandVariable")
+ psi.01 <- as(distr::solve(E3)%*%psi.0,"EuclRandVariable")
if(withplot)
{ for(i in 1:Dim)
{ dev.new()
Modified: branches/distr-2.8/pkg/distrMod/R/existsPIC.R
===================================================================
--- branches/distr-2.8/pkg/distrMod/R/existsPIC.R 2018-08-11 13:36:17 UTC (rev 1271)
+++ branches/distr-2.8/pkg/distrMod/R/existsPIC.R 2018-08-11 13:41:43 UTC (rev 1272)
@@ -4,7 +4,7 @@
if (sum(A.svd$d > tol * max(A.svd$d))>0)
{kerA.perp <- A.svd$v[,A.svd$d > tol * max(A.svd$d)]
## projector to ker A perp
- Pi.kerA.perp <- kerA.perp%*%solve(t(kerA.perp)%*%kerA.perp, tol = tol)%*%t(kerA.perp)
+ Pi.kerA.perp <- kerA.perp%*%distr::solve(t(kerA.perp)%*%kerA.perp, tol = tol)%*%t(kerA.perp)
}else{Pi.kerA.perp <- 0*A}
B <- as.matrix(B)
@@ -12,7 +12,7 @@
if (sum(B.svd$d > tol * max(B.svd$d))>0)
{kerB.perp <- B.svd$v[,B.svd$d > tol * max(B.svd$d)]
## projector to ker B perp
- Pi.kerB.perp <- kerB.perp%*%solve(t(kerB.perp)%*%kerB.perp, tol = tol)%*%t(kerB.perp)
+ Pi.kerB.perp <- kerB.perp%*%distr::solve(t(kerB.perp)%*%kerB.perp, tol = tol)%*%t(kerB.perp)
}else{Pi.kerB.perp <- 0*B}
isTRUE(all.equal(Pi.kerB.perp%*%Pi.kerA.perp, Pi.kerB.perp, tolerance = tol ))
}
Modified: branches/distr-2.8/pkg/distrMod/R/setAs.R
===================================================================
--- branches/distr-2.8/pkg/distrMod/R/setAs.R 2018-08-11 13:36:17 UTC (rev 1271)
+++ branches/distr-2.8/pkg/distrMod/R/setAs.R 2018-08-11 13:41:43 UTC (rev 1272)
@@ -42,7 +42,7 @@
## "invert" (locally!) the transformation,
# i.e. th1 "=" trafo^-1(th0)
D1 <- (trafo(from)$fct)(th0)$mat
- th1 <- est1 + solve(D1, th0-est0)
+ th1 <- est1 + distr::solve(D1, th0-est0)
## call critrium.fct with this transformed parameter
do.call(from at criterion.fct,as.list(th1))
}
Modified: branches/distr-2.8/pkg/distrMod/inst/NEWS
===================================================================
--- branches/distr-2.8/pkg/distrMod/inst/NEWS 2018-08-11 13:36:17 UTC (rev 1271)
+++ branches/distr-2.8/pkg/distrMod/inst/NEWS 2018-08-11 13:41:43 UTC (rev 1272)
@@ -103,6 +103,7 @@
+ new subclasses "MLEstimate", "MDEstimate", "CvMMDEstimate" for internal method dispatch
+ (robust) start parameters for Nbinom family with two parameters
+ (robust) start (search) parameters for Poisson family
++ now specified that we want to use distr::solve
##############
More information about the Distr-commits
mailing list