prep for submission to cran - v0.4.0

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: fastLink
 Type: Package
 Title: Fast Probabilistic Record Linkage with Missing Data
-Version: 0.3.2
-Date: 2018-02-25
+Version: 0.4.0
+Date: 2018-05-15
 Authors@R: c(
   person("Ted", "Enamorado", email = "[email protected]", role = c("aut", "cre")),
   person("Ben", "Fifield", email = "[email protected]", role = c("aut")),

NAMESPACE

@@ -3,15 +3,15 @@
 S3method(plot,fastLink)
 S3method(print,inspectEM)
 S3method(summary,fastLink)
+export(aggconfusion)
 export(aggregateEM)
 export(calcMoversPriors)
 export(clusterMatch)
 export(confusion)
-export(aggconfusion)
 export(dedupeMatches)
 export(emlinkMARmov)
-export(emlinklog)
 export(emlinkRS)
+export(emlinklog)
 export(fastLink)
 export(gammaCK2par)
 export(gammaCKpar)
@@ -49,15 +49,15 @@ importFrom(parallel,makeCluster)
 importFrom(parallel,mclapply)
 importFrom(parallel,stopCluster)
 importFrom(plotrix,staxlab)
+importFrom(stats,glm)
 importFrom(stats,kmeans)
+importFrom(stats,model.matrix)
 importFrom(stats,na.omit)
 importFrom(stats,prcomp)
 importFrom(stats,predict)
 importFrom(stats,quantile)
 importFrom(stats,runif)
 importFrom(stats,var)
-importFrom(stats,glm)
-importFrom(stats,model.matrix)
 importFrom(stringdist,phonetic)
 importFrom(stringdist,stringdist)
 importFrom(stringdist,stringdistmatrix)

R/aggconfusion.R

@@ -1,13 +1,12 @@
-#' Get confusion table for fastLink objects after blocking via clusterMatch()
+#' aggconfusion
 #'
-#' Calculate confusion table after running fastLink().
+#' Aggregate confusion tables from separate runs of fastLink() (UNDER DEVELOPMENT)
 #'
-#' @usage confusion(object, threshold)
+#' @usage aggconfusion(object)
 #'
-#' @param object A 'fastLink' object. Can only be run if 'return.all = TRUE' in 'fastLink().'
-#' @param threshold The matching threshold above which a pair is a true match. Default is .85
+#' @param object A list of confusion tables. 
 #'
-#' @return 'confusion()' returns two tables - one calculating the confusion table, and another
+#' @return 'aggconfusion()' returns two tables - one calculating the confusion table, and another
 #' calculating a series of additional summary statistics.
 #'
 #' @author Ted Enamorado <[email protected]> and Ben Fifield <[email protected]>