Merge pull request #74 from koheiw/add-as.dictionary2

Add as.dictionary for future quanteda versions

DESCRIPTION

@@ -34,5 +34,5 @@ Imports:
 Suggests:
     testthat
 Language: en-GB
-RoxygenNote: 7.3.0
+RoxygenNote: 7.3.1
 Roxygen: list(markdown = TRUE)

NAMESPACE

@@ -3,6 +3,7 @@
 S3method(as.coefficients_textmodel,data.frame)
 S3method(as.coefficients_textmodel,matrix)
 S3method(as.coefficients_textmodel,numeric)
+S3method(as.dictionary,textmodel_newsmap)
 S3method(as.list,textmodel_newsmap)
 S3method(as.statistics_textmodel,data.frame)
 S3method(as.statistics_textmodel,matrix)

R/utils.R

@@ -6,6 +6,12 @@ as.list.textmodel_newsmap <- function(x, ...) {
     lapply(coef(x, ...), names)
 }
 
+#' @export
+#' @method as.dictionary textmodel_newsmap
+as.dictionary.textmodel_newsmap <- function(x, ...) {
+    dictionary(lapply(coef(x, ...), names), separator = x$concatenator)
+}
+
 #' @export
 #' @method print textmodel_newsmap
 print.textmodel_newsmap <- function(x, ...) {

tests/testthat/test-textmodel.R

@@ -214,6 +214,7 @@ test_that("coef() and dictionary() are working", {
     expect_error(coef(map, select = character()),
                  "The length of select must be between 1 and 16")
 
+    # TODO: remove as.list()
     lis1 <- as.list(map)
     expect_equal(length(lis1), 16)
     expect_true(all(sapply(lis1, is.character)))
@@ -223,4 +224,15 @@ test_that("coef() and dictionary() are working", {
     expect_equal(names(lis2), c("ru", "fr"))
     expect_true(all(sapply(lis2, is.character)))
     expect_true(all(lengths(lis2) == 20))
+
+    # TODO: change to as.dictionary()
+    dict1 <- newsmap:::as.dictionary.textmodel_newsmap(map)
+    expect_s4_class(dict1, "dictionary2")
+    expect_true(all(lengths(as.list(dict1)) == 10))
+
+    dict2 <- newsmap:::as.dictionary.textmodel_newsmap(map, n = 20, c("ru", "fr"))
+    expect_s4_class(dict2, "dictionary2")
+    expect_equal(names(dict2), c("ru", "fr"))
+    expect_true(all(lengths(dict2) == 20))
+
 })