* apps/graph-morpho/Makefile.am (noinst_PROGRAMS, TESTS): Add asf-complex1d. (asf_complex1d_SOURCES): New. * apps/graph-morpho/asf-complex1d.cc: New. --- milena/ChangeLog | 9 +++ milena/apps/graph-morpho/Makefile.am | 6 +- milena/apps/graph-morpho/asf-complex1d.cc | 104 +++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 milena/apps/graph-morpho/asf-complex1d.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index f308986..dd21aa6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-09-18 Roland Levillain <roland@lrde.epita.fr> + New application: apps/graph-morpho/asf-complex1d. + + * apps/graph-morpho/Makefile.am (noinst_PROGRAMS, TESTS): + Add asf-complex1d. + (asf_complex1d_SOURCES): New. + * apps/graph-morpho/asf-complex1d.cc: New. + +2009-09-18 Roland Levillain <roland@lrde.epita.fr> + Fix apps/graph-morpho/Makefile.am. * apps/graph-morpho/Makefile.am diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index 2f30a51..d05fba6 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -22,9 +22,11 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_HEADERS = io.hh morpho.hh -noinst_PROGRAMS = samples-complex1d +noinst_PROGRAMS = samples-complex1d asf-complex1d samples_complex1d_SOURCES = samples-complex1d.cc -TESTS = samples-complex1d +asf_complex1d_SOURCES = asf-complex1d.cc + +TESTS = samples-complex1d asf-complex1d # Graph images stored in 2D PBM files. EXTRA_DIST = x.pbm y.pbm z.pbm diff --git a/milena/apps/graph-morpho/asf-complex1d.cc b/milena/apps/graph-morpho/asf-complex1d.cc new file mode 100644 index 0000000..3a83c87 --- /dev/null +++ b/milena/apps/graph-morpho/asf-complex1d.cc @@ -0,0 +1,104 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file +/// \brief Alternate Sequential Filters in graph space implemented on +/// 1-complex images. +/// +/// \todo There should be a second version of this program, where the +/// graph structure is implemented with an actual mln::util::graph. + +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> + +#include "apps/graph-morpho/morpho.hh" + +#include "apps/graph-morpho/io.hh" +#include "apps/data.hh" + + +int main() +{ + using namespace mln; + + // Input image. + image2d<bool> input = + io::pbm::load(MLN_APPS_DIR "/graph-morpho/zebra-noisy.pbm"); + + // Create a graph image by doubling the resolution of the input + // image to insert edges between pixels. + image2d<bool> input_x2(2 * input.nrows() - 1, 2 * input.ncols() - 1); + mln_piter_(image2d<bool>) p(input_x2.domain()); + for_all(p) + { + point2d p_= p; + if (p_.row() % 2 == 0) + { + if (p_.col() % 2 == 0) + // Pixel site. + input_x2(p) = input.at_(p_.row() / 2, p_.col() / 2); + else + // Horizontal edge site. + input_x2(p) = + input.at_(p_.row() / 2, (p_.col() - 1) / 2) && + input.at_(p_.row() / 2, (p_.col() + 1) / 2); + } + else + { + if (p_.col() % 2 == 0) + // Vertical edge site. + input_x2(p) = + input.at_((p_.row() - 1) / 2, p_.col() / 2) && + input.at_((p_.row() + 1) / 2, p_.col() / 2); + else + // Square site (not handled, but still set for possible + // debug outputs). + input_x2(p) = + input.at_((p_.row() - 1) / 2, (p_.col() - 1) / 2) && + input.at_((p_.row() - 1) / 2, (p_.col() + 1) / 2) && + input.at_((p_.row() + 1) / 2, (p_.col() - 1) / 2) && + input.at_((p_.row() + 1) / 2, (p_.col() + 1) / 2); + } + } + +// #if 0 + // FIXME: Debug (remove). + io::pbm::save(input_x2, "output.pbm"); +// #endif + + /* Binary graph-based image with vertices aligned on a discrete 2D grid. + + Of course, it would have been better, simpler and faster to use a + cubical 1-complex here, but they are not yet available (as of + 2009-09-10). */ + typedef mln::bin_1complex_image2d ima_t; + ima_t graph_ima = make_regular_complex1d_image(input_x2); + + // ASF. + ima_t asf_ima = asf(graph_ima, 8); + + // FIXME: Dump output. + // ... +} -- 1.6.4.2