X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=tests%2Fimage.h;h=b069d90fac92620db102bf54b40ba5cc163546e3;hb=HEAD;hp=8633a56b5859e9da8dc91fd41d4406a57a0933fb;hpb=799cd8e53b06b4f9ec7d4dde13ab600717982099;p=libstick.git diff --git a/tests/image.h b/tests/image.h index 8633a56..b069d90 100644 --- a/tests/image.h +++ b/tests/image.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include @@ -40,10 +40,12 @@ 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 - typedef simplicial_complex<2, uint32_t, float> scomplex; + typedef simplicial_function<2, uint32_t, float> sfunction; + typedef sfunction::scomplex scomplex; 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);