diff --git a/modules/img/alg/tests/CMakeLists.txt b/modules/img/alg/tests/CMakeLists.txt index 38decfcb483175e17ae40fbfb4146288d00e141a..4ebb0fe482c4d051cfd0ce635d14f322da3dfd0a 100644 --- a/modules/img/alg/tests/CMakeLists.txt +++ b/modules/img/alg/tests/CMakeLists.txt @@ -1,5 +1,4 @@ set(IPLT_ALG_UNIT_TESTS -test_circular_mask.cc test_clear.cc test_conj.cc test_convolute.cc diff --git a/modules/img/alg/tests/test_circular_mask.cc b/modules/img/alg/tests/test_circular_mask.cc deleted file mode 100644 index 85bae5f44c1f23a8661ac30e56a4b03b1fb951a0..0000000000000000000000000000000000000000 --- a/modules/img/alg/tests/test_circular_mask.cc +++ /dev/null @@ -1,73 +0,0 @@ -//------------------------------------------------------------------------------ -// This file is part of the OpenStructure project <www.openstructure.org> -// -// Copyright (C) 2008-2010 by the OpenStructure authors -// Copyright (C) 2003-2010 by the IPLT authors -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License as published by the Free -// Software Foundation; either version 3.0 of the License, or (at your option) -// any later version. -// This library is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -// details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this library; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -//------------------------------------------------------------------------------ - -/* - Author: Valerio Mariani -*/ - -#include <iostream> - -#include "tests.hh" - -#include <ost/img/image.hh> -#include <ost/img/alg/circular_mask.hh> -#include <ost/img/alg/randomize.hh> - -namespace { - -using namespace ost::img; -using namespace ost::img::alg; - -void test() -{ - - ImageHandle im = CreateImage(Size(400,400),REAL,SPATIAL); - im.ApplyIP(Randomize()); - CircularMask cm; - cm.SetMaskCenterOffset(::geom::Vec2(100,100)); - cm.SetFillValue(0.0); - im.ApplyIP(cm); - - ImageHandle im2 = CreateImage(Size(400,400),REAL,SPATIAL); - im2.ApplyIP(Randomize()); - im2.SetSpatialOrigin(Point(100,100)); - cm.SetRadius(10); - im2.ApplyIP(cm); - - - ImageHandle im3 = CreateImage(Size(400,400),REAL,SPATIAL); - im3.ApplyIP(Randomize()); - cm.SetMaskCenterOffsetToDefault(); - cm.SetRadiusToDefault(); - cm.SetFillValueToDefault(); - cm.SetSigma(6.0); - im3.ApplyIP(cm); -} - -} // ns - -test_suite* CreateCircularMaskTest() -{ - test_suite* ts=BOOST_TEST_SUITE("Circular Mask Test"); - - ts->add(BOOST_TEST_CASE(&test)); - - return ts; -} diff --git a/modules/img/alg/tests/tests.cc b/modules/img/alg/tests/tests.cc index 7e7c89479fb302ea134bc7f8307889aca616daa6..096f981cda82d17b63af3dcef6fe4ebcc080a0b8 100644 --- a/modules/img/alg/tests/tests.cc +++ b/modules/img/alg/tests/tests.cc @@ -36,7 +36,6 @@ extern test_suite* CreateMirrorTest(); extern test_suite* CreateTransformTest(); extern test_suite* CreateDiscreteShrinkTest(); extern test_suite* CreateFillTest(); -extern test_suite* CreatePeakSearchTest(); extern test_suite* CreateStatTest(); extern test_suite* CreateClearTest(); extern test_suite* CreateFFTTest(); @@ -49,8 +48,7 @@ bool init_ost_img_alg_unit_tests() { framework::master_test_suite().add(CreateMirrorTest()); framework::master_test_suite().add(CreateTransformTest()); framework::master_test_suite().add(CreateDiscreteShrinkTest()); - framework::master_test_suite().add(CreateFillTest()); - framework::master_test_suite().add(CreatePeakSearchTest()); + framework::master_test_suite().add(CreateFillTest()); framework::master_test_suite().add(CreateStatTest()); framework::master_test_suite().add(CreateConjugateTest()); framework::master_test_suite().add(CreateClearTest()); @@ -67,4 +65,4 @@ int main(int argc, char** argv) { return boost::unit_test::unit_test_main(init_ost_img_alg_unit_tests, argc, argv); -} \ No newline at end of file +}