Skip to content

Commit

Permalink
prep for v0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bfifield committed Apr 25, 2020
1 parent de52555 commit 9b1c509
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 11 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: fastLink
Type: Package
Title: Fast Probabilistic Record Linkage with Missing Data
Version: 0.5.1
Date: 2019-02-18
Version: 0.6.0
Date: 2020-04-25
Authors@R: c(
person("Ted", "Enamorado", email = "[email protected]", role = c("aut", "cre")),
person("Ben", "Fifield", email = "[email protected]", role = c("aut")),
Expand Down Expand Up @@ -39,5 +39,5 @@ LinkingTo: RcppArmadillo, Rcpp, RcppEigen
Encoding: UTF-8
LazyData: true
BugReports: https://github.com/kosukeimai/fastLink/issues
RoxygenNote: 6.1.1
RoxygenNote: 7.0.2
Suggests: testthat
2 changes: 1 addition & 1 deletion R/blockData.R
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ stringSubset <- function(vecA, vecB,
#' @return A list with an entry for each block. Each list entry contains two vectors --- one with the indices indicating the block members in dataset A,
#' and another containing the indices indicating the block members in dataset B.
#'
#' @usage
#' @examples
#' \dontrun{
#' block_out <- blockData(dfA, dfB, varnames = c("city", "birthyear"))
#' }
Expand Down
4 changes: 2 additions & 2 deletions R/fastLink-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#' the Fellegi-Sunter model, using the Expectation-Maximization Algorithm. In addition,
#' tools for conducting and summarizing data merges are included.
#'
#' \tabular{ll}{ Package: \tab fastLink\cr Type: \tab Package\cr Version: \tab 0.5.1-\cr
#' Date: \tab 2019-02-18\cr License: \tab GPL (>= 3)\cr }
#' \tabular{ll}{ Package: \tab fastLink\cr Type: \tab Package\cr Version: \tab 0.6.0-\cr
#' Date: \tab 2020-04-25\cr License: \tab GPL (>= 3)\cr }
#'
#' @name fastLink-package
#' @useDynLib fastLink, .registration = TRUE
Expand Down
6 changes: 6 additions & 0 deletions man/blockData.Rd

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

4 changes: 2 additions & 2 deletions man/fastLink-package.Rd

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

17 changes: 14 additions & 3 deletions man/getPatterns.Rd

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

0 comments on commit 9b1c509

Please sign in to comment.