[R-gregmisc-users] SF.net SVN: r-gregmisc:[1643] trunk/gdata

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

Revision: 1643
          http://sourceforge.net/p/r-gregmisc/code/1643
Author:   warnes
Date:     2013-03-24 04:34:45 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
Replaced calls to depreciated function ".path.package" with the new public function "path.package".

Modified Paths:
--------------
    trunk/gdata/DESCRIPTION
    trunk/gdata/inst/NEWS
    trunk/gdata/man/read.xls.Rd
    trunk/gdata/man/sheetCount.Rd
    trunk/gdata/tests/test.read.xls.R

Modified: trunk/gdata/DESCRIPTION
===================================================================
--- trunk/gdata/DESCRIPTION	2013-03-24 04:20:02 UTC (rev 1642)
+++ trunk/gdata/DESCRIPTION	2013-03-24 04:34:45 UTC (rev 1643)
@@ -4,8 +4,8 @@
 Depends: R (>= 2.13.0)
 SystemRequirements: perl
 Imports: gtools
-Version: 2.13.0
-Date: 2012-09-20
+Version: 2.13.1
+Date: 2013-03-24
 Author: Gregory R. Warnes, with contributions from Liviu Andronic, Ben
         Bolker, Gregor Gorjanc, Gabor Grothendieck, Ales Korosec,
         Thomas Lumley, Don MacQueen, Arni Magnusson, Jim Rogers, and

Modified: trunk/gdata/inst/NEWS
===================================================================
--- trunk/gdata/inst/NEWS	2013-03-24 04:20:02 UTC (rev 1642)
+++ trunk/gdata/inst/NEWS	2013-03-24 04:34:45 UTC (rev 1643)
@@ -1,3 +1,11 @@
+Changes in 2.13.1 (2013-03-24)
+------------------------------
+
+Enhancements:
+
+- Replaced calls to depreciated function ".path.package" with the new public function "path.package".
+
+
 Changes in 2.13.0 (2012-09-20)
 -----------------------------
 
@@ -31,9 +39,9 @@
 - 'stats::aggregate' was made into a generic on 27-Jan-2010, so that
    attempting to call 'aggregate' on a 'table' object will now
    incorrectly call 'aggregate.table'.  Since 'aggregate.table' can be
-   replaced by a call to tapply using two index vectors, e.g. 
-       aggregate.table(x, by1=a, by2=b, mean) 
-   can be replaced by 
+   replaced by a call to tapply using two index vectors, e.g.
+       aggregate.table(x, by1=a, by2=b, mean)
+   can be replaced by
        tapply(x, INDEX=list(a, b), FUN=mean),
    the 'aggregate.table' function will now display a warning that it
    is depreciated and recommending the equivalent call to tapply. It
@@ -161,7 +169,7 @@
 
 Enhancements:
 
-- nPairs() gains a summary method that shows how many times each variable 
+- nPairs() gains a summary method that shows how many times each variable
   is known, while the other variable of a pair is not
 
 Bug fixes:
@@ -222,7 +230,7 @@
   build issues, particularly on Windows.
 
 - All perl code can now operate (but generate warnings) when perl modules Compress::Raw::Zlib and
-  Spreadsheet::XLSX when are not installed. 
+  Spreadsheet::XLSX when are not installed.
 
 - Also update Greg's email address.
 
@@ -231,8 +239,8 @@
 
 Enhancements:
 
-- on Windows attempts to locate ActiveState perl if perl= not specified and 
-  Rtools perl would have otherwise been used in read.xls and other perl 
+- on Windows attempts to locate ActiveState perl if perl= not specified and
+  Rtools perl would have otherwise been used in read.xls and other perl
   dependent functions.
 
 CHANGES IN 2.7.0 (2010-01-25)
@@ -260,7 +268,7 @@
 
 New Functions:
 
-- sheetCount() and sheetNames() to determine the number and names of 
+- sheetCount() and sheetNames() to determine the number and names of
   worksheets in an Excel file, respectively.
 
 Bug Fixes:
@@ -285,7 +293,7 @@
 Bug Fixes
 
 - Correct minor typos & issues in man pages for write.fwf(),
-  resample() (Greg Warnes) 
+  resample() (Greg Warnes)
 
 - Correct calculation of object sizes in env() and ll() (Gregor Gorjanc)
 
@@ -297,20 +305,20 @@
 - Enhanced function object.size that returns the size of multiple
   objects. There is also a handy print method that can print size of
   an object in "human readable" format when
-    options(humanReadable=TRUE) 
-  or 
-    print(object.size(x), humanReadable=TRUE). 
-  (Gregor Gorjanc) 
+    options(humanReadable=TRUE)
+  or
+    print(object.size(x), humanReadable=TRUE).
+  (Gregor Gorjanc)
 
 - New function wideByFactor that reshapes given dataset by a given
-  factor - it creates a "multivariate" data.frame. (Gregor Gorjanc) 
+  factor - it creates a "multivariate" data.frame. (Gregor Gorjanc)
 
 - New function nPairs that gives the number of variable pairs in a
-  data.frame or a matrix. (Gregor Gorjanc) 
+  data.frame or a matrix. (Gregor Gorjanc)
 
 - New functions getYear, getMonth, getDay, getHour, getMin, and getSec
   for extracting the date/time parts from objects of a date/time
