Skip to content

Commit 771fa30

Browse files
authored
Develop (#420)
* dev version * Ulam bug 417 (#418) * hotfix * updating news * fixing Ulam issue * incrementing version before running CRAN tests * updating news.md to say that no bug in Ulam distance has been fixed * fixing error in likelihood calculation * added unit test for log likelihood with clusters * fixed namespace thing * switching to vapply for safety * fixing some more wrong test expectations * ready for cran
1 parent 039e234 commit 771fa30

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: BayesMallows
22
Type: Package
33
Title: Bayesian Preference Learning with the Mallows Rank Model
4-
Version: 2.2.1.9000
4+
Version: 2.2.2
55
Authors@R: c(person("Oystein", "Sorensen",
66
email = "[email protected]",
77
role = c("aut", "cre"),
@@ -46,7 +46,7 @@ BugReports: https://github.com/ocbe-uio/BayesMallows/issues
4646
License: GPL-3
4747
Encoding: UTF-8
4848
LazyData: true
49-
RoxygenNote: 7.3.1
49+
RoxygenNote: 7.3.2
5050
Depends: R (>= 3.5.0)
5151
Imports: Rcpp (>= 1.0.0),
5252
ggplot2 (>= 3.1.0),

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# BayesMallows (development versions)
1+
# BayesMallows 2.2.2
22

33
* An error in compute_mallows_loglik when the number of clusters is more than
44
one has been corrected. Thanks to Marta Crispino.

cran-comments.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
## Resubmission Note
22

3-
This is a hotfix of a unit test failing on CRAN's M1 Mac builder. The test does not fail on our local M1 Mac and neither on the M1 Mac builder online, so I could not reproduce it. I have instead made sure the test is skipped on CRAN.
4-
3+
An error in compute_mallows_loglik when the number of clusters is more than one has been corrected.
54

65
## Test Environments
76

8-
* Local Ubuntu 23.04 with R 4.3.2 built from source with option "--with-valgrind-instrumentation=2", running R CMD check with --use-valgrind option.
9-
* r-devel-san via rocker/r-devel-san.
10-
* local Windows install, R 4.3.3.
117
* windows, devel, release and old-release.
128
* R-CMD-check via GitHub Actions on windows-latest, macOS-latest, ubuntu-20.04 (release), and ubuntu-20.04 (devel).
13-
* M1 builder.
149

1510
## R CMD CHECK results
1611

0 commit comments

Comments
 (0)