commit 13954c44409a5d8e632d3b034d3d738b1d9e8eaa
author Erik Schultheis <erik-schultheis@freenet.de> Mon Nov 15 22:16:01 2021 +0000
committer Rasmus Munk Larsen <rmlarsen@google.com> Mon Nov 15 22:16:01 2021 +0000
tree 2adafe28a5c027203033bb5172691beb53dac915
parent da7909592376c893dabbc4b6453a8ffe46b1eb8e

moved pruning code to SparseVector.h

test/sparse_vector.cpp

diff --git a/test/sparse_vector.cpp b/test/sparse_vector.cpp
index 3512927..7bd57cd 100644
--- a/test/sparse_vector.cpp
+++ b/test/sparse_vector.cpp
@@ -111,7 +111,7 @@
   // check copy to dense vector with transpose
   refV3.resize(0);
   VERIFY_IS_APPROX(refV3 = v1.transpose(),v1.toDense()); 
-  VERIFY_IS_APPROX(DenseVector(v1),v1.toDense()); 
+  VERIFY_IS_APPROX(DenseVector(v1),v1.toDense());
 
   // test conservative resize
   {
@@ -144,6 +144,31 @@
   }
 
 }
+void test_pruning() {
+    using SparseVectorType = SparseVector<double, 0, int>;
+
+    SparseVectorType vec;
+    auto init_vec = [&](){;
+        vec.resize(10);
+        vec.insert(3) = 0.1;
+        vec.insert(5) = 1.0;
+        vec.insert(8) = -0.1;
+        vec.insert(9) = -0.2;
+    };
+    init_vec();
+
+    VERIFY_IS_EQUAL(vec.nonZeros(), 4);
+    VERIFY_IS_EQUAL(vec.prune(0.1, 1.0), 2);
+    VERIFY_IS_EQUAL(vec.nonZeros(), 2);
+    VERIFY_IS_EQUAL(vec.coeff(5), 1.0);
+    VERIFY_IS_EQUAL(vec.coeff(9), -0.2);
+
+    init_vec();
+    VERIFY_IS_EQUAL(vec.prune([](double v) { return v >= 0; }), 2);
+    VERIFY_IS_EQUAL(vec.nonZeros(), 2);
+    VERIFY_IS_EQUAL(vec.coeff(3), 0.1);
+    VERIFY_IS_EQUAL(vec.coeff(5), 1.0);
+}
 
 EIGEN_DECLARE_TEST(sparse_vector)
 {
@@ -159,5 +184,7 @@
     CALL_SUBTEST_1(( sparse_vector<double,long int>(r, c) ));
     CALL_SUBTEST_1(( sparse_vector<double,short>(r, c) ));
   }
+
+  CALL_SUBTEST_1(test_pruning());
 }