fix merge

DESCRIPTION

@@ -14,7 +14,7 @@ Imports:
     Matrix,
     sem,
     igraph,
-    RTMB
+    RTMB,
     ggraph,
     grid,
     methods

NEWS.md

@@ -6,6 +6,8 @@
   option
 * Adding `convert_equations` to extend `sem::specifyEquations` and simplify
   specification for large models
+* Adding argument `prior_negloglike` as interface to specify Bayesian priors
+  and/or likelihood penalties
 
 # dsem 1.3.0
 

R/dsem.R

@@ -20,6 +20,11 @@
 #'        while covs=c("x1", "x2") specifies the variance of x1 and the variance of x2 but not their covariance.
 #'        These same covariances can be added manually via argument `sem`, but using argument `covs` might
 #'        save time for models with many variables.
+#' @param prior_negloglike A user-provided function that takes as input the vector of fixed effects out$obj$par
+#'        returns the negative log-prior probability. For example
+#'        \code{prior_negloglike = function(par) -1 * dnorm( par[1], mean=0, sd=0.1, log=TRUE)}
+#'        specifies a normal prior probability
+#'        for the for the first fixed effect with mean of zero and logsd of 0.1
 #' @param control Output from \code{\link{dsem_control}}, used to define user
 #'        settings, and see documentation for that function for details.
 #'