-  class. (Gregor Gorjanc) 
+  class. (Gregor Gorjanc)
 
 - New function bindData that binds two data frames into a multivariate
   data frame in a different way than merge. (Gregor Gorjanc)
@@ -332,7 +340,7 @@
 
 - New function bindData that binds two data frames into a multivariate data frame
   in a different way than merge.
-  
+
 - New function wideByFactor that reshapes given dataset by a given factor -
   it creates a "multivariate" data.frame.
 
@@ -346,7 +354,7 @@
 
 - New function cbindX that can bind objects with different number of rows.
 
-- write.fwf gains the width argument. The value for unknown can increase or 
+- write.fwf gains the width argument. The value for unknown can increase or
   decrease the width of the columns. Additional tests and documentation fixes.
 
 CHANGES IN 2.4.2 (2008-05-11)

Modified: trunk/gdata/man/read.xls.Rd
===================================================================
--- trunk/gdata/man/read.xls.Rd	2013-03-24 04:20:02 UTC (rev 1642)
+++ trunk/gdata/man/read.xls.Rd	2013-03-24 04:34:45 UTC (rev 1643)
@@ -67,7 +67,7 @@
 \examples{
 
    # iris.xls is included in the gregmisc package for use as an example
-   xlsfile <- file.path(.path.package('gdata'),'xls','iris.xls')
+   xlsfile <- file.path(path.package('gdata'),'xls','iris.xls')
    xlsfile
 
    iris <- read.xls(xlsfile) # defaults to csv format
@@ -121,9 +121,9 @@
 
    ## Examples demonstrating selection of specific 'sheets'
    ## from the example XLS file 'ExampleExcelFile.xls'
-   exampleFile <- file.path(.path.package('gdata'),'xls',
+   exampleFile <- file.path(path.package('gdata'),'xls',
                             'ExampleExcelFile.xls')
-   exampleFile2007 <- file.path(.path.package('gdata'),'xls',
+   exampleFile2007 <- file.path(path.package('gdata'),'xls',
                             'ExampleExcelFile.xlsx')
 
    ## see the number and names of sheets:
@@ -147,7 +147,7 @@
 
    ## load a file containing data and column names using latin-1
    ## characters
-   latinFile <- file.path(.path.package('gdata'),'xls','latin-1.xls')
+   latinFile <- file.path(path.package('gdata'),'xls','latin-1.xls')
    latin1 <- read.xls(latinFile, fileEncoding="latin1")
    colnames(latin1)
 

Modified: trunk/gdata/man/sheetCount.Rd
===================================================================
--- trunk/gdata/man/sheetCount.Rd	2013-03-24 04:20:02 UTC (rev 1642)
+++ trunk/gdata/man/sheetCount.Rd	2013-03-24 04:34:45 UTC (rev 1643)
@@ -34,9 +34,9 @@
    sheetCount(xlsfile)
 
 
-   exampleFile <- file.path(.path.package('gdata'),'xls',
+   exampleFile <- file.path(path.package('gdata'),'xls',
                             'ExampleExcelFile.xls')
-   exampleFile2007 <- file.path(.path.package('gdata'),'xls',
+   exampleFile2007 <- file.path(path.package('gdata'),'xls',
                             'ExampleExcelFile.xlsx')
 
    sheetCount(exampleFile)

Modified: trunk/gdata/tests/test.read.xls.R
===================================================================
--- trunk/gdata/tests/test.read.xls.R	2013-03-24 04:20:02 UTC (rev 1642)
+++ trunk/gdata/tests/test.read.xls.R	2013-03-24 04:34:45 UTC (rev 1643)
@@ -6,7 +6,7 @@
   }
 
 # iris.xls is included in the gregmisc package for use as an example
-xlsfile <- file.path(.path.package('gdata'),'xls','iris.xls')
+xlsfile <- file.path(path.package('gdata'),'xls','iris.xls')
 
 iris.1 <- read.xls(xlsfile) # defaults to csv format
 iris.1
@@ -20,10 +20,10 @@
 stopifnot(all.equal(iris.1, iris.2))
 stopifnot(all.equal(iris.1, iris.3))
 
-exampleFile <- file.path(.path.package('gdata'),'xls',
+exampleFile <- file.path(path.package('gdata'),'xls',
                          'ExampleExcelFile.xls')
 
-exampleFile2007 <- file.path(.path.package('gdata'),'xls',
+exampleFile2007 <- file.path(path.package('gdata'),'xls',
                          'ExampleExcelFile.xlsx')
 
 # see the number and names of sheets:
@@ -86,8 +86,8 @@
 
 ## Check handing of fileEncoding for latin-1 characters
 
-latin1File <- file.path(.path.package('gdata'),'xls', 'latin-1.xls')
-latin1FileX <- file.path(.path.package('gdata'),'xls', 'latin-1.xlsx')
+latin1File <- file.path(path.package('gdata'),'xls', 'latin-1.xls')
+latin1FileX <- file.path(path.package('gdata'),'xls', 'latin-1.xlsx')
 
 example.latin1 <- read.xls(latin1File, fileEncoding='latin1')
 

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