diff --git a/ChangeLog b/ChangeLog index a712cb3..40ee7b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,22 @@ +2017-11-22 Anthony Hennessey + + Version 1.1-0 + + * R/surface.R: Added optional 'nodes' and 'collocates' filters. Use of the 'nodes' filter improves performance and reduces memory footprint. + * R/coco.R: Added optional 'collocates' filter. The 'collocates' filter is used to target the testing and hence reduce the number of tests; reducing the number of tests reduces the loss of power from the multiple test correction. + * R/surface_coco.R: Applies the new filters for the 'surface' and 'coco' functions. + * R/coco-class.R (plot.coco): Allow configuration of whiskers in plots. Use on.exit to restore graphics parameters. + * inst/doc/*.pdf: Documentation moved to vignettes directory with help from R.rsp package. + * vignettes/*.pdf: Example get data from the CLiC API rather than the now deprecated CorporaCorpus package. + * man/*.Rd: Minor corrections and improvements. + + 2017-03-31 Anthony Hennessey Version 1.0-2 - * R/surface.R (parse_span): No longer uses Perl regex; this allows compatability with older Windows R releases. - * inst/doc/faq.pdf: vignette/faq.Rnw vignette converted to PDF as without CorporaCorpus on CRAN the source in the vignette is confusing, and the --as-cran check is not happy with the vignette code in inst/doc. The .Rnw code will be available in a parallel github repository. Also some text tweeks. + * R/surface.R (parse_span): No longer uses Perl regex; this allows compatibility with older Windows R releases. + * inst/doc/faq.pdf: vignette/faq.Rnw vignette converted to PDF as without CorporaCorpus on CRAN the source in the vignette is confusing, and the --as-cran check is not happy with the vignette code in inst/doc. The .Rnw code will be available in a parallel github repository. Also some text tweaks. * inst/doc/proof_of_concept.pdf: vignette/proof_of_concept.Rnw ditto. diff --git a/DESCRIPTION b/DESCRIPTION index bf671c8..698d5a9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,19 +2,19 @@ Encoding: UTF-8 Package: CorporaCoCo Type: Package Title: Corpora Co-Occurrence Comparison -Version: 1.0-2 -Date: 2017-03-31 +Version: 1.1-0 +Date: 2017-11-22 Authors@R: c(person('Anthony','Hennessey',email='anthony.hennessey@nottingham.ac.uk',role=c('aut','cre')), person('Viola','Wiegand',email='v.wiegand@bham.ac.uk',role='aut'), person('Michaela','Mahlberg',email='m.a.mahlberg@bham.ac.uk',role='aut'), person('Christopher R.','Tench',email='christopher.tench@nottingham.ac.uk',role='aut'), - person('Jamie','Lentin',email='jm@ravingmantis.com',role='aut')) + person('Jamie','Lentin',email='jamie.lentin@shuttlethread.com',role='aut')) Description: A set of functions used to compare co-occurrence between two corpora. URL: License: GPL (>= 3) Depends: - R (>= 3.1.0), + R (>= 3.2.0), Imports: methods, stats, diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e421e2c --- /dev/null +++ b/NEWS @@ -0,0 +1,7 @@ +CHANGES IN VERSION 1.1-0: + + NEW FEATURES: + + * Optional 'nodes' and 'collocates' filters added to the 'surface' function. Use of the 'nodes' filter improves performance and reduces memory footprint. + * Optional 'collocates' filter added to the 'coco' function. The 'collocates' filter is used to target the testing and so reduce the number of tests; reducing the number of tests reduces the loss of power from the multiple test correction. + diff --git a/vignettes/faq.pdf b/vignettes/faq.pdf index cb90de2..0d5cc97 100644 Binary files a/vignettes/faq.pdf and b/vignettes/faq.pdf differ diff --git a/vignettes/proof_of_concept.pdf b/vignettes/proof_of_concept.pdf index 260d642..7726ca4 100644 Binary files a/vignettes/proof_of_concept.pdf and b/vignettes/proof_of_concept.pdf differ