Merge pull request #106 from jaganmn/master

Do not throw INT_MAX error when returning vector

Author: eddelbuettel

.codecov.yml

@@ -1,11 +1,17 @@
-coverage:
-  precision: 1
-
 comment: false
+coverage:
+  status:
+    project:
+      default:
+        target: 70%    # the (on purpose low) required coverage value
+        threshold: 2%  # the permitted delta in hitting the target
+    patch:
+      default:
+        target: 0%     # the (on purpose low) required coverage value
 
-ignore:
-  - "inst/include/Eigen/"
-  - "inst/include/unsupported/Eigen/"
-
-codecov:
-  token: 0b726434-b483-4a82-9cfe-e8312f3b3e9b
+#  layout: "header, diff, tree, changes"
+#  behavior: default
+#  require_changes: false  # if true: only post the comment if coverage changes
+#  branches: null
+#  flags: null
+#  paths: null

ChangeLog

@@ -1,3 +1,11 @@
+2022-01-16  Dirk Eddelbuettel  <edd@debian.org>
+
+	* .codecov.yml: Added to not trigger PR fail for small additions
+
+2022-01-16  Mikael Jagan  <jaganmn@mcmaster.ca>
+
+	* inst/include/RcppEigenWrap.h: Refine use plain dense wrap() change
+
 2022-01-15  Mikael Jagan  <jaganmn@mcmaster.ca>
 
 	* inst/include/RcppEigenWrap.h: Use R_xlen_t for vectors rows + cols

inst/include/RcppEigenWrap.h

@@ -81,18 +81,21 @@ namespace Rcpp{
         // for plain dense objects
         template <typename T>
         SEXP eigen_wrap_plain_dense( const T& obj, Rcpp::traits::true_type ) {
+            bool needs_dim = T::ColsAtCompileTime != 1;
+            R_xlen_t m = obj.rows(), n = obj.cols();
+            if (needs_dim && (m > INT_MAX || n > INT_MAX)) {
+                Rcpp::stop("array dimensions cannot exceed INT_MAX");
+            }
+            R_xlen_t size = m * n;
             typename Eigen::internal::conditional<
                 T::IsRowMajor,
                 Eigen::Matrix<typename T::Scalar,
                               T::RowsAtCompileTime,
                               T::ColsAtCompileTime>,
                 const T&>::type objCopy(obj);
-            R_xlen_t m = obj.rows(), n = obj.cols(), size = m * n;
-            if (m > INT_MAX || n > INT_MAX) {
-                Rcpp::stop("array dimensions cannot exceed INT_MAX");
-            }
-            SEXP ans = PROTECT(::Rcpp::wrap(objCopy.data(), objCopy.data() + size));
-            if ( T::ColsAtCompileTime != 1 ) {
+            SEXP ans = PROTECT(::Rcpp::wrap(objCopy.data(),
+                                            objCopy.data() + size));
+            if (needs_dim) {
                 SEXP dd = PROTECT(::Rf_allocVector(INTSXP, 2));
                 int *d = INTEGER(dd);
                 d[0] = m;