use std::vector instead of make_unique

Author: scivision

test/contiguous/main.c

@@ -16,10 +16,10 @@ float* p = malloc(N * sizeof(float));
 p[0] = a[2];
 p[1] = a[1];
 p[2] = a[0];
+free(a);
 
 asub(&p[0], &N);
 
-free(a);
 free(p);
 
 printf("OK: C contiguous array\n");

test/contiguous/main.cpp

@@ -1,5 +1,9 @@
+// std::vector is contiguous since C++17
+// https://en.cppreference.com/w/cpp/named_req/ContiguousContainer
+// https://en.cppreference.com/w/cpp/container/vector
+
 #include <cstdlib>
-#include <memory>
+#include <vector>
 #include <iostream>
 
 #include "contiguous.h"
@@ -8,12 +12,12 @@ int main(){
 
 size_t dims[1] = {3};
 
-auto a = std::make_unique<float[]>(3);
+std::vector<float> a(3);
 
 for (size_t i = 0; i < 3; ++i)
-  a.get()[i] = i+1;
+  a[i] = i+1;
 
-asub(&a.get()[0], dims);
+asub(&a[0], dims);
 
 std::cout << "OK: C++ contiguous array\n";
 

test/malloc/main.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include <memory>
+#include <vector>
 #include <cstdlib>
 
 #include "my_vector.h"
@@ -9,22 +9,22 @@ int main()
 {
   std::size_t N = 3;
 
-  auto x = std::make_unique<int[]>(N);
-  auto x2 = std::make_unique<int[]>(N);
+  std::vector<int> x(N);
+  std::vector<int> x2(N);
 
   for (size_t i = 0; i < N; ++i)
-    x.get()[i] = i+1;
+    x[i] = i+1;
 
-  timestwo_f(&x.get()[0], &x2.get()[0], &N);
+  timestwo_f(&x[0], &x2[0], &N);
 
   for (auto i=0u; i < N; i++){
-    if (x2.get()[i] != 2*x.get()[i]){
-      std::cerr << "value " <<  x2.get()[i] << "!=" << x.get()[i] << std::endl;
+    if (x2[i] != 2 * x[i]){
+      std::cerr << "value " <<  x2[i] << "!=" << x[i] << std::endl;
       return EXIT_FAILURE;
     }
   }
 
-  std::cout << "OK: C++ make_unique\n";
+  std::cout << "OK: C++ std::vector pre-allocated\n";
 
   return EXIT_SUCCESS;
 }

test/pointer/main.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include <memory>
+#include <vector>
 #include <cstdlib>
 
 #include "my_pointer.h"
@@ -8,16 +8,16 @@
 int main()
 {
   size_t N = 3;
-  auto a = std::make_unique<float[]>(N);
-  auto b = std::make_unique<float[]>(N-1);
+  std::vector<float> a(N);
+  std::vector<float> b(N-1);
 
   for (size_t i = 0; i < 3; ++i)
-    a.get()[i] = i+1;
+    a[i] = i+1;
 
-  point23(&a.get()[0], &b.get()[0], &N);
+  point23(&a[0], &b[0], &N);
 
-  if (b.get()[0] != a.get()[1] || b.get()[1] != a.get()[2]){
-    std::cerr << "value " <<  b.get()[0] << "!=" << a.get()[1] << " or " << b.get()[1] << "!=" << a.get()[2] << std::endl;
+  if (b[0] != a[1] || b[1] != a[2]){
+    std::cerr << "value " <<  b[0] << "!=" << a[1] << " or " << b[1] << "!=" << a[2] << std::endl;
     return EXIT_FAILURE;
   }
 

test/vector/main.cpp

@@ -9,18 +9,20 @@ int main()
 
   std::vector<int> x = {0, 1, 2};
   auto N = x.size();
+
   std::vector<int> x2(N);
 
   timestwo_f(&x.front(), &x2.front(), &N);
 
   for (auto i=0u; i < x2.size(); i++){
+    std::cout << x2[i] << "\n";
     if (x2[i] != 2*x[i]){
       std::cerr << "value " <<  x2[i] << "!=" << x[i] << std::endl;
       return EXIT_FAILURE;
     }
   }
 
-  std::cout << "OK: vector\n";
+  std::cout << "OK: C++ std::vector\n";
 
   return EXIT_SUCCESS;
 }