Skip to content

Commit

Permalink
Changes for release
Browse files Browse the repository at this point in the history
  • Loading branch information
dgrtwo committed Apr 11, 2020
1 parent 0ca41e9 commit 4220fb0
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 12 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Update to work with the latest version of tidytext's cast_sparse. Adds rlang to IMPORTs. (@juliasilge, #30)
* Update from data_frame() to tibble() in examples
* Removed topicmodels from SUGGESTS (hasn't been required for several versions)
* Fixed spelling mistakes of occurence->occurrence

# widyr 0.1.2

Expand Down
5 changes: 3 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
knitr::opts_chunk$set(
collapse = TRUE,
comment = "#>",
message = FALSE,
fig.path = "README-"
)
library(dplyr)
suppressPackageStartupMessages(library(dplyr))
```

# widyr: Widen, process, and re-tidy a dataset
Expand All @@ -19,7 +20,7 @@ library(dplyr)
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/dgrtwo/widyr?branch=master&svg=true)](https://ci.appveyor.com/project/dgrtwo/widyr)
[![Coverage Status](https://img.shields.io/codecov/c/github/dgrtwo/widyr/master.svg)](https://codecov.io/github/dgrtwo/widyr?branch=master)

This package wraps the pattern of un-tidying data into a wide matrix, performing some processing, then turning it back into a tidy form. This is useful for several mathematical operations such as co-occurence counts, correlations, or clustering that are best done on a wide matrix.
This package wraps the pattern of un-tidying data into a wide matrix, performing some processing, then turning it back into a tidy form. This is useful for several mathematical operations such as co-occurrence counts, correlations, or clustering that are best done on a wide matrix.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/dgrtwo/widyr?branch=master&svg=true)](https://ci.appveyor.com/project/dgrtwo/widyr)
[![Coverage Status](https://img.shields.io/codecov/c/github/dgrtwo/widyr/master.svg)](https://codecov.io/github/dgrtwo/widyr?branch=master)

This package wraps the pattern of un-tidying data into a wide matrix, performing some processing, then turning it back into a tidy form. This is useful for several mathematical operations such as co-occurence counts, correlations, or clustering that are best done on a wide matrix.
This package wraps the pattern of un-tidying data into a wide matrix, performing some processing, then turning it back into a tidy form. This is useful for several mathematical operations such as co-occurrence counts, correlations, or clustering that are best done on a wide matrix.

## Installation

Expand Down
20 changes: 15 additions & 5 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
## Changes

* Fixes to be compatible with tidyr v1.0.0, while also being reverse-compatible with previous versions of tidyr.
* Fix intro vignette index entry
### Fixes

* Update to work with the latest version of tidytext's cast_sparse. Adds rlang to IMPORTs. (@juliasilge, #30)
* Update from data_frame() to tibble() in examples

### Maintenance

* Removed topicmodels from SUGGESTS (hasn't been required for several versions)
* Fixed spelling mistakes of occurence->occurrence

## Test environments
* local OS X install, R 3.5.0
* ubuntu 12.04 (on travis-ci), devel, release, oldrel, and with development tidyr
* local OS X install, R 3.6.1
* ubuntu 12.04 (on travis-ci), devel, release, oldrel
* win-builder (devel and release)

## R CMD check results
Expand All @@ -14,4 +21,7 @@

## Reverse dependencies

There are no reverse dependencies.
Reverse imports: akc and saotd
Reverse depends: wikisourcer

All passed R CMD CHECK with the new version of widyr.
6 changes: 3 additions & 3 deletions tests/testthat/test-pairwise-count.R
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test_that("pairing and counting works", {

# test additional arguments

# for self-pairs, the number of occurences should be the number of distinct
# for self-pairs, the number of occurrences should be the number of distinct
# lines
d2 <- original %>%
pairwise_count(char, line, sort = TRUE, upper = FALSE, diag = TRUE)
Expand Down Expand Up @@ -70,7 +70,7 @@ test_that("We can count with a weight column", {
})


test_that("Counts co-occurences of words in Pride & Prejudice", {
test_that("Counts co-occurrences of words in Pride & Prejudice", {
if (require("janeaustenr", quietly = TRUE)) {
words <- tibble(text = prideprejudice) %>%
mutate(line = row_number()) %>%
Expand All @@ -82,7 +82,7 @@ test_that("Counts co-occurences of words in Pride & Prejudice", {
# check it is sorted in descending order
expect_false(is.unsorted(rev(pairs$n)))

# check occurences of words that appear with "elizabeth"
# check occurrences of words that appear with "elizabeth"
words_with_elizabeth <- words %>%
filter(word == "elizabeth") %>%
select(line) %>%
Expand Down
2 changes: 1 addition & 1 deletion vignettes/intro.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ vignette: >
---


This package wraps the pattern of un-tidying data into a wide matrix, performing some processing, then turning it back into a tidy form. This is useful for several mathematical operations such as co-occurence counts, correlations, or clustering that are best done on a wide matrix.
This package wraps the pattern of un-tidying data into a wide matrix, performing some processing, then turning it back into a tidy form. This is useful for several mathematical operations such as co-occurrence counts, correlations, or clustering that are best done on a wide matrix.

## Towards a precise definition of "wide" data

Expand Down

0 comments on commit 4220fb0

Please sign in to comment.