diff --git a/ChangeLog b/ChangeLog index 3e1f4c4..0663a48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-09-21 vs. 1.2-6 - Ivan Bezerra Allaman + * A small bug was fixed in the SK.nest.aov.R function + The lines that were with "[:punct:]" (wrongly) were changed to "[[:punct:]]" (correctly). + * Corrected documentation in accordance with the premises of cran + 2014-09-29 vs. 1.2-5 - Ivan Bezerra Allaman * A small bug was fixed in the SK.aov.R function. In line 44 there was an object "sig.level=0.05" that prevented the exchange diff --git a/DESCRIPTION b/DESCRIPTION index 0aa0544..077f7bf 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,16 +1,12 @@ Package: ScottKnott Type: Package Title: The ScottKnott Clustering Algorithm -Version: 1.2-5 -Date: 2014-10-29 -Author: Enio Jelihovschi - José Cláudio Faria - Ivan Bezerra Allaman +Version: 1.2-6 +Date: 2015-09-21 +Author: Enio Jelihovschi, José Cláudio Faria and Ivan Bezerra Allaman Maintainer: Ivan Bezerra Allaman Depends: R (>= 2.6.0), stats, base -Description: Division of an ANOVA experiment treatment means into - homogeneous distinct groups using the clustering method of - Scott & Knott +Description: Division of an ANOVA experiment treatment means into homogeneous distinct groups using the clustering method of Scott & Knott. License: GPL (>= 2) URL: https://github.com/jcfaria/ScottKnott, http://nbcgib.uesc.br/lec/software/pac-r/scottknott Encoding: latin1 diff --git a/NAMESPACE b/NAMESPACE index 08069fe..2a837e6 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -8,3 +8,15 @@ exportPattern(".") import( stats ) + +# S3 methods +S3method(plot,SK) +S3method(SK,default) +S3method(SK,aov) +S3method(SK,aovlist) +S3method(SK.nest,aov) +S3method(SK.nest,aovlist) +S3method(SK.nest,default) +S3method(SK,nest) +S3method(summary,SK.nest) +S3method(summary,SK) diff --git a/R/SK.nest.aov.R b/R/SK.nest.aov.R index f733088..72ba478 100644 --- a/R/SK.nest.aov.R +++ b/R/SK.nest.aov.R @@ -74,10 +74,10 @@ SK.nest.aov <- function(x, m.inf[,3][ord]) tab <- mt$tables[whichn][[whichn]] - } else if(length(nfa[grep('[:punct:]', + } else if(length(nfa[grep('[[:punct:]]', nfa)]) == 1 && - which == nfa[grep('[:punct:]', + which == nfa[grep('[[:punct:]]', nfa)]) { r <- mt$n[names(mt$tables)][[which]] # groups and its number of replicates diff --git a/inst/CITATION b/inst/CITATION index 94f8933..a5543e3 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -1,5 +1,3 @@ -citHeader("To cite ScottKnott in publications use:") - citEntry(entry = "Article", title = "ScottKnott: A Package for Performing the Scott-Knott Clustering Algorithm in R.", author = personList(as.person("Enio G. Jelihovschi"), @@ -16,7 +14,9 @@ citEntry(entry = "Article", paste("Enio G. Jelihovschi, José C. Faria, and Ivan Bezerra Allaman (2014).", "ScottKnott: A Package for Performing the Scott-Knott Clustering Algorithm in R.", "Trends in Applied and Computational Mathematics 15(1), 3-17.", - "URL http://www.sbmac.org.br/tema/seer/index.php/tema/article/view/646/643.") + "URL http://www.sbmac.org.br/tema/seer/index.php/tema/article/view/646/643."), + + header = "If you use ScottKnott package please cite:" ) citFooter("Lots of time and effort were invested in creating ScottKnott package.",