Merge 84da895 into 1c2ec7c

DESCRIPTION

@@ -64,7 +64,6 @@ Collate:
     'groupAndRename.R'
     'GUIfunctions.R'
     'indivRisk.R'
-    'LLmodGlobalRisk.R'
     'LocalRecProg.R'
     'localSupp.R'
     'localSuppression.R'

NAMESPACE

@@ -15,7 +15,6 @@ S3method(summary,freqCalc)
 S3method(summary,micro)
 S3method(summary,pram)
 export("strataVar<-")
-export(LLmodGlobalRisk)
 export(LocalRecProg)
 export(addGhostVars)
 export(addNoise)
@@ -120,6 +119,7 @@ importFrom(stats,lm)
 importFrom(stats,mad)
 importFrom(stats,median)
 importFrom(stats,na.omit)
+importFrom(stats,runif)
 importFrom(stats,sd)
 importFrom(stats,terms)
 importFrom(stats,var)

R/0classes.r

@@ -44,6 +44,7 @@
 #' @importFrom stats sd
 #' @importFrom stats terms
 #' @importFrom stats var
+#' @importFrom stats runif
 #' @importFrom utils data
 setClassUnion("dataframeOrNULL", c("data.frame", "NULL"))
 setClassUnion("numericOrNULL", c("numeric", "NULL"))
@@ -136,19 +137,31 @@ setClassUnion("sdcmicroOrNULL", c("NULL"))
 #' sdc <- topBotCoding(sdc, value=60000000, replacement=62000000, column="income")
 #' head(get.sdcMicroObj(sdc, type="manipNumVars"))
 #' sdc@@risk$numeric
+#'
 #' ### LocalRecProg
 #' data(testdata2)
+#' keyVars <- c("urbrur", "roof", "walls", "water", "sex")
+#' w <- "sampling_weight"
 #' sdc <- createSdcObj(testdata2,
-#'   keyVars=c("urbrur", "roof", "walls", "water", "sex", "relat"))
+#'   keyVars = keyVars,
+#'   weightVar = w)
 #' sdc@@risk$global
 #' sdc <- LocalRecProg(sdc)
 #' sdc@@risk$global
-#' ### LLmodGlobalRisk
-#' sdc <- undolast(sdc)
-#' sdc <- LLmodGlobalRisk(sdc, inclProb=0.001)
-#' sdc@@risk$model
+#' ### model-based risks
+#' #' formula
+#' form <- as.formula(paste("~", paste(keyVars, collapse = "+")))
+#' sdc <- modRisk(sdc, method = "default", formulaM = form)
+#' get.sdcMicroObj(sdc, "risk")$model
+#' sdc <- modRisk(sdc, method = "CE", formulaM = form)
+#' get.sdcMicroObj(sdc, "risk")$model
+#' sdc <- modRisk(sdc, method = "PLM", formulaM = form)
+#' get.sdcMicroObj(sdc, "risk")$model
+#' sdc <- modRisk(sdc, method = "weightedLLM", formulaM = form)
+#' get.sdcMicroObj(sdc, "risk")$model
+#' sdc <- modRisk(sdc, method = "IPF", formulaM = form)
+#' get.sdcMicroObj(sdc, "risk")$model
 #' }
-#'
 setClass(Class = "sdcMicroObj",
   representation = representation(
     origData = "dataframeOrNULL",

R/aux_functions.r

@@ -338,11 +338,11 @@ setMethod(f="calcRisksX", signature=c("sdcMicroObj"), definition=function(obj, .
   suda2Set <- (!is.null(risk$suda2))
   obj <- measure_risk(obj)
   if (modelSet) {
-    inclProb <- NULL
-    if (!is.null(risk$model$inclProb)) {
-      inclProb <- risk$model$inclProb
-    }
-    obj <- LLmodGlobalRisk(obj, inclProb=inclProb)
+    kv <- colnames(get.sdcMicroObj(obj, type = "manipKeyVars"))
+    obj <- modRisk(
+      obj = obj,
+      method = "IPF",
+      formulaM = as.formula(paste(" ~ ", paste(kv, collapse="+"))))
   }
   if (suda2Set) {
     obj <- suda2(obj)