Skip to content

Commit

Permalink
version 0.2-9
Browse files Browse the repository at this point in the history
  • Loading branch information
hturner committed Sep 16, 2019
1 parent 540f51b commit 284b58f
Show file tree
Hide file tree
Showing 38 changed files with 141 additions and 62 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: PlackettLuce
Type: Package
Title: Plackett-Luce Models for Rankings
Version: 0.2-8.9000
Version: 0.2-9
Authors@R: c(person("Heather", "Turner",
email = "ht@heatherturner.net", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-1256-3375")),
Expand Down Expand Up @@ -33,8 +33,8 @@ LazyData: true
Depends: R (>= 2.10)
Imports: Matrix, igraph, methods, partykit, psychotools,
psychotree, RSpectra, qvcalc, sandwich, stats
Suggests: BiocStyle, BradleyTerry2, BradleyTerryScalable,
Matrix.utils, PLMIX, StatRank, covr, hyper2, kableExtra, knitr,
Suggests: BiocStyle, BayesMallows, BradleyTerry2, BradleyTerryScalable,
Matrix.utils, PLMIX, ROlogit, StatRank, covr, hyper2, kableExtra, knitr,
lbfgs, gnm, pmr, rmarkdown, testthat
RoxygenNote: 6.1.1
Roxygen: list(markdown = TRUE)
Expand Down
20 changes: 10 additions & 10 deletions R/preflib.R
Original file line number Diff line number Diff line change
Expand Up @@ -118,24 +118,24 @@ read.strict <- function(file, incomplete = FALSE){
#' @importFrom utils count.fields
read.ties <- function(file, incomplete = FALSE){
items <- read.items(file)
skip <- length(items) + 2L
input <- chartr("{}", "''", readLines(file))
# count maximum number of ranks (not needed for complete rankings)
r <- length(items)
skip <- r + 2L
input <- chartr("{}", "''", readLines(file, encoding = "UTF-8"))
# count maximum number of ranks for incomplete rankings
if (incomplete){
r <- max(count.fields(textConnection(input), quote = "'",
sep = ",", skip = skip)) - 1L
} else r <- length(items)
}
# read counts and ordered items
nm <- c("Freq", paste("Rank", seq_len(r)))
obs <- read.csv(text = input, skip = skip, header = FALSE, quote = "'",
col.names = nm, check.names = FALSE,
na.strings = "", stringsAsFactors = FALSE)
n <- nrow(obs)
obs <- as.data.frame(lapply(obs, function(x) {
if (is.character(x)) {
x <- strsplit(x, ",")
array(lapply(x, as.numeric), n)
} else x }), check.names = FALSE)
# split up ties (don't use array list as dim attribute kep on MacOS)
rank_class <- vapply(obs, is.character, logical(1))
for (i in which(rank_class)){
obs[[i]] <- lapply(strsplit( obs[[i]], ","), as.numeric)
}
preflib(obs, items)
}

Expand Down
16 changes: 12 additions & 4 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
## Comments

This is a re-submission fixing a bug that was found by an example in one of the reverse dependencies: ClimMobTools. This version causes warnings in ClimMobTools due to deprecated functions, which the authors have fixed in their development version (0.2-7, https://github.com/agrobioinfoservices/ClimMobTools).
This submission is mainly to fix a bug in the vcov method that causes NA values for a particular parameterization. Some other minor fixes and improvements have been made at the same time.

## Test environments

* Ubuntu 18.04.2 LTS, R 3.6.1
* Via Win-builder: Windows Server 2008 (64-bit), R-devel
1. (Local) Ubuntu 18.04.2 LTS, R 3.6.1
2. (R-hub) Fedora Linux, R-devel, clang, gfortran
3. (R-hub) Ubuntu Linux 16.04 LTS, R-release, GCC
4. (R-hub) Windows Server 2008 R2 SP1, R-devel, 32/64 bit
5. (R-hub) macOS 10.11 El Capitan, R-release
6. (Win-builder) Windows Server 2008 (64-bit), R-devel

### Check results

The Win-builder check returns a note regarding URLs/DOIs that is a false alarm, all the links redirect to valid pages on jstor.
Check 3, 4 & 6 returns a note regarding URLs/DOIs. This is a false alarm: all the links redirect to valid pages on jstor.

## revdepcheck results

The reverse dependencies, ClimMobTools and PLMIX, pass check locally with this version.
2 changes: 1 addition & 1 deletion docs/CONDUCT.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions docs/articles/Overview.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified docs/articles/Overview_files/figure-html/always-loses-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 24 additions & 2 deletions docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/PlackettLuce-deprecated.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/PlackettLuce-package.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 19 additions & 3 deletions docs/reference/PlackettLuce.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/adjacency.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/aggregate.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/beans.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/choices.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/complete.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/connectivity.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/decode.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified docs/reference/figures/always-loses-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 284b58f

Please sign in to comment.