v0.5.0 simple support for dgCMatrix

Author: pachadotdev

CRAN-SUBMISSION

@@ -1,3 +1,3 @@
 Version: 0.4.6
-Date: 2025-03-21 00:48:36 UTC
-SHA: 977c5b8118b83eee3353d70253d392d2cbab10c2
+Date: 2025-03-21 05:46:18 UTC
+SHA: cab5894a6e7270b6cc626a6b74930c42d21d024e

DESCRIPTION

@@ -6,7 +6,7 @@ Description: Provides function declarations and inline function definitions that
     linear algebra and scientific computing. This implementation is detailed
     in Vargas Sepulveda and Schneider Malamud (2024)
     <doi:10.1016/j.softx.2025.102087>.
-Version: 0.4.6
+Version: 0.5.0
 Authors@R: c(
     person(
         given = "Mauricio",

cpp11armadillotest/R/cpp11.R

@@ -1007,3 +1007,11 @@ ols_ <- function(x, y) {
 poisson_ <- function(x, y) {
   .Call(`_cpp11armadillotest_poisson_`, x, y)
 }
+
+test_dgCMatrix_to_SpMat <- function(x) {
+  .Call(`_cpp11armadillotest_test_dgCMatrix_to_SpMat`, x)
+}
+
+sum_matrices_ <- function(x) {
+  .Call(`_cpp11armadillotest_sum_matrices_`, x)
+}

cpp11armadillotest/src/10_sparse_matrices.cpp

@@ -0,0 +1,29 @@
+#include "00_main.h"
+
+[[cpp11::register]] SEXP test_dgCMatrix_to_SpMat(SEXP x) {
+  // Convert from dgCMatrix to SpMat
+  SpMat<double> A = as_SpMat(x);
+
+  // Optional: perform some operation on A
+  // For example, multiply each element by 2
+  A *= 1.0;
+
+  // Convert back to dgCMatrix and return
+  return as_dgCMatrix(A);
+}
+
+// [[cpp11::register]] SEXP sum_matrices_(SEXP x) {
+//   // Convert from dgCMatrix to SpMat
+//   SpMat<double> A = as_SpMat(x);
+
+//   // Create a matrix B with a diagonal of random numbers
+//   SpMat<double> B(A.n_rows, A.n_cols);
+//   for (uword i = 0; i < A.n_rows; ++i) {
+//     B(i, i) = randu<double>();
+//   }
+
+//   A += B;  // Add the two matrices
+
+//   // Convert back to dgCMatrix and return
+//   return as_dgCMatrix(A);
+// }

cpp11armadillotest/src/cpp11.cpp

@@ -1769,6 +1769,20 @@ extern "C" SEXP _cpp11armadillotest_poisson_(SEXP x, SEXP y) {
     return cpp11::as_sexp(poisson_(cpp11::as_cpp<cpp11::decay_t<const doubles_matrix<>&>>(x), cpp11::as_cpp<cpp11::decay_t<const doubles&>>(y)));
   END_CPP11
 }
+// 10_sparse_matrices.cpp
+SEXP test_dgCMatrix_to_SpMat(SEXP x);
+extern "C" SEXP _cpp11armadillotest_test_dgCMatrix_to_SpMat(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(test_dgCMatrix_to_SpMat(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x)));
+  END_CPP11
+}
+// 10_sparse_matrices.cpp
+SEXP sum_matrices_(SEXP x);
+extern "C" SEXP _cpp11armadillotest_sum_matrices_(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_matrices_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x)));
+  END_CPP11
+}
 
 extern "C" {
 static const R_CallMethodDef CallEntries[] = {
@@ -1989,6 +2003,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11armadillotest_subview2_",                         (DL_FUNC) &_cpp11armadillotest_subview2_,                         1},
     {"_cpp11armadillotest_sum1_",                             (DL_FUNC) &_cpp11armadillotest_sum1_,                             1},
     {"_cpp11armadillotest_sum2_",                             (DL_FUNC) &_cpp11armadillotest_sum2_,                             1},
+    {"_cpp11armadillotest_sum_matrices_",                     (DL_FUNC) &_cpp11armadillotest_sum_matrices_,                     1},
     {"_cpp11armadillotest_svd1_",                             (DL_FUNC) &_cpp11armadillotest_svd1_,                             1},
     {"_cpp11armadillotest_svd_econ1_",                        (DL_FUNC) &_cpp11armadillotest_svd_econ1_,                        1},
     {"_cpp11armadillotest_svds1_",                            (DL_FUNC) &_cpp11armadillotest_svds1_,                            2},
@@ -1997,6 +2012,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11armadillotest_swap_rows1_",                       (DL_FUNC) &_cpp11armadillotest_swap_rows1_,                       1},
     {"_cpp11armadillotest_syl1_",                             (DL_FUNC) &_cpp11armadillotest_syl1_,                             3},
     {"_cpp11armadillotest_symmatu1_",                         (DL_FUNC) &_cpp11armadillotest_symmatu1_,                         1},
+    {"_cpp11armadillotest_test_dgCMatrix_to_SpMat",           (DL_FUNC) &_cpp11armadillotest_test_dgCMatrix_to_SpMat,           1},
     {"_cpp11armadillotest_toeplitz1_",                        (DL_FUNC) &_cpp11armadillotest_toeplitz1_,                        1},
     {"_cpp11armadillotest_trace1_",                           (DL_FUNC) &_cpp11armadillotest_trace1_,                           1},
     {"_cpp11armadillotest_trans1_",                           (DL_FUNC) &_cpp11armadillotest_trans1_,                           1},

cpp11armadillotest/tests/testthat/test-sparse-matrices.R

@@ -0,0 +1,9 @@
+test_that("sparse matrices copy works", {
+  M <- Matrix::Matrix(c(0, 0, 0, 2, 6, 0, -1, 5, 0, 4, 3, 0, 0, 0, 5, 0),
+    nrow = 4, ncol = 4, sparse = TRUE
+  )
+
+  N <- test_dgCMatrix_to_SpMat(M)
+
+  expect_equal(N, M)
+})