rbbt-util 5.21.53 → 5.21.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31829ae881d088a7cd47adc6dfc795b6689a3d4b
-  data.tar.gz: 46740907e85c0bb6c868e1a6f33fb895e80bf602
+  metadata.gz: 2694c3dd908e3b5711942aa887313585c82eb817
+  data.tar.gz: 3f2383f88770be0bb1dabab5dd365f46ce46752f
 SHA512:
-  metadata.gz: b819808000c038d237a9aa2b106be23e77c1ed4de6f6f5f523bad424bd20a2871c0448c046e33dbb68f38f1c87731a56ce3233622b1e764508bdb29528242433
-  data.tar.gz: 1267267bdefc38cd739d0713ee00078db20623b3c5d6a3c9ea31a0dede5469da41ffe9b30a3412c13bd6cefc6452e5584bde00687691596d7c3b0877f317501f
+  metadata.gz: dd8982733ba669ea67403459e8fbe0742c5909cffedfe1725629bd704c716669ec64a3f177d00ed2daf6d85af83b8ed6a25fd1cda23f92b88e40c1c343d53d68
+  data.tar.gz: a2f22166721bd4a0d752afaf1062df290524fabe899e4fb383b85a2edfd5d4b27e3611781b5076bd26d73f16f9e123cdc12fb1f84df12887b7f50c646ae5e7b8

data/share/Rlib/util.R

@@ -97,8 +97,7 @@ rbbt.flat.tsv <- function(filename, sep = "\t", comment.char ="#", ...){
   return(result);
 }
 
-rbbt.tsv <- function(filename, sep = "\t", comment.char ="#", row.names=1, check.names=FALSE, fill=TRUE, as.is=TRUE, quote='',  ...){
-  data=read.table(file=filename, sep=sep, fill=fill, as.is=as.is, quote=quote, row.names= row.names, comment.char = comment.char, ...);
+rbbt.tsv.columns <- function(filename, sep="\t"){
   f = file(filename, 'r');
   headers = readLines(f, 1);
   if (length(grep("^#:", headers)) > 0){ 
@@ -106,13 +105,33 @@ rbbt.tsv <- function(filename, sep = "\t", comment.char ="#", row.names=1, check
   } 
   if (length(grep("^#", headers)) > 0){
       fields = strsplit(headers, sep)[[1]];
-      fields = fields[2:length(fields)];
-      names(data) <- fields;
+      close(f);
+      return(fields);
   }
   close(f);
+  return(NULL);
+}
+
+rbbt.tsv <- function(filename, sep = "\t", comment.char ="#", row.names=1, check.names=FALSE, fill=TRUE, as.is=TRUE, quote='',  ...){
+  data=read.table(file=filename, sep=sep, fill=fill, as.is=as.is, quote=quote, row.names= row.names, comment.char = comment.char, ...);
+
+  columns = rbbt.tsv.columns(filename, sep)
+  if (! is.null(columns)){
+      names(data) <- columns[2:length(columns)];
+  }
+
   return(data);
 }
 
+rbbt.tsv.numeric <- function(filename, sep="\t", ...){
+
+    columns = rbbt.tsv.columns(filename, sep)
+
+    colClasses = c('character', rep('numeric', length(columns) - 1))
+
+    return(rbbt.tsv(filename, sep, colClasses= colClasses, ...))
+}
+
 rbbt.tsv2matrix <- function(data){
   new <- data.matrix(data);
   colnames(new) <- colnames(data);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.53
+  version: 5.21.54
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake