[Swift-commit] r3075 - SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/scripts

[noreply at svn.ci.uchicago.edu]

Author: andric
Date: 2009-08-07 00:08:38 -0500 (Fri, 07 Aug 2009)
New Revision: 3075

Modified:
   SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/scripts/FriedmanTest.R
Log:
cleaned up the aggregate functions

Modified: SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/scripts/FriedmanTest.R
===================================================================
--- SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/scripts/FriedmanTest.R	2009-08-07 04:56:12 UTC (rev 3074)
+++ SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/scripts/FriedmanTest.R	2009-08-07 05:08:38 UTC (rev 3075)
@@ -4,7 +4,7 @@
     mm[,1] = x[1:24]
     mm[,2] = x[25:48]
     mm[,3] = x[49:72]
-    return(friedman.test(mm)[[1]][[1]])
+    return(friedman.test(mm)$statistic[[1]])
 }
 
 FriedmanP <- function(x){
@@ -12,7 +12,7 @@
     mm[,1] = x[1:24]
     mm[,2] = x[25:48]
     mm[,3] = x[49:72]
-    return(friedman.test(mm)[[3]][[1]])
+    return(friedman.test(mm)$p.value)
 }
 
 #---- Swift housekeeping: