version 1.1-1

cran · Apr 5, 2012 · bbacfe6 · bbacfe6
1 parent e216749
commit bbacfe6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: agricolae
 Type: Package
 Title: Statistical Procedures for Agricultural Research
-Version: 1.1-0
-Date: 2012-03-28
+Version: 1.1-1
+Date: 2012-04-05
 Author: Felipe de Mendiburu
 Maintainer: Felipe de Mendiburu <f.mendiburu@cgiar.org>
 Suggests: akima, klaR, MASS, cluster
@@ -21,6 +21,6 @@ Description: Agricolae was presented in the thesis "A statistical
         tests comparison, biodiversity indexes and consensus cluster.
 License: GPL
 URL: http://tarwi.lamolina.edu.pe/~fmendiburu
-Packaged: 2012-03-28 16:20:56 UTC; fdemendiburu
+Packaged: 2012-04-04 21:58:50 UTC; fdemendiburu
 Repository: CRAN
-Date/Publication: 2012-03-28 18:13:06
+Date/Publication: 2012-04-05 05:42:39
diff --git a/MD5 b/MD5
@@ -1,4 +1,4 @@
-0782ee789c134744cce6f3460ed781e4 *DESCRIPTION
+d31b998e9bbe0eea331f5971074daa8e *DESCRIPTION
 e79b1262fe29225e12e495d0c93a8cfd *NAMESPACE
 ac915672b4823dd46f1f67401b2e9aae *R/AMMI.R
 63bc79669decc3e830d4bc48db2f9b87 *R/AMMI.contour.R
@@ -60,7 +60,7 @@ a76382b84367fa44a352db3013017640 *R/plot.graph.freq.R
 4d60fa15a02edcd1249eca207e196349 *R/reg.homog.R
 79f5d456dabed74f3aadbb9a787d7efc *R/resampling.cv.R
 bd0612f814df5a663e3f7e5c299595f0 *R/resampling.model.R
-e2fd2927dcb94bc712db17ba6b06f9bc *R/scheffe.test.R
+4f85fe8d0a8c46d7123724a49f9f5d49 *R/scheffe.test.R
 d6e3b2794952971fc5f427a55198f2fe *R/similarity.R
 a98e09f60ed734ef5924cebd5dbff750 *R/simulation.model.R
 cc4e5133b27731530e7fcda9f5748bdf *R/skewness.R
@@ -114,7 +114,7 @@ ec644fe2f1fb85a8d096cc5b61888ddd *data/sinRepAmmi.rda
 f89bebe0b89dcc945e5d4850104f5570 *data/sweetpotato.rda
 93feb78eface8720dbdeff6d343a39e2 *data/wilt.rda
 06d77e44fb004716afa58983e3c0ff08 *data/yacon.rda
-c380501c57d765f4ed22e5b4e68a7ecb *inst/doc/ENagricolae.pdf
+f40a9aa2626609de66dd5f212a9ffd5d *inst/doc/ENagricolae.pdf
 7206ba43e8d2e7e4e5896bb03667cff4 *man/AMMI.Rd
 a996c0a1566a9620c631175230988a38 *man/AMMI.contour.Rd
 e0b3273103fef5ea477a6ea5b4ea4cbf *man/BIB.test.Rd
@@ -132,7 +132,7 @@ a580a74fed1b77b25497b31c8652076b *man/LSD.test.Rd
 ec69dfd27ecd2cf4e54295a9f0fb29ef *man/RioChillon.Rd
 fb29a382767dab6dcc5ce8efdcd9f550 *man/SNK.test.Rd
 30b5902afaf496e315ffcfcade077771 *man/VanderWarden.Rd
-cac3468c8e81e958d597db119ed5f7f0 *man/agricolae-package.Rd
+96445709cfe9eac39b22636f27efc7d4 *man/agricolae-package.Rd
 f4371b480b19a062d0366349142113db *man/audpc.Rd
 cfd78a46392468ea6a3d4d4744959ab8 *man/bar.err.Rd
 3e731ec6579295532923edaf40655149 *man/bar.group.Rd

diff --git a/R/scheffe.test.R b/R/scheffe.test.R
@@ -24,16 +24,17 @@ function (y, trt, DFerror, MSerror, Fc, alpha=0.05, group=TRUE,main = NULL)
     names(means)[1:2]<-c(name.t,name.y)
 #   row.names(means)<-means[,1]
     ntr<-nrow(means)
-    Tprob <- qf(1-alpha,ntr-1, DFerror)
+	Fprob <- qf(1-alpha,ntr-1, DFerror)
+	Tprob <- sqrt(Fprob * (ntr - 1))	
     nr<- 1/mean(1/nn[,2])
     cat("\nStudy:", main)
     cat("\n\nScheffe Test for",name.y,"\n") 
     cat("\nMean Square Error  :",MSerror,"\n\n")
     cat(paste(name.t,",",sep="")," means\n\n")
     print(data.frame(row.names = means[,1], means[,-1]))
 cat("\nalpha:",alpha,"; Df Error:",DFerror,"\n")
-cat("Critical Value of F:", Tprob,"\n")
-scheffe <- sqrt(Tprob*(ntr-1)*2*MSerror/nr)
+cat("Critical Value of F:", Fprob,"\n")
+scheffe <- Tprob*sqrt(2*MSerror/nr)
 if (length(unique(nn[,2]))!=1) {
 cat("\nHarmonic Mean of Cell Sizes ", nr )
 }

diff --git a/inst/doc/ENagricolae.pdf b/inst/doc/ENagricolae.pdf
diff --git a/man/agricolae-package.Rd b/man/agricolae-package.Rd
@@ -13,8 +13,8 @@ designs applied specially for field experiments in agriculture and plant breedin
 \tabular{ll}{
 Package: \tab agricolae\cr
 Type: \tab Package\cr
-Version: \tab 1.1-0\cr
-Date: \tab 2012-28-03\cr
+Version: \tab 1.1-1\cr
+Date: \tab 2012-05-04\cr
 License: \tab GPL\cr
 }
 Planning of field experiments: lattice, factorial, RCBD, CRD, Latin Square, Graeco, BIB, Alpha design, Cyclic, augmented block, split and strip plot Designs.