Browse code

o CLEANUP: Removed R CMD check NOTEs that appeared in recent R versions.

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/affxparser@93597 bc3139a8-67e5-0310-9ffc-ced21a209358

H Bengtsson authored on 26/08/2014 00:45:01
Showing 7 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: affxparser
2
-Version: 1.37.0
2
+Version: 1.37.1
3 3
 Depends: R (>= 2.6.0)
4
-Suggests: R.utils (>= 1.29.8), AffymetrixDataTestFiles
5
-Date: 2014-04-11
4
+Suggests: R.oo (>= 1.18.0), R.utils (>= 1.32.4), AffymetrixDataTestFiles
5
+Date: 2014-08-25
6 6
 Title: Affymetrix File Parsing SDK
7 7
 Authors@R: c(
8 8
   person("Henrik", "Bengtsson", role=c("aut")),
... ...
@@ -13,7 +13,7 @@ Authors@R: c(
13 13
 Author: Henrik Bengtsson [aut], James Bullard [aut], Robert Gentleman [ctb], Kasper Daniel Hansen [aut, cre], Martin Morgan [ctb]
14 14
 Maintainer: Kasper Daniel Hansen <[email protected]>
15 15
 Description: Package for parsing Affymetrix files (CDF, CEL, CHP, BPMAP, BAR).  It provides methods for fast and memory efficient parsing of Affymetrix files using the Affymetrix' Fusion SDK.  Both ASCII- and binary-based files are supported.  Currently, there are methods for reading chip definition file (CDF) and a cell intensity file (CEL).  These files can be read either in full or in part.  For example, probe signals from a few probesets can be extracted very quickly from a set of CEL files into a convenient list structure.
16
-FusionDetails: Fusion SDK v1.1.2
16
+Note: Fusion SDK v1.1.2
17 17
 License: LGPL (>= 2)
18 18
 LazyLoad: yes
19 19
 biocViews: Infrastructure, DataImport
... ...
@@ -1,6 +1,10 @@
1 1
 Package: affxparser
2 2
 ===================
3 3
 
4
+Version: 1.37.1 [2014-08-25]
5
+o CLEANUP: Removed R CMD check NOTEs that appeared in recent R versions.
6
+
7
+
4 8
 Version: 1.37.0 [2014-04-11]
5 9
 o The version number was bumped for the Bioconductor devel version,
6 10
   which is now BioC v2.15 for R (>= 3.1.0).
... ...
@@ -41,7 +41,10 @@
41 41
 # @keyword internal
42 42
 #**/#######################################################################
43 43
 arrangeCelFilesByChipType <- function(pathnames=list.files(pattern="[.](cel|CEL)$"), path="celFiles/", aliases=NULL, ...) {
44
-  require("R.utils") || throw("Package not loaded: R.utils");
44
+  # To please R CMD check
45
+  Arguments <- isFile <- filePath <- NULL;
46
+  rm(list=c("Arguments", "isFile", "filePath"));
47
+  require("R.utils") || stop("Package not loaded: R.utils");
45 48
 
46 49
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
47 50
   # Validate arguments
... ...
@@ -98,6 +101,8 @@ arrangeCelFilesByChipType <- function(pathnames=list.files(pattern="[.](cel|CEL)
98 101
 
99 102
 ############################################################################
100 103
 # HISTORY:
104
+# 2014-08-25
105
+# o Now using stop() instead of throw().
101 106
 # 2012-09-01
102 107
 # o Added argument 'aliases' to arrangeCelFilesByChipType(), e.g.
103 108
 #   arrangeCelFilesByChipType(..., aliases=c("Focus"="HG-Focus")).
... ...
@@ -44,6 +44,9 @@
44 44
 # @keyword internal
45 45
 #**/#######################################################################
46 46
 findFiles <- function(pattern=NULL, paths=NULL, recursive=FALSE, firstOnly=TRUE, allFiles=TRUE, ...) {
47
+  # To please R CMD check
48
+  filePath <- NULL; rm(list="filePath");
49
+
47 50
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
48 51
   # Local functions
49 52
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
... ...
@@ -72,7 +75,7 @@ findFiles <- function(pattern=NULL, paths=NULL, recursive=FALSE, firstOnly=TRUE,
72 75
    (pattern %in% s);
73 76
   }
74 77
 
75
-  
78
+
76 79
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
77 80
   # Validate arguments
78 81
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
... ...
@@ -56,6 +56,10 @@
56 56
 # @keyword "internal"
57 57
 #*/#########################################################################
58 58
 readCdfUnitsWriteMap <- function(filename, units=NULL, ..., verbose=FALSE) {
59
+  # To please R CMD check
60
+  Arguments <- enter <- exit <- NULL;
61
+  rm(list=c("Arguments", "enter", "exit"));
62
+
59 63
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
60 64
   # Validate arguments
61 65
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
... ...
@@ -78,6 +78,10 @@
78 78
 # @keyword "IO"
79 79
 #*/#########################################################################
80 80
 readCelUnits <- function(filenames, units=NULL, stratifyBy=c("nothing", "pmmm", "pm", "mm"), cdf=NULL, ..., addDimnames=FALSE, dropArrayDim=TRUE, transforms=NULL, readMap=NULL, verbose=FALSE) {
81
+  # To please R CMD check
82
+  Arguments <- enter <- exit <- NULL;
83
+  rm(list=c("Arguments", "enter", "exit"));
84
+
81 85
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
82 86
   # Local functions
83 87
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
... ...
@@ -31,7 +31,7 @@
31 31
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
32 32
   # Default version is 1 (one) [1]
33 33
   if (is.null(header$version))
34
-    header$version <- as.integer(1); 
34
+    header$version <- as.integer(1);
35 35
 
36 36
 
37 37
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
... ...
@@ -64,11 +64,11 @@
64 64
 # dependency so as to traverse across the entire parentage of a file.
65 65
 # This information will provide the entire history of how a file came
66 66
 # to be.
67
-# 
68
-# The first data header section immediately follows the file header 
67
+#
68
+# The first data header section immediately follows the file header
69 69
 # section.
70 70
 #
71
-# Item Type  Description 
71
+# Item Type  Description
72 72
 # 1    GUID  The data type identifier. This is used to identify the type
73 73
 #            of data stored in the file. For example:
74 74
 #            * acquisition data (affymetrix-calvin-scan-acquisition)
... ...
@@ -81,14 +81,17 @@
81 81
 #            Example: When a  user manually aligns the grid in a DAT file
82 82
 #            the grid coordinates are updated in the DAT file and the file
83 83
 #            is given a new file identifier.
84
-# 3 DATETIME Date and time of file creation. 	
84
+# 3 DATETIME Date and time of file creation.
85 85
 # 4   LOCALE The locale of the operating system that the file was created on.
86
-# 5 	   INT The number of name/type/value parameters. 	
86
+# 5 	   INT The number of name/type/value parameters.
87 87
 # 6 	 WVT[] Array of parameters stored as name/value/type triplets.
88 88
 #            WVT[]=(WSTRING/VALUE/TYPE)[]
89
-# 7 	   INT Number of parent file headers. 	
89
+# 7 	   INT Number of parent file headers.
90 90
 # 8 	 GDH[] Array of parent file headers. GDH[]=GenericDataHeader[]
91 91
 .writeCcgDataHeader <- function(con, header, ...) {
92
+  # To please R CMD check
93
+  charToInt <- NULL; rm(list="charToInt");
94
+
92 95
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
93 96
   # Local functions
94 97
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
... ...
@@ -105,7 +108,7 @@
105 108
   }
106 109
 
107 110
   writeString <- function(con, str, ...) {
108
-    # A 1 byte character string. A string object is stored as an INT 
111
+    # A 1 byte character string. A string object is stored as an INT
109 112
     # (to store the string length) followed by the CHAR array (to store
110 113
     # the string contents).
111 114
     str <- as.character(str);
... ...
@@ -131,8 +134,8 @@
131 134
 
132 135
   writeWString <- function(con, str, ...) {
133 136
     # A UNICODE string. A string object is stored as an INT (to store the
134
-    # string length) followed by the WCHAR array (to store the string 
135
-    # contents).    
137
+    # string length) followed by the WCHAR array (to store the string
138
+    # contents).
136 139
     str <- as.character(str);
137 140
     nchars <- as.integer(nchar(str));
138 141
     writeInt(con, value=nchars);
... ...
@@ -164,7 +167,7 @@
164 167
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
165 168
   # Default version is 1 (one) [1]
166 169
   if (is.null(header$version))
167
-    header$version <- as.integer(1); 
170
+    header$version <- as.integer(1);
168 171
 
169 172
 
170 173
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
... ...
@@ -198,8 +201,8 @@
198 201
 # 2012-05-18
199 202
 # o Now using stop() instead of throw().
200 203
 # 2007-08-16
201
-# o This file only contains a stub, so there is currently no 
204
+# o This file only contains a stub, so there is currently no
202 205
 #    writeCcgHeader() or writeCcg().
203 206
 # 2006-11-06
204 207
 # o Created.
205
-############################################################################  
208
+############################################################################