X-Git-Url: https://git.sthu.org/?p=libstick.git;a=blobdiff_plain;f=tests%2Fsimplicialcomplex.h;h=6e63f54f9baaf2c0827f0eb136fd82026d5b9662;hp=373688351dea1f172c49a93c600d4e4388c63c28;hb=46e2e26363bfa07dc79d912ebe6df772942536bd;hpb=88ea14f1e9079c9b8c4af7aff01a3fe960e9472b

diff --git a/tests/simplicialcomplex.h b/tests/simplicialcomplex.h
index 3736883..6e63f54 100644
--- a/tests/simplicialcomplex.h
+++ b/tests/simplicialcomplex.h
@@ -5,7 +5,6 @@
 #include <cpptest-suite.h>
 
 #include <libstick-0.1/simplicialcomplex.h>
-#include <libstick-0.1/matrixreduction.h>
 
 using namespace libstick;
 
@@ -13,7 +12,7 @@ using namespace libstick;
 class simplicial_complex_TestSuite: public Test::Suite {
 
     private:
-        typedef simplicial_complex<2, uint32_t, double> scomplex;
+        typedef simplicial_complex<3, uint32_t, double> scomplex;
         typedef scomplex::simplex_order::boundary_matrix bm;
 
         bool setupcalled;
@@ -33,7 +32,6 @@ class simplicial_complex_TestSuite: public Test::Suite {
             TEST_ADD(simplicial_complex_TestSuite::test_is_order_filtration);
             TEST_ADD(simplicial_complex_TestSuite::test_is_order_monotone);
             TEST_ADD(simplicial_complex_TestSuite::test_boundary_matrix);
-            TEST_ADD(simplicial_complex_TestSuite::test_matrix_reduction);
         }
 
     protected:
@@ -42,8 +40,7 @@ class simplicial_complex_TestSuite: public Test::Suite {
                 return;
             setupcalled = true;
 
-            const unsigned num = 11;
-            scomplex::Simplex ss[num] = {
+            scomplex::Simplex ss[] = {
                 // dimension, faces, value...
                 {0, {}, 1},
                 {0, {}, 2},
@@ -57,6 +54,8 @@ class simplicial_complex_TestSuite: public Test::Suite {
                 {2, {7, 8, 9}, 10},
                 {2, {5, 6, 9}, 11}
             };
+            const size_t cntss = sizeof(ss)/sizeof(scomplex::Simplex);
+            c1.add_simplices(ss, cntss);
 
             //  This is o1        This is o2         This is o3(b)
             //  (value = index)   (values)           (values)
@@ -73,10 +72,6 @@ class simplicial_complex_TestSuite: public Test::Suite {
             //  |          \|    |          \|     |          \|
             //  4 ----7---- 3    4 ----7---- 3     4 ----7---- 3
 
-            // Build the complex
-            for (unsigned i=0; i<num; ++i)
-                c1.add_simplex(ss[i]);
-
             c2 = c1;
             c2.simplices[6].value = 12;
 
@@ -122,50 +117,21 @@ class simplicial_complex_TestSuite: public Test::Suite {
         void test_boundary_matrix() {
             bm mat1 = o1.get_boundary_matrix();
             bm mat1e(c1.size());
-            mat1e.set(0, 1, true);
-            mat1e.set(0, 2, true);
-            mat1e.set(0, 3, true);
-            mat1e.set(0, 4, true);
-            mat1e.set(1, 5, true);
-            mat1e.set(2, 5, true);
-            mat1e.set(2, 6, true);
-            mat1e.set(3, 6, true);
-            mat1e.set(3, 7, true);
-            mat1e.set(4, 7, true);
-            mat1e.set(4, 8, true);
-            mat1e.set(1, 8, true);
-            mat1e.set(1, 9, true);
-            mat1e.set(3, 9, true);
-            mat1e.set(7, 10, true);
-            mat1e.set(8, 10, true);
-            mat1e.set(9, 10, true);
-            mat1e.set(5, 11, true);
-            mat1e.set(6, 11, true);
-            mat1e.set(9, 11, true);
+            uint32_t mat1e_coords[][2] = {
+                    {0, 1}, {0, 2}, {0, 3}, {0, 4}, {1, 5}, {2, 5}, {2, 6}, {3, 6}, {3, 7}, {4, 7}, {1, 8}, {4, 8},
+                    {1, 9}, {3, 9}, {7, 10}, {8, 10}, {9, 10}, {5, 11}, {6, 11}, {9, 11}
+            };
+            mat1e.set_all(mat1e_coords, sizeof(mat1e_coords)/(2*sizeof(uint32_t)), true);
             TEST_ASSERT(mat1 == mat1e);
 
+
             bm mat3b = o3b.get_boundary_matrix();
             bm mat3be(c1.size());
-            mat3be.set(0, 1, true);
-            mat3be.set(0, 2, true);
-            mat3be.set(0, 3, true);
-            mat3be.set(0, 4, true);
-            mat3be.set(1, 5, true);
-            mat3be.set(2, 5, true);
-            mat3be.set(3, 6, true);
-            mat3be.set(4, 6, true);
-            mat3be.set(4, 7, true);
-            mat3be.set(1, 7, true);
-            mat3be.set(1, 8, true);
-            mat3be.set(3, 8, true);
-            mat3be.set(6, 9, true);
-            mat3be.set(7, 9, true);
-            mat3be.set(8, 9, true);
-            mat3be.set(2, 10, true);
-            mat3be.set(3, 10, true);
-            mat3be.set(5, 11, true);
-            mat3be.set(8, 11, true);
-            mat3be.set(10, 11, true);
+            uint32_t mat3be_coords[][2] = {
+                    {0, 1}, {0, 2}, {0, 3}, {0, 4}, {1, 5}, {2, 5}, {3, 6}, {4, 6}, {1, 7}, {4, 7}, {1, 8}, {3, 8},
+                    {6, 9}, {7, 9}, {8, 9}, {2, 10}, {3, 10}, {5, 11}, {8, 11}, {10, 11}
+            };
+            mat3be.set_all(mat3be_coords, sizeof(mat3be_coords)/(2*sizeof(uint32_t)), true);
             TEST_ASSERT(mat3b == mat3be);
 
             //std::cout << mat3b << std::endl << std::endl;
@@ -173,20 +139,6 @@ class simplicial_complex_TestSuite: public Test::Suite {
             //std::cout << ((bm::colbase) mat3b) << std::endl << std::endl;
             //std::cout << ((bm::rowbase) mat3b) << std::endl << std::endl;
         }
-
-        void test_matrix_reduction() {
-            bm b = o3b.get_boundary_matrix();
-            bm v = create_unit_matrix<bm>(b.size());
-
-            bm b_orig = b;
-            reduce_boundary_matrix(b, v);
-            TEST_ASSERT(b == b_orig*v);
-
-            //std::cout << std::endl << "after reduce: " << std::endl;
-            //std::cout << std::endl << b << std::endl;
-            //std::cout << std::endl << v << std::endl;
-            //std::cout << std::endl << (b_orig*v) << std::endl;
-        }
 };
 
 #endif