Browse code

removed redundant if test from zzz.R; updated creation string in MotifList-class.R

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@70958 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 05/11/2012 03:06:48
Showing 3 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: MotifDb
2 2
 Type: Package
3 3
 Title: An Annotated Collection of Protein-DNA Binding Sequence Motifs
4
-Version: 1.1.5
5
-Date: 2012-11-01
4
+Version: 1.1.6
5
+Date: 2012-11-04
6 6
 Author: Paul Shannon
7 7
 Maintainer: Paul Shannon <pshannon@fhcrc.org>
8 8
 Depends: R (>= 2.15.0), methods, IRanges, Biostrings
... ...
@@ -197,13 +197,12 @@ setMethod ('export',  signature=c(object='MotifList',  con='missing',
197 197
 setMethod('show', 'MotifList',
198 198
 
199 199
     function(object) {
200
-        
201 200
       msg = sprintf ('MotifDb object of length %d', length (object))
202 201
       cat (msg, '\n', sep='')
203 202
       if (length (object) == 0)
204 203
         return ()
205 204
       
206
-      cat ('| Created from downloaded public sources: 2012-Jul6', '\n', sep='')
205
+      cat ('| Created from downloaded public sources: 2012-Nov-01', '\n', sep='')
207 206
 
208 207
       tbl.dataSource = as.data.frame (table (values (object)$dataSource))
209 208
       tbl.org = as.data.frame (table (values (object)$organism))
... ...
@@ -7,17 +7,15 @@ MotifDb <- NULL
7 7
   if(loadAllSources) {
8 8
     data.path = system.file('extdata', package='MotifDb')
9 9
     data.files = dir(data.path, full.names=TRUE)
10
-  
11
-    if(length(data.files) > 0)   
12
-      for(data.file in data.files) {
13
-         # define these to keep 'check' happy.  they are loaded by 'load'
14
-        tbl.md = NA; matrices = NA;  
15
-        variables = load(data.file)
16
-        mdb = append(mdb, MotifList(matrices, tbl.md))
17
-        if(!quiet) 
18
-          message(noquote(sprintf('added %s(%d) matrices, length now: %d',
19
-                   basename(data.file), length(matrices), length(mdb))))
20
-      } # for data.file
10
+    for(data.file in data.files) {
11
+       # define these to keep 'check' happy.  they are loaded by 'load'
12
+      tbl.md = NA; matrices = NA;  
13
+      variables = load(data.file)
14
+      mdb = append(mdb, MotifList(matrices, tbl.md))
15
+      if(!quiet) 
16
+        message(noquote(sprintf('added %s(%d) matrices, length now: %d',
17
+                 basename(data.file), length(matrices), length(mdb))))
18
+    } # for data.file
21 19
   
22 20
     if(!quiet) {
23 21
       print(table(values(mdb)$dataSource))