From 795de0810d4b1b72483cb092834723a9021d5f61 Mon Sep 17 00:00:00 2001 From: "Matthew L. Fidler" Date: Sun, 28 Jan 2024 18:25:05 -0600 Subject: [PATCH] update last Rprintf() --- cran-comments.md | 7 +++---- src/etTran.cpp | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index 0074c194..9a49c66a 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,5 @@ # Cran comments -- Fixes the issues requested flagged by CRAN -- Also changes solving structure; The reverse dependencies - rxode2random rxode2et and rxode2 need updates after this -- Once updated the rxode2 reverse dependencies all successfully check +- Fixes the m1mac issues flagged by CRAN, including the overlooked issue on 1323:19 +- Removes solved systems with gradients for intel c++ compilers (because they didn't compile) + - Have updated reverse dependencies to check if linear compartment solutions are present before running tests diff --git a/src/etTran.cpp b/src/etTran.cpp index 71e51f7c..67678cb9 100644 --- a/src/etTran.cpp +++ b/src/etTran.cpp @@ -1320,10 +1320,10 @@ List etTransParse(List inData, List mv, bool addCmt=false, Rf_setAttrib(dvidTrans, R_ClassSymbol, wrap("data.frame")); Rf_setAttrib(dvidTrans, R_RowNamesSymbol, IntegerVector::create(NA_INTEGER, -dvidDF.size())); - Rprintf(_("'DVID'/'CMT' translation:\n")); + Rprintf("%s", _("'DVID'/'CMT' translation:\n")); print(dvidTrans); if (dvidCol != -1){ - Rprintf(("'DVID': %d\t"), inDvid[i]); + Rprintf("'DVID': %d\t", inDvid[i]); } Rprintf("'CMT': %d\n", cmt); stop(_("'dvid'->'cmt' or 'cmt' on observation record on a undefined compartment (use 'cmt()' 'dvid()') id: %s row: %d"),