* apps/papers/levillain.09.ismm/classif.cc: Rename as... * apps/papers/levillain.09.ismm/classif-1complex.cc: ...this. * apps/papers/levillain.09.ismm/Makefile.am (noinst_PROGRAMS, noinst_DATA): s/classif/classif-1complex/. (classif_SOURCES, classwst.pnm): Replace by... (classif_1complex_SOURCES, classwst-1complex.ppm): ...these. --- milena/ChangeLog | 11 +++++++++++ milena/apps/papers/levillain.09.ismm/Makefile.am | 11 +++++------ .../{classif.cc => classif-1complex.cc} | 0 3 files changed, 16 insertions(+), 6 deletions(-) rename milena/apps/papers/levillain.09.ismm/{classif.cc => classif-1complex.cc} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1745aeb..f25821c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2011-10-10 Roland Levillain <roland@lrde.epita.fr> + Rename apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc: Rename as... + * apps/papers/levillain.09.ismm/classif-1complex.cc: ...this. + * apps/papers/levillain.09.ismm/Makefile.am + (noinst_PROGRAMS, noinst_DATA): s/classif/classif-1complex/. + (classif_SOURCES, classwst.pnm): Replace by... + (classif_1complex_SOURCES, classwst-1complex.ppm): ...these. + +2011-10-10 Roland Levillain <roland@lrde.epita.fr> + Aesthetic changes in apps/papers/levillain.09.ismm/classif.cc. * apps/papers/levillain.09.ismm/classif.cc: Here. diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index 74324ae..3651c4f 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -25,20 +25,20 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_HEADERS = chain.hh io.hh influence_zones.hh -noinst_PROGRAMS = image2d graph complex classif +noinst_PROGRAMS = image2d graph complex classif-1complex image2d_SOURCES = image2d.cc graph_SOURCES = graph.cc complex_SOURCES = complex.cc # This example has been shown in the ISMM 2009 presentation only (not # in the paper). -classif_SOURCES = classif.cc +classif_1complex_SOURCES = classif-1complex.cc # Input images. # FIXME: Move them to milena/img/? dist_noinst_DATA = seeds.pgm m283-c.off classseedsi.pbm # Output images. -noinst_DATA = lena-s.ppm graph-s.png m283-s.off classwst.pnm +noinst_DATA = lena-s.ppm graph-s.png m283-s.off classwst-1complex.ppm MOSTLYCLEANFILES = $(noinst_DATA) graph-s.neato # FIXME: Also generate intermediate images (gradients, etc.). @@ -54,6 +54,5 @@ graph-s.neato: seeds.pgm graph$(EXEEXT) m283-s.off: m283-c.off complex$(EXEEXT) ./complex$(EXEEXT) $< 100 $@ -# FIXME: Adjust the lambda parameter. -classwst.pnm: classseedsi.pbm classif$(EXEEXT) - ./classif$(EXEEXT) $< 4 $@ +classwst-1complex.ppm: classseedsi.pbm classif-1complex$(EXEEXT) + ./classif-1complex$(EXEEXT) $< 4 $@ diff --git a/milena/apps/papers/levillain.09.ismm/classif.cc b/milena/apps/papers/levillain.09.ismm/classif-1complex.cc similarity index 100% rename from milena/apps/papers/levillain.09.ismm/classif.cc rename to milena/apps/papers/levillain.09.ismm/classif-1complex.cc -- 1.7.2.5