length returns now int and not size_t. dim returns now a const obj. E…

…xtractDataType for borrow added.
Konrad1991 · May 28, 2024 · 36baa4c · 36baa4c
1 parent e9f197d
commit 36baa4c
Show file tree

Hide file tree

Showing 5 changed files with 1,957 additions and 1,407 deletions.
diff --git a/include/etr_bits/Core/Types.hpp b/include/etr_bits/Core/Types.hpp
@@ -49,6 +49,14 @@ struct ExtractDataType<const Buffer<T, R, Trait>> {
   using RetType = T const;
 };
 
+template <typename T, typename Trait> struct ExtractDataType<Borrow<T, Trait>> {
+  using RetType = T;
+};
+template <typename T, typename Trait>
+struct ExtractDataType<const Borrow<T, Trait>> {
+  using RetType = T const;
+};
+
 template <typename Trait = DoubleTrait> struct doubleWrapper {
   using TypeTrait = Trait;
   using Type = DoubleTrait;

diff --git a/include/etr_bits/Helper.hpp b/include/etr_bits/Helper.hpp
@@ -87,13 +87,13 @@ inline std::size_t length(T inp) {
 
 template <typename T>
   requires IsVec<T>
-inline auto length(T &inp) {
+inline int length(T &inp) {
   return inp.size();
 }
 
 template <typename T>
   requires IsVec<T>
-inline auto length(const T &&inp) {
+inline int length(const T &&inp) {
   return inp.size();
 }
 
@@ -105,7 +105,7 @@ inline auto dim(T inp) {
 
 template <typename T>
   requires(IsRVec<T> || IsSubVec<T> || OperationVec<T>)
-inline auto dim(const T &inp) {
+inline const auto dim(const T &inp) {
   ass(inp.im(), "dim can only be called with matrix");
   Vec<int> ret(SI{2});
   ret[0] = inp.nr();
@@ -115,7 +115,7 @@ inline auto dim(const T &inp) {
 
 template <typename T>
   requires IsVec<T>
-inline auto dim(T &inp) {
+inline const auto dim(T &inp) {
   ass(inp.im(), "dim can only be called with matrix");
   Vec<int> ret(SI{2});
   ret[0] = inp.nr();

diff --git a/include/etr_bits/Subsetting/at.hpp b/include/etr_bits/Subsetting/at.hpp
@@ -17,7 +17,7 @@ namespace etr {
 template <typename T, typename R>
   requires(IsRVec<T> || IsSubVec<T> ||
            OperationVec<T> && std::is_arithmetic_v<R>)
-inline auto at(T &&inp, R i) {
+inline auto at(const T &inp, R i) {
   if constexpr (std::is_integral_v<R>) {
     return inp[i];
   } else if constexpr (std::is_floating_point_v<R>) {
@@ -95,7 +95,7 @@ template <typename T, typename R, typename C>
   requires(IsRVec<T> || IsSubVec<T> ||
            OperationVec<T> && std::is_arithmetic_v<R> &&
                std::is_arithmetic_v<C>)
-inline auto at(T &&inp, R r, C c) {
+inline auto at(const T &inp, R r, C c) {
   ass(inp.im() == true, "Input is not a matrix!");
   if constexpr (std::is_integral_v<R> && std::is_integral_v<C>) {
     r--;

diff --git a/tests/Borrow_Tests.cpp b/tests/Borrow_Tests.cpp
@@ -110,9 +110,30 @@ void test_borrow() {
     }
     delete[] ptr;
   }
+  // NOTE: test Borrow with other functions
+  {
+    // TODO: add more tests
+    std::string s = "BorrowWithOtherFcts: ";
+    double *ptr = new double[10];
+    BorrowPtr bp(ptr, 10);
+    Vec<double> res = coca(1, 2, 3, bp);
+    ass(res.size() == 13, s + "coca");
+    delete[] ptr;
+  }
 }
 
 int main(int argc, char *argv[]) {
   test_borrow();
+  Vec<double> ret;
+  ret = etr::vector_numeric(etr::i2d(20));
+  printTAST<decltype(subset(ret, 1))>();
+  ret(1) =
+      1; // TODO: int works. Implement the same call stack for double and bool
+  ret(coca(6, 2, 3)) = coca(1.2, 1.2, 1.2);
+  // ret(1) = 1.2;
+  // etr::subset(ret, 1) = etr::i2d(1);
+  // TODO: this is a problam. Check that each class: Buffer, Borrow,
+  // BorrowSEXP etc. can be assigned with the result of anither class
+  print(ret);
   return 0;
 }