re-add complex matrix with tests

Author: pachadotdev

cpp11test/src/test-matrix.cpp

@@ -1,3 +1,4 @@
+#include "cpp11/complexes.hpp"
 #include "cpp11/doubles.hpp"
 #include "cpp11/function.hpp"
 #include "cpp11/integers.hpp"
@@ -24,6 +25,7 @@ context("matrix-C++") {
     expect_true(x[1].size() == 2);
     expect_true(x[1].stride() == 5);
   }
+
   test_that("matrix dim attributes are correct for read only matrices") {
     auto getExportedValue = cpp11::package("base")["getExportedValue"];
 
@@ -41,6 +43,7 @@ context("matrix-C++") {
       expect_true(x[1].size() == 61);
       expect_true(x[1].stride() == 87);
     }
+
     test_that("matrix<by_column> attributes are correct") {
       cpp11::doubles_matrix<cpp11::by_column> x(getExportedValue("datasets", "volcano"));
 
@@ -156,4 +159,40 @@ context("matrix-C++") {
     cpp11::writable::doubles_matrix<cpp11::by_row> x(5, 2);
     expect_error(cpp11::writable::integers_matrix<cpp11::by_column>(x));
   }
+
+  test_that("complex objects can be created, filled, and copied") {
+    // vector
+
+    cpp11::writable::complexes v(2);
+    v[0] = std::complex<double>(1, 2);
+    v[1] = std::complex<double>(3, 4);
+
+    cpp11::complexes vc = v;
+
+    expect_true(v.size() == vc.size());
+
+    for (int i = 0; i < 2; ++i) {
+      expect_true(v[i] == vc[i]);
+    }
+
+    // matrix
+
+    cpp11::writable::complexes_matrix<cpp11::by_row> m(5, 2);
+
+    for (int i = 0; i < 5; ++i) {
+      for (int j = 0; j < 2; ++j) {
+        m(i, j) = std::complex<double>(i, j);
+      }
+    }
+
+    cpp11::complexes_matrix<> mc = m;
+    expect_true(m.nrow() == mc.nrow());
+    expect_true(m.ncol() == mc.ncol());
+
+    for (int i = 0; i < 5; ++i) {
+      for (int j = 0; j < 2; ++j) {
+        expect_true(m(i, j) == mc(i, j));
+      }
+    }
+  }
 }

inst/include/cpp11/matrix.hpp

@@ -3,11 +3,12 @@
 #include <iterator>
 #include <string>  // for string
 
-#include "cpp11/R.hpp"         // for SEXP, SEXPREC, R_xlen_t, INT...
-#include "cpp11/r_bool.hpp"    // for r_bool
-#include "cpp11/r_string.hpp"  // for r_string
-#include "cpp11/r_vector.hpp"  // for r_vector
-#include "cpp11/sexp.hpp"      // for sexp
+#include "cpp11/R.hpp"          // for SEXP, SEXPREC, R_xlen_t, INT...
+#include "cpp11/r_bool.hpp"     // for r_bool
+#include "cpp11/r_complex.hpp"  // for r_complex
+#include "cpp11/r_string.hpp"   // for r_string
+#include "cpp11/r_vector.hpp"   // for r_vector
+#include "cpp11/sexp.hpp"       // for sexp
 
 namespace cpp11 {
 
@@ -214,6 +215,8 @@ template <typename S = by_column>
 using logicals_matrix = matrix<r_vector<r_bool>, r_bool, S>;
 template <typename S = by_column>
 using strings_matrix = matrix<r_vector<r_string>, r_string, S>;
+template <typename S = by_column>
+using complexes_matrix = matrix<r_vector<r_complex>, r_complex, S>;
 
 namespace writable {
 template <typename S = by_column>
@@ -224,6 +227,8 @@ template <typename S = by_column>
 using logicals_matrix = matrix<r_vector<r_bool>, r_vector<r_bool>::proxy, S>;
 template <typename S = by_column>
 using strings_matrix = matrix<r_vector<r_string>, r_vector<r_string>::proxy, S>;
+template <typename S = by_column>
+using complexes_matrix = matrix<r_vector<r_complex>, r_vector<r_complex>::proxy, S>;
 }  // namespace writable
 
 // TODO: Add tests for Matrix class