Merge branch 'release/3.0.2'

* release/3.0.2:
  last fixes
  no testing devel on osx
  Updated test matrix
  Updated authors list
  Removed all examples in \donttest
  addressed \donttest examples
  version and date update
  Remove \donttest example
  Fix typos

.travis.yml

@@ -1,7 +1,5 @@
 language: r
 r:
-- 3.3
-- 3.4
 - oldrel
 - release
 - devel

DESCRIPTION

@@ -1,11 +1,13 @@
 Package: DramaAnalysis
 Type: Package
 Title: Analysis of Dramatic Texts
-Version: 3.0.1
-Date: 2020-01-11
+Version: 3.0.2
+Date: 2020-09-07
 Language: en-US
-Author: Nils Reiter <nils.reiter@ims.uni-stuttgart.de>
-Maintainer: Nils Reiter <nils.reiter@ims.uni-stuttgart.de>
+Authors@R: c(
+  person("Nils", "Reiter", email="nils.reiter@ims.uni-stuttgart.de", role=c("aut", "cre"), comment=(ORCID="0000-0003-3193-6170")),
+  person("Tim", "Strohmayer", email="st151528@stud.uni-stuttgart.de", role=c("ctb")),
+  person("Janis", "Pagel", email="janis.pagel@ims.uni-stuttgart.de", role=c("ctb")))
 Description: Analysis of preprocessed dramatic texts, with respect to literary research. 
   The package provides functions to analyze and visualize information about characters,
   stage directions, the dramatic structure and the text itself.
@@ -29,7 +31,7 @@ Imports:
    stringr (>= 1.4.0)
 Depends:
   R (>= 3.3.0)
-RoxygenNote: 7.0.2
+RoxygenNote: 7.1.1
 Suggests: testthat,
     fmsb,
     knitr,

NAMESPACE

@@ -45,11 +45,6 @@ export(setDataDirectory)
 export(setDirectories)
 export(tfidf)
 export(utteranceStatistics)
-exportClasses(QDConfiguration)
-exportClasses(QDDrama)
-exportClasses(QDHasCharacter)
-exportClasses(QDHasUtteranceBE)
-exportClasses(QDUtteranceStatistics)
 import(xml2)
 importFrom(data.table,as.data.table)
 importFrom(data.table,data.table)

R/collections.R

