[Archetypes-commits] r42 - in pkg: . R inst

[noreply at r-forge.r-project.org]

Author: manuel
Date: 2010-05-05 14:14:37 +0200 (Wed, 05 May 2010)
New Revision: 42

Modified:
   pkg/DESCRIPTION
   pkg/NEWS
   pkg/R/archetypes-kit-blocks.R
   pkg/R/archetypes-xyplot.R
   pkg/inst/CITATION
Log:
(1) small bugs; (2) cite TR; (3) version 2.0-1

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-04-06 13:03:13 UTC (rev 41)
+++ pkg/DESCRIPTION	2010-05-05 12:14:37 UTC (rev 42)
@@ -1,8 +1,8 @@
 Package: archetypes
 Type: Package
 Title: Archetypal Analysis
-Version: 2.0
-Date: 2010-04-06
+Version: 2.0-1
+Date: 2010-05-05
 Depends: methods, stats, modeltools, nnls (>= 1.1)
 Suggests: MASS, vcd, mlbench
 Author: Manuel J. A. Eugster <manuel.eugster at stat.uni-muenchen.de>
@@ -11,4 +11,4 @@
   archetypal analysis supporting arbitary problem solving mechanisms
   for the different conceputal parts of the algorithm.
 License: GPL (>= 2)
-Revision: 41
+Revision: 42

Modified: pkg/NEWS
===================================================================
--- pkg/NEWS	2010-04-06 13:03:13 UTC (rev 41)
+++ pkg/NEWS	2010-05-05 12:14:37 UTC (rev 42)
@@ -1,4 +1,14 @@
 
+Changes in archetypes version 2.0-1
+
+  o 'no.scalefn' returns an empty matrix if 'zs' is null.
+
+  o 'xyplot.weightedArchetypes' displays the main diagonal if
+    'weights' is a matrix.
+
+  o Technical report on robust and weighted archetypes is cited.
+
+
 Changes in archetypes version 2.0
 
   o cleaned up interface; see '?archetypes-deprecated' and

Modified: pkg/R/archetypes-kit-blocks.R
===================================================================
--- pkg/R/archetypes-kit-blocks.R	2010-04-06 13:03:13 UTC (rev 41)
+++ pkg/R/archetypes-kit-blocks.R	2010-05-05 12:14:37 UTC (rev 42)
@@ -50,6 +50,9 @@
 #' @return Archetypes zs.
 #' @nord
 no.rescalefn <- function(x, zs, ...) {
+  if ( is.null(zs) )
+    return(matrix(NA, nrow = 0, ncol = 0))
+
   return(zs)
 }
 

Modified: pkg/R/archetypes-xyplot.R
===================================================================
--- pkg/R/archetypes-xyplot.R	2010-04-06 13:03:13 UTC (rev 41)
+++ pkg/R/archetypes-xyplot.R	2010-05-05 12:14:37 UTC (rev 42)
@@ -120,7 +120,10 @@
                                       link.col = NULL, link.lty = NULL,
                                       weights.type = 'weights', ...) {
 
-  w <- 1 - weights(x, type = weights.type)
+  w <- weights(x, type = weights.type)
+  if ( is.matrix(w) )
+    w <- diag(w)
+  w <- 1 - w
 
   if ( is.null(link.col) )
     link.col <- ifelse(w == 1, 1, data.bg(w))

Modified: pkg/inst/CITATION
===================================================================
--- pkg/inst/CITATION	2010-04-06 13:03:13 UTC (rev 41)
+++ pkg/inst/CITATION	2010-05-05 12:14:37 UTC (rev 42)
@@ -1,4 +1,3 @@
-citHeader("To cite package archetypes in publications use:")
 
 citEntry(entry="Article",
 	title="{From {S}pider-{M}an to {H}ero -- Archetypal Analsis in {R}",
@@ -10,6 +9,8 @@
 	number="8",
 	pages="1--23",
 	url="http://www.jstatsoft.org/v30/i08/",
+
+	header="To cite package archetypes in publications use:",
 	
 	textVersion=paste("Manuel J. A. Eugster and Friedrich Leisch.",
 		"From Spider-Man to Hero -- Archetypal Analysis in R.",
@@ -17,3 +18,22 @@
 		"http://www.jstatsoft.org/v30/i08/")
 )
 
+
+citEntry(entry="Article",
+	title="Weighted and Robust Archetypal Analysis",
+	author=personList(as.person("Manuel J. A. Eugster"),
+		as.person("Friedrich Leisch")),
+	journal="Technical Report 82, Department of Statistics, Ludwig-Maximilians-Universität München, Germany",
+	year="2010",
+	volume="82",
+	pages="1--13",
+	url="http://epub.ub.uni-muenchen.de/11498/",
+
+	header="To cite weighted and robust archetypes in publications use:",
+	
+	textVersion=paste("Manuel J. A. Eugster and Friedrich Leisch.",
+		"Weighted and Robust Archetypal Analysis",
+		"Technical Report 82, Department of Statistics, Ludwig-Maximilians-Universität München, Germany. 2010.",
+		"http://epub.ub.uni-muenchen.de/11498/")
+)
+