From ffb37e1306ea9824e79fdfc9fe8318a85de063ad Mon Sep 17 00:00:00 2001 From: "Matthew L. Fidler" Date: Wed, 29 Nov 2023 19:23:40 -0600 Subject: [PATCH] Fix iCov --- src/rxData.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rxData.cpp b/src/rxData.cpp index 59c01c49a..ef89f7c95 100644 --- a/src/rxData.cpp +++ b/src/rxData.cpp @@ -2837,7 +2837,7 @@ static inline void rxSolve_ev1Update(const RObject &obj, if (nobs == 0){ // KEEP/DROP? if (rxSolveDat->hasICov) { - Rf_warning(R_NilValue, "iCov ignored when there are no samples/observations in the input dataset"); + Rf_warningcall(R_NilValue, "'iCov' ignored when there are no samples/observations in the input dataset"); } List ev1a = etTrans(as(ev1), obj, rxSolveDat->hasCmt, false, false, true, R_NilValue, @@ -4679,8 +4679,7 @@ SEXP rxSolve_(const RObject &obj, const List &rxControl, rxSolve_t rxSolveDat0; rxSolve_t* rxSolveDat = &rxSolveDat0; RObject object; - rxSolveDat->hasICov = Rf_isNull(rxControl[Rxc_iCov]); - + rxSolveDat->hasICov = !Rf_isNull(rxControl[Rxc_iCov]); rxSolveDat->updateObject = asBool(rxControl[Rxc_updateObject], "updateObject"); rxSolveDat->isRxSolve = rxIs(obj, "rxSolve"); rxSolveDat->isEnvironment = rxIs(obj, "environment");