@@ -125,12 +125,10 @@ mapPrefix <- function(idList, map) {
 #' @export
 #' @return The function returns the ids that belong to the collection as a character vector.
 #' @examples
-#' \donttest{
 #' t <- combine(rksp.0, rjmw.0)
-#' newCollection(t)
-#' newCollection(c("rksp.0", "rjmw.0"), append=FALSE) # produces identical file
-#' newCollection(c("a", "b"), name="rksp.0_rjmw.0") # adds "a" and "b" to the file
-#' }
+#' newCollection(t, writeToFile=FALSE)
+#' newCollection(c("rksp.0", "rjmw.0"), writeToFile=FALSE) # produces identical file
+#' newCollection(c("a", "b"), name="rksp.0_rjmw.0", writeToFile=FALSE) # adds "a" and "b" to the file
 newCollection <- function(drama, 
                           name=ifelse(inherits(drama, "QDDrama"),
                                       paste(unique(drama$meta$drama)),

R/configuration.R

@@ -2,7 +2,7 @@
 #' @description The function \code{configuration(...)} Creates drama configuration matrix as a \code{QDConfiguration} object, which is also a data.frame. The S3 function \code{as.matrix()} can be used to extract a numeric or logical matrix containing the core.
 #' @param d A \code{QDDrama} object
 #' @param segment A character vector, either "Act" or "Scene". Partial matching allowed.
-#' @param onlyPresence If TRUE, the function only records whether a character was presence. If FALSE (which is the default), the function counts the number of tokens spoken (active) or referenced (passive).
+#' @param onlyPresence If TRUE, the function only records whether a character was present. If FALSE (which is the default), the function counts the number of tokens spoken (active) or referenced (passive).
 #' @param mode Character vector, should be either "Active" or "Passive".
 #' Passive configurations express when characters are mentioned, active
 #' ones when they speak themselves. Please note that extracting passive 
@@ -108,7 +108,7 @@ configuration <- function(d,
 #' @export
 #' @rdname configuration
 #' @param x An object of class QDConfiguration
-#' @param ... All other arguments are passwd to \code{as.matrix.data.frame}.
+#' @param ... All other arguments are passed to \code{as.matrix.data.frame}.
 as.matrix.QDConfiguration <- function(x, ...) {
   stopifnot(inherits(x, "QDConfiguration"))
   as.matrix.data.frame(x[,4:ncol(x), drop=FALSE], ...)

R/dictionaryStatistics.R

@@ -21,16 +21,8 @@
 #' @rdname dictionaryHandling
 #' @export
 #' @examples 
-#' \donttest{
 #' # retrieves word fields from github
 #' fields <- loadFields(fieldnames=c("Liebe", "Familie", "Krieg"))
-#' 
-#' 
-#' # retrieves word fields from local directory (under windows)
-#' fields <- loadFields(filednames=c("Health", "Death"),
-#'                      baseurl="c:\\path\\to\\local\\directory",
-#'                      fileSep="\\")
-#' }
 loadFields <- function(fieldnames=c("Liebe","Familie"),
                        baseurl=paste("https://raw.githubusercontent.com/quadrama/metadata/master",
                                      ensureSuffix(directory,fileSep), sep=fileSep),

R/frequencytable.R

@@ -19,9 +19,6 @@
 #' @examples
 #' data(rksp.0)
 #' st <- frequencytable(rksp.0)
-#' \donttest{
-#' stylo(gui=FALSE, frequencies = st)
-#' }
 #' @export
 frequencytable <- function(drama, 
                            acceptedPOS = postags$de$words,

R/load.R

@@ -36,7 +36,8 @@ setDataDirectory <- function(dataDirectory = file.path(path.expand("~"),"QuaDram
 #' @exportClass QDDrama
 #' @examples 
 #' # both are equivalent
-#' \donttest{
+#' \dontrun{
+#' installData("test")
 #' d <- loadDrama(c("test:rksp.0", "test:rjmw.0"))
 #' d <- loadDrama(c("rksp.0", "rjmw.0"), defaultCollection = "test")
 #' }

R/loadTEI.R

@@ -7,12 +7,6 @@
 #' @exportClass QDDrama
 #' @return The function returns an object of class \code{QDDrama}.
 #' @export
-#' @examples
-#' \donttest{
-#' tei_example_file <- "example_tei.xml"
-#' d <- loadDramaTEI(tei_example_file)
-#' }
-#' 
 loadDramaTEI <- function(filename) {
   # recursive loading for multiple dramas
   if (is.list(filename)) {

cran-comments.md

@@ -1,19 +1,23 @@
 ## Test environments
-* local OS X 10.14.5 install, R 3.6.0
-* ubuntu 14.04 (on travis-ci), R 3.3.3, R 3.4.4, oldrel, release, devel
-* OS X 10.13.3 (on travis-ci), R 3.3.3, oldrel, release
+* local OS X 10.15.4 install, R 3.6.1
+* ubuntu 16.04.6 (on travis-ci), oldrel, release, devel
+* OS X 10.13.3 (on travis-ci), oldrel, release
 * win-builder (release, oldrel, devel)
 
 ## R CMD check results
 There were no ERRORs or WARNINGs.
 
 There was 1 NOTE:
 * checking CRAN incoming feasibility ... NOTE
-  Maintainer: ‘Nils Reiter <nils.reiter@ims.uni-stuttgart.de>’
+  Maintainer: 'Nils Reiter <nils.reiter@ims.uni-stuttgart.de>'
   New submission
-    
-  The package has been developed and used outside of CRAN for two years now,
-  this is the first CRAN submission.
+  Package was archived on CRAN
+  X-CRAN-Comment: Archived on 2020-04-03 as check problems were not
+    corrected in time.
 
+  Check problems are corrected now, in this release.
+
+  This is a re-submission, because the one in May was ignored.
+
 ## Downstream dependencies
 There are currently no downstream dependencies for this package.