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

diff --git a/tests/simplicialcomplex.h b/tests/simplicialcomplex.h
index afc9fab..3736883 100644
--- a/tests/simplicialcomplex.h
+++ b/tests/simplicialcomplex.h
@@ -10,30 +10,30 @@
 using namespace libstick;
 
 
-class SimplicialComplexTestSuite: public Test::Suite {
+class simplicial_complex_TestSuite: public Test::Suite {
 
     private:
-        typedef SimplicialComplex<2, uint32_t, double> scomplex;
-        typedef scomplex::SimplexOrder::BoundaryMatrix bm;
+        typedef simplicial_complex<2, uint32_t, double> scomplex;
+        typedef scomplex::simplex_order::boundary_matrix bm;
 
         bool setupcalled;
         scomplex c1, c2, c3;
-        scomplex::SimplexOrder o1, o2, o3, o3b;
+        scomplex::simplex_order o1, o2, o3, o3b;
 
     public:
-        SimplicialComplexTestSuite() :
+        simplicial_complex_TestSuite() :
             setupcalled(false),
             o1(c1),
             o2(c2),
             o3(c3),
             o3b(c3)
             {
-            TEST_ADD(SimplicialComplexTestSuite::test_isComplex);
-            TEST_ADD(SimplicialComplexTestSuite::test_isMonotoneComplex);
-            TEST_ADD(SimplicialComplexTestSuite::test_isOrderFiltration);
-            TEST_ADD(SimplicialComplexTestSuite::test_isOrderMonotone);
-            TEST_ADD(SimplicialComplexTestSuite::test_boundaryMatrix);
-            TEST_ADD(SimplicialComplexTestSuite::test_matrixreduction);
+            TEST_ADD(simplicial_complex_TestSuite::test_is_complex);
+            TEST_ADD(simplicial_complex_TestSuite::test_is_monotoneComplex);
+            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:
@@ -75,7 +75,7 @@ class SimplicialComplexTestSuite: public Test::Suite {
 
             // Build the complex
             for (unsigned i=0; i<num; ++i)
-                c1.addSimplex(ss[i]);
+                c1.add_simplex(ss[i]);
 
             c2 = c1;
             c2.simplices[6].value = 12;
@@ -87,40 +87,40 @@ class SimplicialComplexTestSuite: public Test::Suite {
             o2.reset();
             o3.reset();
             o3b.reset();
-            o3b.makeMonotoneFiltration();
+            o3b.make_monotone_filtration();
         }
 
         virtual void tear_down() {
         }
 
-        void test_isComplex() {
-            TEST_ASSERT(c1.isComplex());
-            TEST_ASSERT(c2.isComplex());
-            TEST_ASSERT(c3.isComplex());
+        void test_is_complex() {
+            TEST_ASSERT(c1.is_complex());
+            TEST_ASSERT(c2.is_complex());
+            TEST_ASSERT(c3.is_complex());
         }
 
-        void test_isMonotoneComplex() {
-            TEST_ASSERT(c1.isMonotone());
-            TEST_ASSERT(!c2.isMonotone());
-            TEST_ASSERT(c3.isMonotone());
+        void test_is_monotoneComplex() {
+            TEST_ASSERT(c1.is_monotone());
+            TEST_ASSERT(!c2.is_monotone());
+            TEST_ASSERT(c3.is_monotone());
         }
 
-        void test_isOrderFiltration() {
-            TEST_ASSERT(o1.isFiltration());
-            TEST_ASSERT(o2.isFiltration());
-            TEST_ASSERT(o3.isFiltration());
-            TEST_ASSERT(o3b.isFiltration());
+        void test_is_order_filtration() {
+            TEST_ASSERT(o1.is_filtration());
+            TEST_ASSERT(o2.is_filtration());
+            TEST_ASSERT(o3.is_filtration());
+            TEST_ASSERT(o3b.is_filtration());
         }
 
-        void test_isOrderMonotone() {
-            TEST_ASSERT(o1.isMonotone());
-            TEST_ASSERT(!o2.isMonotone());
-            TEST_ASSERT(!o3.isMonotone());
-            TEST_ASSERT(o3b.isMonotone());
+        void test_is_order_monotone() {
+            TEST_ASSERT(o1.is_monotone());
+            TEST_ASSERT(!o2.is_monotone());
+            TEST_ASSERT(!o3.is_monotone());
+            TEST_ASSERT(o3b.is_monotone());
         }
 
-        void test_boundaryMatrix() {
-            bm mat1 = o1.getBoundaryMatrix();
+        void test_boundary_matrix() {
+            bm mat1 = o1.get_boundary_matrix();
             bm mat1e(c1.size());
             mat1e.set(0, 1, true);
             mat1e.set(0, 2, true);
@@ -144,7 +144,7 @@ class SimplicialComplexTestSuite: public Test::Suite {
             mat1e.set(9, 11, true);
             TEST_ASSERT(mat1 == mat1e);
 
-            bm mat3b = o3b.getBoundaryMatrix();
+            bm mat3b = o3b.get_boundary_matrix();
             bm mat3be(c1.size());
             mat3be.set(0, 1, true);
             mat3be.set(0, 2, true);
@@ -174,12 +174,12 @@ class SimplicialComplexTestSuite: public Test::Suite {
             //std::cout << ((bm::rowbase) mat3b) << std::endl << std::endl;
         }
 
-        void test_matrixreduction() {
-            bm b = o3b.getBoundaryMatrix();
-            bm v = unitMatrix<bm>(b.size());
+        void test_matrix_reduction() {
+            bm b = o3b.get_boundary_matrix();
+            bm v = create_unit_matrix<bm>(b.size());
 
             bm b_orig = b;
-            reduceBoundaryMatrix(b, v);
+            reduce_boundary_matrix(b, v);
             TEST_ASSERT(b == b_orig*v);
 
             //std::cout << std::endl << "after reduce: " << std::endl;