From d5ff53448c61134c46cc4df9ea88fd86fa376d66 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 17 Feb 2023 14:44:29 +0100 Subject: Finish adapting to upcoming deSolve --- R/saem.R | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'R/saem.R') diff --git a/R/saem.R b/R/saem.R index b29cf8a9..7eeec2bb 100644 --- a/R/saem.R +++ b/R/saem.R @@ -581,12 +581,11 @@ saemix_model <- function(object, solution_type = "auto", transform_fractions <- object[[1]]$transform_fractions # Get native symbol info for speed - call_lsoda <- getNativeSymbolInfo("call_lsoda", PACKAGE = "deSolve") if (solution_type == "deSolve" & !is.null(mkin_model$cf)) { - mkin_model$diffs_address <- getNativeSymbolInfo("diffs", - PACKAGE = mkin_model$dll_info[["name"]])$address - mkin_model$initpar_address <- getNativeSymbolInfo("initpar", - PACKAGE = mkin_model$dll_info[["name"]])$address + mkin_model$symbols <- deSolve::checkDLL( + dllname = mkin_model$dll_info[["name"]], + func = "diffs", initfunc = "initpar", + jacfunc = NULL, nout = 0, outnames = NULL) } # Define the model function @@ -622,8 +621,7 @@ saemix_model <- function(object, solution_type = "auto", odeparms = odeparms, odeini = odeini, solution_type = solution_type, outtimes = sort(unique(i_time)), - na_stop = FALSE, - call_lsoda = call_lsoda + na_stop = FALSE ) out_index <- cbind(as.character(i_time), as.character(i_name)) -- cgit v1.2.1