[Picante-commits] r135 - branches/gsoc/R

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

Author: mrhelmus
Date: 2008-07-15 08:52:15 +0200 (Tue, 15 Jul 2008)
New Revision: 135

Modified:
   branches/gsoc/R/phylostruct.R
Log:
Fixed bug: misnamed objects

Modified: branches/gsoc/R/phylostruct.R
===================================================================
--- branches/gsoc/R/phylostruct.R	2008-07-09 06:46:20 UTC (rev 134)
+++ branches/gsoc/R/phylostruct.R	2008-07-15 06:52:15 UTC (rev 135)
@@ -22,7 +22,7 @@
                        psc = replicate(runs,mean(psc(randomizeSample(samp,null.model=null.model),tree)[,1])))
     quantiles.null<-quantile(nulls,probs=c(alpha/2,1-(alpha/2)))
     mean.null<-mean(nulls)
-    obs<-switch(metric,
+    mean.obs<-switch(metric,
                        psv = mean(psv(samp,tree,compute.var=FALSE)[,1]),
                        psr = mean(psr(samp,tree,compute.var=FALSE)[,1]),
                        pse = mean(pse(samp,tree)[,1]),
@@ -34,7 +34,7 @@
     phylo.structure="overdispersed"} else {phylo.structure="random"}
     }
     
-    return(list(metric=metric,null.model=null.model,runs=runs,obs=obs,mean.null=mean.null
-                ,quantiles.null=quantiles.null,phylo.structure=phylo.structure,null.means=null.means))
+    return(list(metric=metric,null.model=null.model,runs=runs,mean.obs=mean.obs,mean.null=mean.null
+                ,quantiles.null=quantiles.null,phylo.structure=phylo.structure,null.means=nulls))
   }
 }