version 0.1-2

cran · Jun 18, 2013 · 54eb572 · 54eb572
1 parent ca2923d
commit 54eb572
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 54 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,17 +1,17 @@
 Package: restlos
 Type: Package
 Title: Robust estimation of location and scatter
-Version: 0.1-1
-Date: 2013-03-11
+Version: 0.1-2
+Date: 2013-06-18
 Author: Steffen Liebscher and Thomas Kirschstein
 Maintainer: Steffen Liebscher <steffen.liebscher@wiwi.uni-halle.de>
 Description: The package implements some recently introduced
         methodology for robust estimation of location and scatter as
         well as outlier identification.
-Depends: som, rgl, ade4, geometry
+Depends: som, rgl, ade4, geometry, nnclust
 License: GPL (>= 2)
 LazyLoad: yes
-Packaged: 2013-03-11 15:03:33 UTC; Steffen
+Packaged: 2013-06-18 12:00:21 UTC; Steffen
 NeedsCompilation: no
 Repository: CRAN
-Date/Publication: 2013-03-11 16:49:24
+Date/Publication: 2013-06-18 16:16:56
diff --git a/MD5 b/MD5
@@ -1,19 +1,19 @@
-8b76fa6e3bee3f4c471302d6d18a9178 *DESCRIPTION
-ca603a2fed2517391ecf6001ffb5836a *NAMESPACE
+3e39e0fab41093b05238a057b5a44540 *DESCRIPTION
+3a1f7bfacd1d8332954ce92b7258db7e *NAMESPACE
 2be905ee0b32116042ac8dde6c4a3d81 *R/flood.R
-efbed3759894eee9faf4037ccea69ec2 *R/pMST.R
+87768cdb494238fc56d1f79f3060585c *R/pMST.r
 8e6be6a2a240cc305066f06b0298b335 *R/plot.flood.R
 25917a36c4495b1a2a1b26c30ccb4042 *R/plot.pMST.R
 b6b8f814ad0f71a746625bac2dedd391 *R/plot.rdela.R
 b1816ad478cfaf697b60a78b8ed7769b *R/rdela.R
 7fb4dbc63fac80769938cc68dc743264 *R/restlos-internal.R
 e14b848d29f84b8c0f928cb4f5ebe815 *data/halle.rda
-4c64fdd993b9abc45f050f717feb2fb2 *man/flood.Rd
+3130cb124a2a1e963a40fd7692c657cf *man/flood.Rd
 4142f6fab1c11b362b4738912c0e5f4c *man/halle.Rd
-e3073dd725890ae8b804caf768cb4197 *man/pMST.Rd
-c79bbd26e692129fd2d91dbe5f38bb9a *man/plot.flood.Rd
-d88057605f6cdb9f685812f1264f0dec *man/plot.pMST.Rd
-b8634c719aee974cdf55e1d2d689cd71 *man/plot.rdela.Rd
-d8894f884d9c75d04332bcebc769075e *man/rdela.Rd
+3e6937567cbdd940eda6b36e3ebc907d *man/pMST.Rd
+bac00a6726bca26ca3740547c85e6ead *man/plot.flood.Rd
+e7504b9e14648189e94ed91e700e9f43 *man/plot.pMST.Rd
+8d64be94b21ed0cfe74c567cc60bb0f9 *man/plot.rdela.Rd
+c35a9476d5799ff36fb3a3120541edd3 *man/rdela.Rd
 ce5c6847b46310459ceffc26964d66d4 *man/restlos-internal.Rd
-47164fff4b4afb40bea893006a421f66 *man/restlos-package.Rd
+9b76f8bacc8a43fede2042d24d510dc7 *man/restlos-package.Rd
diff --git a/NAMESPACE b/NAMESPACE
@@ -8,5 +8,6 @@ import(
   som,
   rgl,
   ade4,
-  geometry
+  geometry,
+  nnclust
 )
