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

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

Author: manuel
Date: 2010-05-06 09:22:09 +0200 (Thu, 06 May 2010)
New Revision: 43

Modified:
   pkg/DESCRIPTION
   pkg/R/archetypes-barplot.R
   pkg/inst/CITATION
Log:


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-05-05 12:14:37 UTC (rev 42)
+++ pkg/DESCRIPTION	2010-05-06 07:22:09 UTC (rev 43)
@@ -2,7 +2,7 @@
 Type: Package
 Title: Archetypal Analysis
 Version: 2.0-1
-Date: 2010-05-05
+Date: 2010-05-06
 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: 42
+Revision: 43

Modified: pkg/R/archetypes-barplot.R
===================================================================
--- pkg/R/archetypes-barplot.R	2010-05-05 12:14:37 UTC (rev 42)
+++ pkg/R/archetypes-barplot.R	2010-05-06 07:22:09 UTC (rev 43)
@@ -10,6 +10,7 @@
 #' @param percentiles Show real values or percentile profiles.
 #' @param below.compressed.height Height of additional tail subplot.
 #' @param below.compressed.srt Rotations of the x-labels.
+#' @param col.atypes Color of archetypes; only used in \code{below.compressed}.
 #' @param ... Passed to the underlying \code{\link{barplot}} call.
 #' @return Undefined.
 #' @method barplot archetypes
@@ -21,7 +22,8 @@
                                which.below = c('compressed', 'default'),
                                percentiles = FALSE,
                                below.compressed.height = 0.1,
-                               below.compressed.srt = 0, ...) {
+                               below.compressed.srt = 0, 
+                               col.atypes = NULL, ...) {
 
   ### Helpers:
   .beside.atypes <- function() {
@@ -53,7 +55,7 @@
     for ( i in 1:(p - 1) ) {
       par(mar = c(0, 5, 1, 0) + 0.1)
       x.at <- barplot(atypes[i,], ylab = ylab, ylim = ylim,
-                      names.arg = '', las = 2, ...)
+                      names.arg = '', las = 2, col = col.atypes[i], ...)
       mtext(sprintf('Archetype %s', i), side = 2, line = 4,
             cex = par('cex'))
     }
@@ -79,6 +81,7 @@
     which.arg <- match.arg(which.beside)
   else
     which.arg <- match.arg(which.below)
+   
 
   atypes <- parameters(height)
   rownames(atypes) <- sprintf('Archetype %s',

Modified: pkg/inst/CITATION
===================================================================
--- pkg/inst/CITATION	2010-05-05 12:14:37 UTC (rev 42)
+++ pkg/inst/CITATION	2010-05-06 07:22:09 UTC (rev 43)
@@ -23,7 +23,7 @@
 	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",
+	journal="Technical Report 82, Department of Statistics, Ludwig-Maximilians-Universitaet Muenchen, Germany",
 	year="2010",
 	volume="82",
 	pages="1--13",
@@ -33,7 +33,7 @@
 	
 	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.",
+		"Technical Report 82, Department of Statistics, Ludwig-Maximilians-Universitaet Muenchen, Germany. 2010.",
 		"http://epub.ub.uni-muenchen.de/11498/")
 )