Version: 1.13.6 [2008-08-21]
o Updated Fusion SDK from 1.0.10b (Jan 2008) to 1.0.11 (July 2008).
git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/affxparser@33423 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -521,22 +521,18 @@ readCcg <- function(pathname, verbose=0, .filter=NULL, ...) { |
521 | 521 |
## nchars <- nchars[1]; |
522 | 522 |
nchars <- readInt(con=value, n=1); |
523 | 523 |
rm(value); |
524 |
- gc <- gc(); |
|
525 | 524 |
|
526 | 525 |
ccs <- 1:(size-4); |
527 | 526 |
value <- raw[ccs,]; |
528 | 527 |
raw <- raw[-ccs,,drop=FALSE]; |
529 |
- gc <- gc(); |
|
530 | 528 |
value <- rawToChar(value, multiple=TRUE); |
531 | 529 |
dim(value) <- c(nchars, nbrOfRows); |
532 |
- gc <- gc(); |
|
533 | 530 |
|
534 | 531 |
# Build strings using vectorization (not apply()!) |
535 | 532 |
strs <- NULL; |
536 | 533 |
for (pp in seq(length=nrow(value))) { |
537 | 534 |
valuePP <- value[1,,drop=FALSE]; |
538 | 535 |
value <- value[-1,,drop=FALSE]; |
539 |
-# gc <- gc(); |
|
540 | 536 |
if (pp == 1) { |
541 | 537 |
strs <- valuePP; |
542 | 538 |
} else { |
... | ... |
@@ -550,16 +546,12 @@ readCcg <- function(pathname, verbose=0, .filter=NULL, ...) { |
550 | 546 |
ccs <- 1:size; |
551 | 547 |
value <- raw[ccs,,drop=FALSE]; |
552 | 548 |
raw <- raw[-ccs,,drop=FALSE]; |
553 |
- gc <- gc(); |
|
554 | 549 |
value <- readBin(con=value, what=what, size=size, signed=signed, endian="big", n=nbrOfRows); |
555 | 550 |
} |
556 | 551 |
|
557 |
- # Garbage collect |
|
558 |
- gc <- gc(); |
|
559 |
- |
|
560 | 552 |
table[[cc]] <- value; |
561 | 553 |
colsOffset <- colsOffset + size; |
562 |
- } |
|
554 |
+ } # for (cc ...) |
|
563 | 555 |
|
564 | 556 |
# Turn into a data frame |
565 | 557 |
attr(table, "row.names") <- .set_row_names(length(table[[1]])); |
... | ... |
@@ -574,6 +566,8 @@ readCcg <- function(pathname, verbose=0, .filter=NULL, ...) { |
574 | 566 |
|
575 | 567 |
############################################################################ |
576 | 568 |
# HISTORY: |
569 |
+# 2008-08-23 |
|
570 |
+# o SPEED UP: Removed all gc() calls. |
|
577 | 571 |
# 2008-01-13 |
578 | 572 |
# o Removed dependency on intToChar() in R.utils. |
579 | 573 |
# o BUG FIX/UPDATE: The file format was updated between April 2006 and |
... | ... |
@@ -1,8 +1,14 @@ |
1 | 1 |
Package: affxparser |
2 | 2 |
=================== |
3 | 3 |
|
4 |
+Version: 1.13.7 [2008-08-23] |
|
5 |
+o SPEED UP: readCcg() is substantially faster after removing |
|
6 |
+ all gc() calls. |
|
7 |
+ |
|
8 |
+ |
|
4 | 9 |
Version: 1.13.6 [2008-08-21] |
5 |
-o Updated Fusion SDK from 1.10b to 1.11 |
|
10 |
+o Updated Fusion SDK from 1.0.10b (Jan 2008) to 1.0.11 (July 2008). |
|
11 |
+ |
|
6 | 12 |
|
7 | 13 |
Version: 1.13.x [2008-08-14] |
8 | 14 |
o Fixed typos and incorrect equation in help page |