Use scomplex throughout rather than simplcompltype

diff --git a/include/libstick/simplicialcomplex.h b/include/libstick/simplicialcomplex.h
index 6dd99a376f50b9392306941ed67524e7ad60a486..6aaf816aad0a1d519e3ea106a4e5e7c87a8f80b3 100644 (file)
--- a/include/libstick/simplicialcomplex.h
+++ b/include/libstick/simplicialcomplex.h
@@ -41,7 +41,7 @@ class simplicial_complex {
 
     public:
         /** The type of this class. */
 
     public:
         /** The type of this class. */

-        typedef simplicial_complex<MAXDIM, IT> simplcompltype;
+        typedef simplicial_complex<MAXDIM, IT> scomplex;

         /** Type of indices of simplices. */
         typedef IT index_type;
 
         /** Type of indices of simplices. */
         typedef IT index_type;
 


@@ -93,7 +93,7 @@ class simplicial_complex {
                 typedef std::vector<IT> order_type;
 
                 /** Create a standard order of the complex c, i.e., the identity permutation. */
                 typedef std::vector<IT> order_type;
 
                 /** Create a standard order of the complex c, i.e., the identity permutation. */

-                simplex_order(const simplcompltype &c) :
+                simplex_order(const scomplex &c) :

                     c(c) {
                     reset();
                 }
                     c(c) {
                     reset();
                 }


@@ -130,7 +130,7 @@ class simplicial_complex {
                 }
 
                 /** Return the underlying complex. */
                 }
 
                 /** Return the underlying complex. */

-                const simplcompltype& get_complex() const {
+                const scomplex& get_complex() const {

                     return c;
                 }
 
                     return c;
                 }
 


@@ -210,7 +210,7 @@ class simplicial_complex {
                 }
 
                 /** The complex of which we consider a simplex order. */
                 }
 
                 /** The complex of which we consider a simplex order. */

-                const simplcompltype &c;
+                const scomplex &c;

 
                 /** The i-th simplex in order is the order[i]-th simplex of the
                  * complex. 'order' can be seen as a permutation of the
 
                 /** The i-th simplex in order is the order[i]-th simplex of the
                  * complex. 'order' can be seen as a permutation of the

diff --git a/include/libstick/simplicialfunction.h b/include/libstick/simplicialfunction.h
index 6371d66e0fd72cb88d852477f659b0573cb53b8e..d09bfe7ce89eb7b8ea34bd13fcfd0e66dcd9793b 100644 (file)
--- a/include/libstick/simplicialfunction.h
+++ b/include/libstick/simplicialfunction.h
@@ -19,13 +19,13 @@ class simplicial_function {
 
     public:
         /** The type of the underlying simplicial complex. */
 
     public:
         /** The type of the underlying simplicial complex. */

-        typedef simplicial_complex<MAXDIM, IT> simplcompltype;
+        typedef simplicial_complex<MAXDIM, IT> scomplex;

         /** Type of indices of simplices. */
         typedef IT index_type;
         /** Type of the simplices of the underlying simplicial complex */
         /** Type of indices of simplices. */
         typedef IT index_type;
         /** Type of the simplices of the underlying simplicial complex */

-        typedef typename simplcompltype::simplex simplex;
+        typedef typename scomplex::simplex simplex;

         /** Type of the order on the underlying simplicial complex */
         /** Type of the order on the underlying simplicial complex */

-        typedef typename simplcompltype::simplex_order simplex_order;
+        typedef typename scomplex::simplex_order simplex_order;

         /** To every simplex a function value is assigned according to which a
          * filtration is considered. This is the value type of the function. */
         typedef VT value_type;
         /** To every simplex a function value is assigned according to which a
          * filtration is considered. This is the value type of the function. */
         typedef VT value_type;


@@ -51,7 +51,7 @@ class simplicial_function {
         /**Create a simplicial function on a given simplicial complex c. Only
          * define for the (-1)-dim dummy vertex a value, namely
          * get_minusonedim_value().*/
         /**Create a simplicial function on a given simplicial complex c. Only
          * define for the (-1)-dim dummy vertex a value, namely
          * get_minusonedim_value().*/

-        simplicial_function(simplcompltype &c) :
+        simplicial_function(scomplex &c) :

             c(c) {
                 values.push_back(get_minusonedim_value());
             }
             c(c) {
                 values.push_back(get_minusonedim_value());
             }


@@ -84,7 +84,7 @@ class simplicial_function {
         }
 
         /** Return the underlying complex. */
         }
 
         /** Return the underlying complex. */

-        const simplcompltype& get_complex() const {
+        const scomplex& get_complex() const {

             return c;
         }
 
             return c;
         }
 


@@ -224,7 +224,7 @@ class simplicial_function {
         values_type values;
 
         /** The complex on which we consider a function. */
         values_type values;
 
         /** The complex on which we consider a function. */

-        simplcompltype &c;
+        scomplex &c;

 };
 
 }
 };
 
 }

diff --git a/tests/image.h b/tests/image.h
index 9b07eed430a70a3cf275e9f733e57389454e18b6..b069d90fac92620db102bf54b40ba5cc163546e3 100644 (file)
--- a/tests/image.h
+++ b/tests/image.h
@@ -41,7 +41,7 @@ class image_TestSuite: public Test::Suite {
 
             // Create complex and add image
             typedef simplicial_function<2, uint32_t, float> sfunction;
 
             // Create complex and add image
             typedef simplicial_function<2, uint32_t, float> sfunction;

-            typedef sfunction::simplcompltype scomplex;
+            typedef sfunction::scomplex scomplex;

             scomplex s;
             sfunction f(s);
             add_image_to_simplicialfunction(f, image, width, height);
             scomplex s;
             sfunction f(s);
             add_image_to_simplicialfunction(f, image, width, height);

diff --git a/tests/persistence.h b/tests/persistence.h
index b7678bfd76993fb3ed03bb45046f3bbcc3b2eb5e..aac47234bb7bd07f18b3042b7007319fcfb2dc22 100644 (file)
--- a/tests/persistence.h
+++ b/tests/persistence.h
@@ -13,7 +13,7 @@ class persistence_TestSuite: public Test::Suite {
 
     private:
         typedef simplicial_function<3, uint32_t, uint32_t> sfunction;
 
     private:
         typedef simplicial_function<3, uint32_t, uint32_t> sfunction;

-        typedef sfunction::simplcompltype scomplex;
+        typedef sfunction::scomplex scomplex;

         typedef persistence<3, uint32_t> pers;
         typedef pers::boundary_matrix bm;
         typedef pers::lowestones_matrix lom;
         typedef persistence<3, uint32_t> pers;
         typedef pers::boundary_matrix bm;
         typedef pers::lowestones_matrix lom;

diff --git a/tests/simplicialcomplex.h b/tests/simplicialcomplex.h
index 1c8f9496f41a83e4b76e8c9ea0a0f51c53a38781..91d1c55532b2c6e1080efea3fd558fa3adb45aef 100644 (file)
--- a/tests/simplicialcomplex.h
+++ b/tests/simplicialcomplex.h
@@ -13,7 +13,7 @@ class simplicial_complex_TestSuite: public Test::Suite {
 
     private:
         typedef simplicial_function<3, uint32_t, double> sfunction;
 
     private:
         typedef simplicial_function<3, uint32_t, double> sfunction;

-        typedef sfunction::simplcompltype scomplex;
+        typedef sfunction::scomplex scomplex;

         typedef scomplex::simplex_order::boundary_matrix bm;
 
         bool setupcalled;
         typedef scomplex::simplex_order::boundary_matrix bm;
 
         bool setupcalled;