projects
/
libstick.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Factor out simplicial_function
[libstick.git]
/
tests
/
image.h
diff --git
a/tests/image.h
b/tests/image.h
index ff7817af6193cc4f2744b1c542c82e5f55b41f27..9b07eed430a70a3cf275e9f733e57389454e18b6 100644
(file)
--- a/
tests/image.h
+++ b/
tests/image.h
@@
-4,7
+4,7
@@
#include <cpptest.h>
#include <cpptest-suite.h>
#include <cpptest.h>
#include <cpptest-suite.h>
-#include <libstick
-0.1
/image.h>
+#include <libstick/image.h>
#include <cassert>
#include <math.h>
#include <cassert>
#include <math.h>
@@
-40,16
+40,18
@@
class image_TestSuite: public Test::Suite {
image[i*width + j] = (sin(j/10.0) + 0.5*sin(j/4.0))*cos(i/7.0) + i*j*0.5*1e-3;
// Create complex and add image
image[i*width + j] = (sin(j/10.0) + 0.5*sin(j/4.0))*cos(i/7.0) + i*j*0.5*1e-3;
// Create complex and add image
- typedef simplicial_complex<2, uint32_t, float> scomplex;
+ typedef simplicial_function<2, uint32_t, float> sfunction;
+ typedef sfunction::simplcompltype scomplex;
scomplex s;
scomplex s;
- add_image_to_complex(s, image, width, height);
- assert(s.is_monotone());
+ sfunction f(s);
+ add_image_to_simplicialfunction(f, image, width, height);
+ assert(f.is_monotone());
typedef scomplex::simplex_order sorder;
sorder so(s);
assert(so.is_filtration());
typedef scomplex::simplex_order sorder;
sorder so(s);
assert(so.is_filtration());
- typedef
sorder::boundary_matrix
bmatrix;
+ typedef
boolean_colrowmatrix<uint32_t>
bmatrix;
bmatrix bm = so.get_boundary_matrix();
// Check for the right vertex incidences
bmatrix bm = so.get_boundary_matrix();
// Check for the right vertex incidences