[Patchwork-commits] r212 - .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-05-28 11:42:38 +0200 (Wed, 28 May 2014)
New Revision: 212

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:
bjorn short fix

Modified: .git/COMMIT_EDITMSG
===================================================================
--- .git/COMMIT_EDITMSG	2014-05-14 09:23:07 UTC (rev 211)
+++ .git/COMMIT_EDITMSG	2014-05-28 09:42:38 UTC (rev 212)
@@ -1 +1 @@
-hotfix cy750K
+update to TAPS installation information doMC windows

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

Modified: .git/logs/HEAD
===================================================================
--- .git/logs/HEAD	2014-05-14 09:23:07 UTC (rev 211)
+++ .git/logs/HEAD	2014-05-28 09:42:38 UTC (rev 212)
@@ -91,3 +91,7 @@
 cb2b4bc53aac68ec1b56532dbbded71b4eca7582 3bd7f01d1011acc7afac8a149cd922137804fd77 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399362996 +0200	commit: hotfix cy750K
 3bd7f01d1011acc7afac8a149cd922137804fd77 18800d736527a84881558f1f00ba4af0f62807fe Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399972601 +0200	pull: Fast-forward
 18800d736527a84881558f1f00ba4af0f62807fe 933655cc7d8def1beddb1f60ed576d1653ef8504 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399986792 +0200	pull: Fast-forward
+933655cc7d8def1beddb1f60ed576d1653ef8504 9c0a6e3ae1d10f0d2e8e565600b7b86eb13b9518 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399986838 +0200	commit: update to TAPS installation information doMC windows
+9c0a6e3ae1d10f0d2e8e565600b7b86eb13b9518 e244c2ac30341cbf8f109cc96f7661258e9baa93 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1400058009 +0200	pull: Fast-forward
+e244c2ac30341cbf8f109cc96f7661258e9baa93 90e8ee38aac7ead43935bd7034bd4f11f91d19c4 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1400059317 +0200	pull: Fast-forward
+90e8ee38aac7ead43935bd7034bd4f11f91d19c4 6734fab24795a8c823c6a97e0131fcfe5a235107 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1401270131 +0200	pull: Fast-forward

Modified: .git/logs/refs/heads/master
===================================================================
--- .git/logs/refs/heads/master	2014-05-14 09:23:07 UTC (rev 211)
+++ .git/logs/refs/heads/master	2014-05-28 09:42:38 UTC (rev 212)
@@ -91,3 +91,7 @@
 cb2b4bc53aac68ec1b56532dbbded71b4eca7582 3bd7f01d1011acc7afac8a149cd922137804fd77 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399362996 +0200	commit: hotfix cy750K
 3bd7f01d1011acc7afac8a149cd922137804fd77 18800d736527a84881558f1f00ba4af0f62807fe Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399972601 +0200	pull: Fast-forward
 18800d736527a84881558f1f00ba4af0f62807fe 933655cc7d8def1beddb1f60ed576d1653ef8504 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399986792 +0200	pull: Fast-forward
+933655cc7d8def1beddb1f60ed576d1653ef8504 9c0a6e3ae1d10f0d2e8e565600b7b86eb13b9518 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399986838 +0200	commit: update to TAPS installation information doMC windows
+9c0a6e3ae1d10f0d2e8e565600b7b86eb13b9518 e244c2ac30341cbf8f109cc96f7661258e9baa93 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1400058009 +0200	pull: Fast-forward
+e244c2ac30341cbf8f109cc96f7661258e9baa93 90e8ee38aac7ead43935bd7034bd4f11f91d19c4 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1400059317 +0200	pull: Fast-forward
+90e8ee38aac7ead43935bd7034bd4f11f91d19c4 6734fab24795a8c823c6a97e0131fcfe5a235107 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1401270131 +0200	pull: Fast-forward

Modified: .git/logs/refs/remotes/origin/master
===================================================================
--- .git/logs/refs/remotes/origin/master	2014-05-14 09:23:07 UTC (rev 211)
+++ .git/logs/refs/remotes/origin/master	2014-05-28 09:42:38 UTC (rev 212)
@@ -88,3 +88,7 @@
 cb2b4bc53aac68ec1b56532dbbded71b4eca7582 3bd7f01d1011acc7afac8a149cd922137804fd77 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399363003 +0200	update by push
 3bd7f01d1011acc7afac8a149cd922137804fd77 18800d736527a84881558f1f00ba4af0f62807fe Sebastian DiLorenzo <S_D at array-47-13.medsci.uu.se> 1399972601 +0200	pull: fast-forward
 18800d736527a84881558f1f00ba4af0f62807fe 933655cc7d8def1beddb1f60ed576d1653ef8504 Sebastian DiLorenzo <S_D at array-47-13.medsci.uu.se> 1399986792 +0200	pull: fast-forward
+933655cc7d8def1beddb1f60ed576d1653ef8504 9c0a6e3ae1d10f0d2e8e565600b7b86eb13b9518 Sebastian DiLorenzo <dilorenzo.sebastian at gmail.com> 1399986845 +0200	update by push
+9c0a6e3ae1d10f0d2e8e565600b7b86eb13b9518 e244c2ac30341cbf8f109cc96f7661258e9baa93 Sebastian DiLorenzo <S_D at array-47-13.medsci.uu.se> 1400058009 +0200	pull: fast-forward
+e244c2ac30341cbf8f109cc96f7661258e9baa93 90e8ee38aac7ead43935bd7034bd4f11f91d19c4 Sebastian DiLorenzo <S_D at array-47-13.medsci.uu.se> 1400059317 +0200	pull: fast-forward
+90e8ee38aac7ead43935bd7034bd4f11f91d19c4 6734fab24795a8c823c6a97e0131fcfe5a235107 Sebastian DiLorenzo <S_D at array-47-13.medsci.uu.se> 1401270130 +0200	pull: fast-forward

Modified: .git/refs/heads/master
===================================================================
--- .git/refs/heads/master	2014-05-14 09:23:07 UTC (rev 211)
+++ .git/refs/heads/master	2014-05-28 09:42:38 UTC (rev 212)
@@ -1 +1 @@
-933655cc7d8def1beddb1f60ed576d1653ef8504
+6734fab24795a8c823c6a97e0131fcfe5a235107

Modified: .git/refs/remotes/origin/master
===================================================================
--- .git/refs/remotes/origin/master	2014-05-14 09:23:07 UTC (rev 211)
+++ .git/refs/remotes/origin/master	2014-05-28 09:42:38 UTC (rev 212)
@@ -1 +1 @@
-933655cc7d8def1beddb1f60ed576d1653ef8504
+6734fab24795a8c823c6a97e0131fcfe5a235107

Modified: pkg/TAPS/R/TAPS.r
===================================================================
--- pkg/TAPS/R/TAPS.r	2014-05-14 09:23:07 UTC (rev 211)
+++ pkg/TAPS/R/TAPS.r	2014-05-28 09:42:38 UTC (rev 212)
@@ -3973,8 +3973,13 @@
 
     if(restart == F) { 
         write.table(sampleDataOri[sampleDataOri$done==T,],'SampleData.csv',sep='\t',row.names=F)
+    } 
+
+    if (restart == T ) {
+        write.table(do.call(rbind,copyNumbers), 'SampleData.csv',sep='\t',row.names=F,append=F,col.names= T)
+    } else {
+        write.table(do.call(rbind,copyNumbers), 'SampleData.csv',sep='\t',row.names=F,append=append,col.names= !append)
     }
-    write.table(do.call(rbind,copyNumbers), 'SampleData.csv',sep='\t',row.names=F,append=append,col.names= !append)
 
 }