[R-gregmisc-users] SF.net SVN: r-gregmisc:[1749] trunk/SII

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

Revision: 1749
          http://sourceforge.net/p/r-gregmisc/code/1749
Author:   warnes
Date:     2013-12-06 21:36:09 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Remove obsolete .First.lib() function and instead call data() within sii.excel().

Modified Paths:
--------------
    trunk/SII/DESCRIPTION
    trunk/SII/R/sii.excel.R

Removed Paths:
-------------
    trunk/SII/R/First.lib.R

Modified: trunk/SII/DESCRIPTION
===================================================================
--- trunk/SII/DESCRIPTION	2013-11-26 14:38:58 UTC (rev 1748)
+++ trunk/SII/DESCRIPTION	2013-12-06 21:36:09 UTC (rev 1749)
@@ -1,8 +1,8 @@
 Package: SII
 Type: Package
 Title: Calculate ANSI S3.5-1997 Speech Intelligibility Index
-Version: 1.0.2
-Date: 2011-09-01
+Version: 1.0.3
+Date: 2013-12-06
 Author: Gregory R. Warnes
 Maintainer: Gregory R. Warnes <gr...@wa...>
 Description: 

Deleted: trunk/SII/R/First.lib.R
===================================================================
--- trunk/SII/R/First.lib.R	2013-11-26 14:38:58 UTC (rev 1748)
+++ trunk/SII/R/First.lib.R	2013-12-06 21:36:09 UTC (rev 1749)
@@ -1,4 +0,0 @@
-.First.lib <- function(libname, pkgname)
-  {
-    data(sii.constants, package=pkgname)
-  }

Modified: trunk/SII/R/sii.excel.R
===================================================================
--- trunk/SII/R/sii.excel.R	2013-11-26 14:38:58 UTC (rev 1748)
+++ trunk/SII/R/sii.excel.R	2013-12-06 21:36:09 UTC (rev 1749)
@@ -10,6 +10,8 @@
   if(length(THDI) != length(freq))
     stop("THDI must have the same length as freq")
 
+  data(sii.constants, package="SII", envir=parent.frame())
+  
   # Interpolate unobserved frequencies 
   sii.freqs <- sii.constants[,1]
   

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