Merge pull request #771 from nlmixr2/771-lotri-nearPD

Use lotri's nearPD
nlmixr2 · Aug 15, 2024 · 05c75ff · 05c75ff
2 parents 6296051 + 82db8ad
commit 05c75ff
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/R/nearpd.R b/R/nearpd.R
diff --git a/src/cvPost.cpp b/src/cvPost.cpp
@@ -12,10 +12,12 @@
 #include "../inst/include/rxode2_as.h"
 #include <lotri.h>
 
+extern "C" {
+  iniLotri;
+}
+
 extern "C" SEXP chin(SEXP a, SEXP b);
 
-// place links here
-iniLotri;
 
 List etTrans(List inData, const RObject &mv, bool addCmt,
              bool dropUnits, bool allTimeVar,

diff --git a/src/nearPD.cpp b/src/nearPD.cpp
@@ -5,27 +5,26 @@
 #define STRICT_R_HEADER
 #include <RcppArmadillo.h>
 #include "nearPD.h"
+#include <lotri.h>
+
+lotriNearPDarmaSetup
 
 using namespace arma;
 using namespace Rcpp;
 
-Function getRxFn(std::string name);
-
 bool rxNearPD(arma::mat &ret, const arma::mat in) {
-  Function mnearpd = getRxFn(".nearPD");
-  RObject retRO = mnearpd(in);
-  if (Rf_isMatrix(retRO)) {
-    ret = as<arma::mat>(retRO);
+  if (lotriNearPDarma(ret,  in)) {
     return true;
+  } else {
+    ret = in;
+    return false;
   }
-  ret = in;
-  return false;
+  return false;  // nocov
 }
 
 unsigned int rxNearPdChol(Rcpp::NumericMatrix &ret, Rcpp::NumericMatrix x, bool isChol) {
   arma::mat tmpM = as<arma::mat>(x);
   arma::mat reta;
-
   if (!x.hasAttribute("dimnames")) {
     return rxNearPdChol_not_named;
   } else if (isChol) {

diff --git a/tests/testthat/test-nearpd.R b/tests/testthat/test-nearpd.R
@@ -60,7 +60,3 @@ rxTest({
                  NA)
   })
 })
-
-test_that(".nearPD expected null for matrix that cannot become positive definite", {
-  expect_null(.nearPD(matrix(Inf)))
-})
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,3 @@ rxTest({ @@
                      NA)
       })
     })
-    test_that(".nearPD expected null for matrix that cannot become positive definite", {
-      expect_null(.nearPD(matrix(Inf)))
-    })