Skip to content

Commit

Permalink
Removing unused argument in augment_pairwise (#326)
Browse files Browse the repository at this point in the history
* Removed duplicated output element (#291)

* Removed duplicated output element

* Updated package version and NEWS

* Should fix #292 (#293)

* Updated NEWS and increment version

* Updated citation info in README

* Should fix #299 (#300)

* Should fix #299

* Added missing documentation objects and changed the name of one argument

* Fixed another documentation issue

* Removed deprecated SMC functions (#303)

* Updated build version number

* Increment version number to 1.3.2.9002

* Removed deprecated SMC functions (#301)

* Updated NEWS (#301)

* Logz issue 158 (#304)

* Added exact partition function option

* Updated tests

* Updated SMC Mallows examples

* Styling

* More linting

* Updated linter workflow

Some linter were deprecated, ignored line on vignette needed update

* Trying to please CodeFactor

* Incremented version number and added entry to NEWS.md

---------

Co-authored-by: Waldir Leoncio <w.l.netto@medisin.uio.no>

* Added BugReport URL (#308)

* Added URL for bug reports

* Increment version number to 1.3.2.9004

* Small typo correction and documentation update

* Website (#310)

* Website

* De-duplicating vignettes

* Adding GH Action for pkgdown (#290)

Literally the output of `usethis::use_github_action("pkgdown")`

* Triggering `gh-pages` when pushing to PR #310 (tests)

This is just for testing the online deployment and should be removed after merge (or just before).

---------

Co-authored-by: Waldir Leoncio <w.l.netto@medisin.uio.no>

* Small changes (#311)

* Small changes

* Fixed gh-pages bases for deployment (#290)

The PR branch was left over. More importantly, the file listed "main" instead of "master".

---------

Co-authored-by: Waldir Leoncio <w.l.netto@medisin.uio.no>

* Corrected small typo in documentation

* Cleaner unit test output (#314)

* Increment version number to 1.3.2.9006

* Capturing output of test unit

* Dirichlet concentration parameter is now actually being used (#315)

* forwarded psi argument to run_mcmc

* Incremented version and updated news.md

* ready for cran submission

* CRAN wanted a trailing slash in the URL to the website, since it becomes added automatically if one follows the URL

* Internalized a bunch of SMC functions and made families #312

* incrementing development versions

* updating news.md

* linting

* fixed most of the thigns

* incremented dev version

* Fixed lint issues

* removing tagging of Anja as author since she is listed in DESCRIPTION

* lots of work in order to clean up compute_consensus

* linting

* got rid of annoying row names in posterior interval dataframe

* made a version with parallel chains that is actually working

* close to a working version with parallel chains

* first iteration

* styling and updating style rules

* attempt at refactoring

* getting there

* styling

* fixing initial value hickup

* styling

* Parallel issue 307 (#320)

* made a version with parallel chains that is actually working

* close to a working version with parallel chains

* first iteration

* styling and updating style rules

* attempt at refactoring

* getting there

* styling

* fixing initial value hickup

* styling

* correcting typos in vignette

* Removed unused argument from augment_pairwise() #325

* Updated news

* incremented version

---------

Co-authored-by: Waldir Leoncio <w.l.netto@medisin.uio.no>
  • Loading branch information
osorensen and wleoncio committed Oct 20, 2023
1 parent 21e34a6 commit 57bb333
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: BayesMallows
Type: Package
Title: Bayesian Preference Learning with the Mallows Rank Model
Version: 1.4.0.9003
Version: 1.4.0.9004
Authors@R: c(person("Oystein", "Sorensen",
email = "oystein.sorensen.1985@gmail.com",
role = c("aut", "cre"),
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
parameter = "alpha".
* Documentation of functions are now grouped in families.
* lik_db_mix() is now deprecated in favor of get_mallows_loglik()
* Unusued argument removed from internal function augment_pairwise(). Thanks to
Lorenzo Zuccato for making us aware of this.

# BayesMallows 1.4.0

Expand Down
1 change: 0 additions & 1 deletion src/pairwise_comparisons.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ void augment_pairwise(
const std::string& metric,
const Rcpp::List& constraints,
vec& aug_acceptance,
const bool& clustering,
const std::string& error_model,
const int& Lswap
){
Expand Down
1 change: 0 additions & 1 deletion src/pairwise_comparisons.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ void augment_pairwise(
const std::string& metric,
const Rcpp::List& constraints,
arma::vec& aug_acceptance,
const bool& clustering,
const std::string& error_model,
const int& Lswap
);
Expand Down
2 changes: 1 addition & 1 deletion src/run_mcmc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ Rcpp::List run_mcmc(arma::mat rankings, arma::vec obs_freq, int nmc,
// Perform data augmentation of pairwise comparisons, if needed
if(augpair){
augment_pairwise(rankings, current_cluster_assignment, alpha_old, 0.1, rho_old,
metric, constraints, aug_acceptance, clustering, error_model, Lswap);
metric, constraints, aug_acceptance, error_model, Lswap);
}

// Save augmented data if the user wants this. Uses the same index as rho.
Expand Down

0 comments on commit 57bb333

Please sign in to comment.