[R-gregmisc-users] SF.net SVN: r-gregmisc:[1490] trunk/gplots

[<wa...@us...>]

Revision: 1490
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1490&view=rev
Author:   warnes
Date:     2011-09-01 20:10:44 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
- Comment out import from KernSmooth in NAMESPACES, since KernSmooth
  doesn't provide a namespace.
- Update a test output.

Modified Paths:
--------------
    trunk/gplots/DESCRIPTION
    trunk/gplots/NAMESPACE
    trunk/gplots/tests/heatmap2Test.Rout.save

Modified: trunk/gplots/DESCRIPTION
===================================================================
--- trunk/gplots/DESCRIPTION	2011-09-01 19:47:03 UTC (rev 1489)
+++ trunk/gplots/DESCRIPTION	2011-09-01 20:10:44 UTC (rev 1490)
@@ -1,8 +1,8 @@
 Package: gplots
 Title: Various R programming tools for plotting data
 Description: Various R programming tools for plotting data
-Depends: gtools, gdata, stats, caTools, grid
-Recommends: datasets, grid, MASS, KernSmooth
+Depends: gtools, gdata, stats, caTools, grid, KernSmooth
+Recommends: datasets, grid, MASS
 Requires: R (>= 2.10)
 Suggests: gtools
 Version: 2.10.0

Modified: trunk/gplots/NAMESPACE
===================================================================
--- trunk/gplots/NAMESPACE	2011-09-01 19:47:03 UTC (rev 1489)
+++ trunk/gplots/NAMESPACE	2011-09-01 20:10:44 UTC (rev 1490)
@@ -43,8 +43,9 @@
 #importFrom(caTools, runsd)
 #importFrom(caTools, runmean)
 
-importFrom(KernSmooth, bkdeD2)
-importFrom(KernSmooth, dpik)
+# No Namespace
+#importFrom(KernSmooth, bkdeD2)
+#importFrom(KernSmooth, dpik)
 
 
 

Modified: trunk/gplots/tests/heatmap2Test.Rout.save
===================================================================
--- trunk/gplots/tests/heatmap2Test.Rout.save	2011-09-01 19:47:03 UTC (rev 1489)
+++ trunk/gplots/tests/heatmap2Test.Rout.save	2011-09-01 20:10:44 UTC (rev 1490)
@@ -1,7 +1,8 @@
 
-R version 2.10.0 alpha (2009-10-08 r49995)
-Copyright (C) 2009 The R Foundation for Statistical Computing
+R version 2.12.1 (2010-12-16)
+Copyright (C) 2010 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
+Platform: i686-pc-linux-gnu (32-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
 You are welcome to redistribute it under certain conditions.
@@ -18,25 +19,29 @@
 > library(gplots)
 Loading required package: gtools
 Loading required package: gdata
+gdata: read.xls support for 'XLS' (Excel 97-2004) files ENABLED.
 
+gdata: read.xls support for 'XLSX' (Excel 2007+) files ENABLED.
+
 Attaching package: 'gdata'
 
+The following object(s) are masked from 'package:utils':
 
-	The following object(s) are masked from package:utils :
+    object.size
 
-	 object.size 
-
 Loading required package: caTools
 Loading required package: bitops
 Loading required package: grid
+Loading required package: KernSmooth
+KernSmooth 2.23 loaded
+Copyright M. P. Wand 1997-2009
 
 Attaching package: 'gplots'
 
+The following object(s) are masked from 'package:stats':
 
-	The following object(s) are masked from package:stats :
+    lowess
 
-	 lowess 
-
 > 
 > data(mtcars)
 > x  <- as.matrix(mtcars)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.