* apps/constrained-connectivity/: New directory. * sandbox/roland/constrained-connectivity.cc, * sandbox/roland/soille.pgm: Move files... * apps/constrained-connectivity/constrained-connectivity.cc, * apps/constrained-connectivity/soille.pgm: ...here. * sandbox/roland/Makefile: Adjust. * apps/constrained-connectivity/Makefile.am: New. * apps/Makefile.am (SUBDIRS): Add constrained-connectivity. --- milena/ChangeLog | 15 +++++++++++++++ milena/apps/Makefile.am | 2 +- .../{ => constrained-connectivity}/Makefile.am | 15 +++++++++++---- .../constrained-connectivity.cc | 0 .../constrained-connectivity}/soille.pgm | 0 milena/sandbox/roland/Makefile | 10 ++++------ 6 files changed, 31 insertions(+), 11 deletions(-) copy milena/apps/{ => constrained-connectivity}/Makefile.am (58%) rename milena/{sandbox/roland => apps/constrained-connectivity}/constrained-connectivity.cc (100%) rename milena/{sandbox/roland => apps/constrained-connectivity}/soille.pgm (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6c649f8..17cd2c7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2009-09-24 Roland Levillain <roland@lrde.epita.fr> + Move the experiment on constrained connectivity out of my sandbox. + + * apps/constrained-connectivity/: New directory. + * sandbox/roland/constrained-connectivity.cc, + * sandbox/roland/soille.pgm: + Move files... + * apps/constrained-connectivity/constrained-connectivity.cc, + * apps/constrained-connectivity/soille.pgm: + ...here. + * sandbox/roland/Makefile: Adjust. + * apps/constrained-connectivity/Makefile.am: New. + * apps/Makefile.am (SUBDIRS): Add constrained-connectivity. + +2009-09-24 Roland Levillain <roland@lrde.epita.fr> + Use mln::world::inter_pixel instead of cplx2d.hh. * apps/graph-morpho/morpho.hh: Here. diff --git a/milena/apps/Makefile.am b/milena/apps/Makefile.am index 2150657..dc39cff 100644 --- a/milena/apps/Makefile.am +++ b/milena/apps/Makefile.am @@ -17,4 +17,4 @@ ## Process this file through Automake to produce Makefile.in. -SUBDIRS = mesh-segm-skel graph-morpho +SUBDIRS = mesh-segm-skel graph-morpho constrained-connectivity diff --git a/milena/apps/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am similarity index 58% copy from milena/apps/Makefile.am copy to milena/apps/constrained-connectivity/Makefile.am index 2150657..e27a18e 100644 --- a/milena/apps/Makefile.am +++ b/milena/apps/constrained-connectivity/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -13,8 +13,15 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# -## Process this file through Automake to produce Makefile.in. +# Find Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Produce fast code. +APPS_CXXFLAGS = @APPS_CXXFLAGS@ +AM_CXXFLAGS = $(APPS_CXXFLAGS) + +noinst_PROGRAMS = constrained-connectivity +constrained_connectivity_SOURCES = constrained-connectivity.cc -SUBDIRS = mesh-segm-skel graph-morpho +# The sample image form Pierre Soille's PAMI 2008 article. +EXTRA_DIST = soille.pgm diff --git a/milena/sandbox/roland/constrained-connectivity.cc b/milena/apps/constrained-connectivity/constrained-connectivity.cc similarity index 100% rename from milena/sandbox/roland/constrained-connectivity.cc rename to milena/apps/constrained-connectivity/constrained-connectivity.cc diff --git a/milena/sandbox/roland/soille.pgm b/milena/apps/constrained-connectivity/soille.pgm similarity index 100% rename from milena/sandbox/roland/soille.pgm rename to milena/apps/constrained-connectivity/soille.pgm diff --git a/milena/sandbox/roland/Makefile b/milena/sandbox/roland/Makefile index d95c7a5..7ef48bf 100644 --- a/milena/sandbox/roland/Makefile +++ b/milena/sandbox/roland/Makefile @@ -6,22 +6,20 @@ img_dir = $(milena_dir)/img CPPFLAGS = -I. -I$(milena_dir) CXXFLAGS = -ggdb -Wall -Werror -PROGRAMS = double min-max constrained-connectivity +PROGRAMS = double min-max all: $(PROGRAMS) -check: check-double check-min-max check-constrained-connectivity +check: check-double check-min-max check-double: double ./$< check-min-max: min-max ./$< -check-constrained-connectivity: constrained-connectivity soille.pgm - ./$< soille.pgm -CLEANFILES = double min-max constrained-connectivity +CLEANFILES = double min-max clean: rm -f $(CLEANFILES) .PHONY: all check clean -.PHONY: check-double check-min-max check-constrained-connectivity +.PHONY: check-double check-min-max -- 1.6.4.4