diff --git a/R/pMST.R b/R/pMST.R
@@ -1,6 +1,9 @@
 pMST<-function (data, N = floor((dim(data)[1] + dim(data)[2] + 1)/2), 
     lmax = dim(data)[1] * 100) 
 {
+
+	require(nnclust)
+
 	if(is.data.frame(data))
 		data=as.matrix(data)
 
@@ -12,35 +15,21 @@ pMST<-function (data, N = floor((dim(data)[1] + dim(data)[2] + 1)/2),
 
     if (dim(data)[1] <= dim(data)[2]) 
         stop("n > d required")
+
+	if (dim(data)[1] <= N) 
+        stop("Trying to find more than all observations")
 
-    require(ade4)
-    require(rgl)
-
-    ddmst <- function(dat) {
-        ddat <- dist(dat, upper = T, diag = T)
-        mstdat <- mstree(ddat)
-        o <- dim(dat)[1] - 1
-        em <- numeric(o)
-        k <- 0
-        ddat <- as.matrix(ddat)
-        for (i in 1:o) {
-            k <- k + ddat[mstdat[i, 1], mstdat[i, 2]]
-            em[i] <- ddat[mstdat[i, 1], mstdat[i, 2]]
-        }
-        emax <- max(em)
-        return(k)
-    }
+
+	x2 <- mst(data)
+	U1 <- x2$dist
+	x2 <- cbind(x2$from,x2$to)
+	T1<-order(U1)
+	l<-0
+	LiB<-list(c())
+	GeB<-c()
+	LeB<-c()
+	x6<-matrix(0,ncol=3,nrow=1)
 
-    x1 <- dist(data, upper = T, diag = T)
-    x2 <- mstree(x1)
-    x1 <- as.matrix(x1)
-    U1 <- diag(x1[x2[, 1], x2[, 2]])
-    T1 <- order(U1)
-    l <- 0
-    LiB <- list(c())
-    GeB <- c()
-    LeB <- c()
-    x6 <- matrix(c(0, 0, 0), ncol = 3)
     repeat {
         l <- l + 1
         T2 <- sapply(LiB, function(x) {

diff --git a/man/flood.Rd b/man/flood.Rd
@@ -48,7 +48,7 @@ The function first calls the \code{som} function within the \pkg{som}-package. T
 }
 
 \references{
-Liebscher, S., Kirschstein, T., and Becker, C. (2012): The Flood Algorithm - A Multivariate, Self-Organizing-Map-Based, Robust Location and Covariance Estimator, \emph{Statistics and Computing}, DOI: 10.1007/s11222-011-9250-3.
+Liebscher, S., Kirschstein, T., and Becker, C. (2012): The Flood Algorithm - A Multivariate, Self-Organizing-Map-Based, Robust Location and Covariance Estimator, \emph{Statistics and Computing}, 22(1), 325-336, DOI: 10.1007/s11222-011-9250-3.
 }
 
 \author{

diff --git a/man/pMST.Rd b/man/pMST.Rd
@@ -37,7 +37,7 @@ The function uses the \code{mstree} function from the \pkg{ade4}-package to dete
 }
 
 \references{
-Kirschstein, T., Liebscher, S., and Becker, C. (201x): Robust estimation of location and scatter by pruning the minimum spanning tree, \emph{under revision}.
+Kirschstein, T., Liebscher, S., and Becker, C. (2013): Robust estimation of location and scatter by pruning the minimum spanning tree, \emph{Journal of Multivariate Analysis}, 120, 173-184, DOI: 10.1016/j.jmva.2013.05.004.
 }
 
 \author{

diff --git a/man/plot.flood.Rd b/man/plot.flood.Rd
@@ -29,7 +29,7 @@ The resulting plots depend on the dimensionality of the data set. For \code{d=2}
 }
 
 \references{
-Liebscher, S., Kirschstein, T., and Becker, C. (2012): The Flood Algorithm - A Multivariate, Self-Organizing-Map-Based, Robust Location and Covariance Estimator, \emph{Statistics and Computing}, DOI: 10.1007/s11222-011-9250-3.
+Liebscher, S., Kirschstein, T., and Becker, C. (2012): The Flood Algorithm - A Multivariate, Self-Organizing-Map-Based, Robust Location and Covariance Estimator, \emph{Statistics and Computing}, 22(1), 325-336, DOI: 10.1007/s11222-011-9250-3.
 }
 
 \author{

diff --git a/man/plot.pMST.Rd b/man/plot.pMST.Rd
@@ -27,7 +27,7 @@ The resulting plots display the LC- and the AL-plot to support the decision on t
 }
 
 \references{
-Kirschstein, T., Liebscher, S., and Becker, C. (201x): Robust estimation of location and scatter by pruning the minimum spanning tree, \emph{under revision}.
+Kirschstein, T., Liebscher, S., and Becker, C. (2013): Robust estimation of location and scatter by pruning the minimum spanning tree, \emph{Journal of Multivariate Analysis}, 120, 173-184, DOI: 10.1016/j.jmva.2013.05.004.
 }
 
 \author{

diff --git a/man/plot.rdela.Rd b/man/plot.rdela.Rd
@@ -27,7 +27,7 @@ The resulting plots depend on the dimensionality of the data set. For \code{d=2}
 }
 
 \references{
-Liebscher, S., Kirschstein, T., and Becker, C. (201x): RDELA - A Delaunay-Triangulation-based, Location and Covariance Estimator with High Breakdown Point, to appear in \emph{Statistics and Computing}, DOI: 10.1007/s11222-012-9337-5.
+Liebscher, S., Kirschstein, T., and Becker, C. (2013): RDELA - A Delaunay-Triangulation-based, Location and Covariance Estimator with High Breakdown Point, \emph{Statistics and Computing}, DOI: 10.1007/s11222-012-9337-5.
 }
 
 \author{

diff --git a/man/rdela.Rd b/man/rdela.Rd
@@ -38,7 +38,7 @@ The function first calls the \code{delaunayn} function within the \pkg{geometry}
 }
 
 \references{
-Liebscher, S., Kirschstein, T., and Becker, C. (201x): RDELA - A Delaunay-Triangulation-based, Location and Covariance Estimator with High Breakdown Point, to appear in \emph{Statistics and Computing}, DOI: 10.1007/s11222-012-9337-5.
+Liebscher, S., Kirschstein, T., and Becker, C. (2013): RDELA - A Delaunay-Triangulation-based, Location and Covariance Estimator with High Breakdown Point, \emph{Statistics and Computing}, DOI: 10.1007/s11222-012-9337-5.
 }
 
 \author{

diff --git a/man/restlos-package.Rd b/man/restlos-package.Rd
@@ -14,8 +14,8 @@ The package implements some recently introduced methodology for robust estimatio
 \tabular{ll}{
 Package: \tab restlos\cr
 Type: \tab Package\cr
-Version: \tab 0.1-1\cr
-Date: \tab 2013-03-11\cr
+Version: \tab 0.1-2\cr
+Date: \tab 2013-06-18\cr
 License: \tab GPL (>= 2)\cr
 LazyLoad: \tab yes\cr
 }
@@ -28,11 +28,11 @@ Maintainer: Steffen Liebscher <steffen.liebscher@wiwi.uni-halle.de>
 }
 
 \references{
-Kirschstein, T., Liebscher, S., and Becker, C. (201x): Robust estimation of location and scatter by pruning the minimum spanning tree, \emph{under revision}.
+Kirschstein, T., Liebscher, S., and Becker, C. (2013): Robust estimation of location and scatter by pruning the minimum spanning tree, \emph{Journal of Multivariate Analysis}, 120, 173-184, DOI: 10.1016/j.jmva.2013.05.004.
 
-Liebscher, S., Kirschstein, T., and Becker, C. (2012): The Flood Algorithm - A Multivariate, Self-Organizing-Map-Based, Robust Location and Covariance Estimator, \emph{Statistics and Computing}, DOI: 10.1007/s11222-011-9250-3.
+Liebscher, S., Kirschstein, T., and Becker, C. (2012): The Flood Algorithm - A Multivariate, Self-Organizing-Map-Based, Robust Location and Covariance Estimator, \emph{Statistics and Computing}, 22(1), 325-336, DOI: 10.1007/s11222-011-9250-3.
 
-Liebscher, S., Kirschstein, T., and Becker, C. (201x): RDELA - A Delaunay-Triangulation-based, Location and Covariance Estimator with High Breakdown Point, to appear in \emph{Statistics and Computing}, DOI: 10.1007/s11222-012-9337-5.
+Liebscher, S., Kirschstein, T., and Becker, C. (2013): RDELA - A Delaunay-Triangulation-based, Location and Covariance Estimator with High Breakdown Point, \emph{Statistics and Computing}, DOI: 10.1007/s11222-012-9337-5.
 }
 
 \keyword{ robust }