revert complexes_matrix<> for now

Author: pachadotdev

cpp11test/src/test-matrix.cpp

@@ -24,7 +24,6 @@ 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"];
 
@@ -42,7 +41,6 @@ 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"));
 
@@ -158,38 +156,4 @@ 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 matrix can be created, filled, and copied") {
-    cpp11::writable::complexes_matrix<cpp11::by_row> x(5, 2);
-
-    for (int i = 0; i < 5; ++i) {
-      for (int j = 0; j < 2; ++j) {
-        x(i, j) = std::complex<double>(i, j);
-      }
-    }
-
-    cpp11::writable::complexes_matrix<cpp11::by_column> y(5, 2);
-
-    for (int i = 0; i < 5; ++i) {
-      for (int j = 0; j < 2; ++j) {
-        y(i, j) = std::complex<double>(i, j);
-      }
-    }
-
-    cpp11::complexes_matrix<> xc = x;
-    expect_true(x.nrow() == xc.nrow());
-    expect_true(x.ncol() == xc.ncol());
-
-    cpp11::complexes_matrix<> yc = y;
-    expect_true(y.nrow() == yc.nrow());
-    expect_true(y.ncol() == yc.ncol());
-
-    // Pacha: I need to figure out how to compare complexes with testthat
-    // for (int i = 0; i < 5; ++i) {
-    //   for (int j = 0; j < 2; ++j) {
-    //     expect_true(x(i, j) == xc(i, j));
-    //     expect_true(y(i, j) == yc(i, j));
-    //   }
-    // }
-  }
 }

inst/include/cpp11/matrix.hpp

@@ -3,12 +3,11 @@
 #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_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
+#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
 
 namespace cpp11 {
 
@@ -215,8 +214,6 @@ 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>
@@ -227,8 +224,6 @@ 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