[Swift-commit] r3086 - SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/PermScripts

[noreply at svn.ci.uchicago.edu]

Author: andric
Date: 2009-08-08 23:47:19 -0500 (Sat, 08 Aug 2009)
New Revision: 3086

Modified:
   SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/PermScripts/FriedmanPerm.R
Log:
the .Rdata now loads both 'config' and 'ss_config' because was having trouble getting the ss config file fully transfered to grid site

Modified: SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/PermScripts/FriedmanPerm.R
===================================================================
--- SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/PermScripts/FriedmanPerm.R	2009-08-08 22:05:58 UTC (rev 3085)
+++ SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/PermScripts/FriedmanPerm.R	2009-08-09 04:47:19 UTC (rev 3086)
@@ -1,5 +1,5 @@
 #---- doing friedman permutations
-#---- coded Tuesday; July 22, 2008
+#---- coded 08.August.2009
 
 #---- this is the function used in the aggregate:
 FriedmanPerm <- function(x){
@@ -24,11 +24,9 @@
 inputfile <- Sys.getenv("R_INPUT")
 print(inputfile)
 Query_out <- as.matrix(read.table(inputfile))
-load("PermScripts/PermConfig.Rdata")
-config_subjs <- as.matrix(read.table("PermScripts/PermConfig.txt"))
-subj_resamp <- which(as.vector(config_subjs[configLine,])==1)
+load("PermScripts/FriedmanPerm.Rdata.Rdata") ## this loads 'ss_config' (for ss) and 'config' (condition orders for diff perms across subjs)
+subj_resamp <- which(as.vector(ss_config[configLine,])==1)
 
-
 #---- this is where the fun begins:
 data_stack <- stack(data.frame(Query_out[,3:5]))[1]
 vertices <- Query_out[,2]