[Patchwork-commits] r201 - .git .git/logs .git/logs/refs/heads .git/logs/refs/remotes/origin .git/refs/heads .git/refs/remotes/origin pkg/TAPS/R

[noreply at r-forge.r-project.org]

Author: sebastian_d
Date: 2014-01-14 16:12:43 +0100 (Tue, 14 Jan 2014)
New Revision: 201

Modified:
   .git/COMMIT_EDITMSG
   .git/index
   .git/logs/HEAD
   .git/logs/refs/heads/master
   .git/logs/refs/remotes/origin/master
   .git/refs/heads/master
   .git/refs/remotes/origin/master
   pkg/TAPS/R/TAPS.r
Log:
update to xlsx handling (barely needed anymore)

Modified: .git/COMMIT_EDITMSG
===================================================================
--- .git/COMMIT_EDITMSG	2014-01-13 08:50:26 UTC (rev 200)
+++ .git/COMMIT_EDITMSG	2014-01-14 15:12:43 UTC (rev 201)
@@ -1 +1 @@
-2014 making sure everything is synced rforge/git
+update to xlsx handling (barely needed anymore)

Modified: .git/index
===================================================================
(Binary files differ)

Modified: .git/logs/HEAD
===================================================================
--- .git/logs/HEAD	2014-01-13 08:50:26 UTC (rev 200)
+++ .git/logs/HEAD	2014-01-14 15:12:43 UTC (rev 201)
@@ -78,3 +78,4 @@
 a3d6911bbe093e6a2149615473f958a9081f4745 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1386336664 +0100	commit: small fix mppile2alleles
 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 1c3b0b54598dac7863316a79427364b873bec3f3 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602878 +0100	commit: 2014 making sure everything is synced rforge/git
 1c3b0b54598dac7863316a79427364b873bec3f3 78c55c83e03724a24900fbaf881864197d23ab4d Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602903 +0100	pull: Merge made by the 'recursive' strategy.
+78c55c83e03724a24900fbaf881864197d23ab4d 218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712335 +0100	commit: update to xlsx handling (barely needed anymore)

Modified: .git/logs/refs/heads/master
===================================================================
--- .git/logs/refs/heads/master	2014-01-13 08:50:26 UTC (rev 200)
+++ .git/logs/refs/heads/master	2014-01-14 15:12:43 UTC (rev 201)
@@ -78,3 +78,4 @@
 a3d6911bbe093e6a2149615473f958a9081f4745 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1386336664 +0100	commit: small fix mppile2alleles
 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 1c3b0b54598dac7863316a79427364b873bec3f3 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602878 +0100	commit: 2014 making sure everything is synced rforge/git
 1c3b0b54598dac7863316a79427364b873bec3f3 78c55c83e03724a24900fbaf881864197d23ab4d Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602903 +0100	pull: Merge made by the 'recursive' strategy.
+78c55c83e03724a24900fbaf881864197d23ab4d 218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712335 +0100	commit: update to xlsx handling (barely needed anymore)

Modified: .git/logs/refs/remotes/origin/master
===================================================================
--- .git/logs/refs/remotes/origin/master	2014-01-13 08:50:26 UTC (rev 200)
+++ .git/logs/refs/remotes/origin/master	2014-01-14 15:12:43 UTC (rev 201)
@@ -75,3 +75,4 @@
 a3d6911bbe093e6a2149615473f958a9081f4745 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1386336669 +0100	update by push
 c66991c3bf461c1c1ad49a9f3381716cefcc0e32 65601241ae236432ef8a7f3aab8d7af3068d4344 Sebastian DiLorenzo <S_D at array-47-13.medsci.uu.se> 1389602902 +0100	pull: fast-forward
 65601241ae236432ef8a7f3aab8d7af3068d4344 78c55c83e03724a24900fbaf881864197d23ab4d Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389602990 +0100	update by push
+78c55c83e03724a24900fbaf881864197d23ab4d 218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1389712343 +0100	update by push

Modified: .git/refs/heads/master
===================================================================
--- .git/refs/heads/master	2014-01-13 08:50:26 UTC (rev 200)
+++ .git/refs/heads/master	2014-01-14 15:12:43 UTC (rev 201)
@@ -1 +1 @@
-78c55c83e03724a24900fbaf881864197d23ab4d
+218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8

Modified: .git/refs/remotes/origin/master
===================================================================
--- .git/refs/remotes/origin/master	2014-01-13 08:50:26 UTC (rev 200)
+++ .git/refs/remotes/origin/master	2014-01-14 15:12:43 UTC (rev 201)
@@ -1 +1 @@
-78c55c83e03724a24900fbaf881864197d23ab4d
+218c5c8fe2ba9eb21c155ba9c5696b8eebfb90e8

Modified: pkg/TAPS/R/TAPS.r
===================================================================
--- pkg/TAPS/R/TAPS.r	2014-01-13 08:50:26 UTC (rev 200)
+++ pkg/TAPS/R/TAPS.r	2014-01-14 15:12:43 UTC (rev 201)
@@ -25,7 +25,7 @@
     suppressPackageStartupMessages(library(stats))
     suppressPackageStartupMessages(library(DNAcopy))
     suppressPackageStartupMessages(library(fields))
-    suppressPackageStartupMessages(library(xlsx))    
+    #suppressPackageStartupMessages(library(xlsx))    
     suppressPackageStartupMessages(library(foreach))
     suppressPackageStartupMessages(library(doMC))
     suppressPackageStartupMessages(registerDoMC(cores=cores))
@@ -267,7 +267,7 @@
 TAPS_call <- function(samples='all',directory=getwd(),cores=1) {
     minseg=1
     maxCn=12
-    suppressPackageStartupMessages(library(xlsx))    
+    #suppressPackageStartupMessages(library(xlsx))    
     suppressPackageStartupMessages(library(foreach))
     suppressPackageStartupMessages(library(doMC))
     suppressPackageStartupMessages(registerDoMC(cores=cores))
@@ -292,6 +292,7 @@
     {
         if (length(grep('SampleData.xlsx',dir()))==1)
         {
+            try(library(xlsx))
             sampleData=read.xlsx('SampleData.xlsx',1)
             save.txt(sampleData,'SampleData.csv')
         }