July 2009 - Olena-patches

[Olena] #179: Float precision issues with epsilon
by Olena 13 Jul '09

13 Jul '09

#179: Float precision issues with epsilon ---------------------+------------------------------------------------------ Reporter: lazzara | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ---------------------+------------------------------------------------------ In level::stretch, we use float variables to do the following: {{{ float epsilon = mln_epsilon(float), M = mln_max(V) + 0.5f - epsilon, m = 0.0f - 0.5f + epsilon; }}} 'm' is precise enough since it is a really low value. However, M is not precise enough since mln_max(V) may be a high value, so we will loose decimal precision if we store that number as float. As a result, M is always equal to 'mln_max(V) + 0.5' which introduce a bug in level::stretch. This issue can be avoided by using double variables instead, but do we really want that? Don't we want to handle that issue in a more generic way? -- Ticket URL: <https://trac.lrde.org/olena/ticket/179> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 2

[Olena] #165: Separate sites sets from their psites?
by Olena 13 Jul '09

13 Jul '09

#165: Separate sites sets from their psites? ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: proposal | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Many files containing the definitions site sets, located in source:branches/cleanup-2008/milena/mln/core/site_set/, include the related psite and piters. Split them into several files? (And add convenience headers including all of them?) -- Ticket URL: <https://trac.lrde.org/olena/ticket/165> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 1

4285: Do not move documentation files if srcdir == builddir.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* doc/ref_guide/Makefile.am, * doc/tutorial/Makefile.am, * doc/white_paper/Makefile.am: check if srcdir == builddir. --- milena/ChangeLog | 8 ++++++++ milena/doc/ref_guide/Makefile.am | 5 +++-- milena/doc/tutorial/Makefile.am | 5 +++-- milena/doc/white_paper/Makefile.am | 5 +++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 287e058..2ee2ea3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Do not move documentation files if srcdir == builddir. + + * doc/ref_guide/Makefile.am, + * doc/tutorial/Makefile.am, + * doc/white_paper/Makefile.am: check if srcdir == builddir. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix documentation generation. * doc/examples/Makefile.am: Check if directory exists before diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index 31a5abb..9870a07 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -68,8 +68,9 @@ ref-guide-pdf: $(REF_GUIDE_PDF) $(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv -f ref_guide.pdf $(srcdir) + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + test "$(top_srcdir)" == "$(top_builddir)" \ + || mv -f $(builddir)/ref_guide.pdf $(srcdir) # FIXME: Regenerating figures.stamp requires make to go back to the # parent directory. We already do the opposite (descending from diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 3a2c61f..12f52ad 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -66,8 +66,9 @@ tutorial-pdf: $(TUTORIAL_PDF) $(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv -f tutorial.pdf $(srcdir) + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + test "$(top_srcdir)" == "$(top_builddir)" \ + || mv -f tutorial.pdf $(srcdir) # FIXME: Regenerating figures.stamp requires make to go back to the # parent directory. We already do the opposite (descending from diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index 5901d0e..66b42cb 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -75,8 +75,9 @@ white-paper-pdf: $(WHITE_PAPER_PDF) $(WHITE_PAPER_PDF): white_paper.tex $(PNGS) TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< - TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv -f white_paper.pdf $(srcdir) + TEXINPUTS=$(TEXINPUTS) pdflatex $< \ + test "$(top_srcdir)" == "$(top_builddir)" \ + || mv -f white_paper.pdf $(srcdir) dist_doc_DATA = \ -- 1.5.6.5

1 0

4284: Fix documentation generation.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* doc/examples/Makefile.am: Check if directory exists before creating it. * doc/white_paper/Makefile.am, * doc/ref_guide/Makefile.am: Do not move output file. It is already created in the source directory. * doc/tutorial/Makefile.am: Fix missing 'mv -f' command and do not move html output since it is already created in the source directory. --- milena/ChangeLog | 15 +++++++++++++++ milena/doc/examples/Makefile.am | 3 ++- milena/doc/ref_guide/Makefile.am | 3 +-- milena/doc/tutorial/Makefile.am | 5 ++--- milena/doc/white_paper/Makefile.am | 5 ++--- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 17453d8..287e058 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix documentation generation. + + * doc/examples/Makefile.am: Check if directory exists before + creating it. + + * doc/white_paper/Makefile.am, + * doc/ref_guide/Makefile.am: Do not move output file. It is + already created in the source directory. + + * doc/tutorial/Makefile.am: Fix missing 'mv -f' command and do not + move html output since it is already created in the source + directory. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix data-regen rule in documentation. * doc/examples/Makefile.am: fix 'data-regen' rule. diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index e0d14bc..843c6b3 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -143,7 +143,8 @@ tuto4_point2d_SOURCES = tuto4/point2d.cc examples: $(EXTRA_PROGRAMS) run-examples: examples - mkdir -p $(top_builddir)/milena/doc/figures; \ + test -d $(top_builddir)/milena/doc/figures \ + || mkdir $(top_builddir)/milena/doc/figures; \ @failcom='exit 1'; \ list='$(EXTRA_PROGRAMS)'; for bin in $$list; do \ echo "Running $$bin"; \ diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index f13074f..31a5abb 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -59,8 +59,7 @@ REF_GUIDE_HH = $(srcdir)/ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) $(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) \ - && mv -f ref_guide.hh $(srcdir) + $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) # Final product. diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 5cd7464..3a2c61f 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -58,8 +58,7 @@ TUTORIAL_HH = $(srcdir)/tutorial.hh tutorial-html: $(TUTORIAL_HH) $(TUTORIAL_HH): tutorial.tex $(srcdir)/../figures.stamp $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) \ - && mv tutorial.hh $(srcdir) + $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) # Final product. TUTORIAL_PDF = $(srcdir)/tutorial.pdf @@ -68,7 +67,7 @@ $(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && tutorial.pdf $(srcdir) + && mv -f tutorial.pdf $(srcdir) # FIXME: Regenerating figures.stamp requires make to go back to the # parent directory. We already do the opposite (descending from diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index df0a51b..5901d0e 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -65,10 +65,9 @@ white-paper: white-paper-pdf white-paper-html WHITE_PAPER_HTML = $(srcdir)/white_paper_html/index.html white-paper-html: $(WHITE_PAPER_HTML) $(WHITE_PAPER_HTML): white_paper.tex $(EPSS) - test -d white_paper_html || mkdir white_paper_html + test -d $(srcdir)/white_paper_html || mkdir $(srcdir)/white_paper_html TEXINPUTS=$(TEXINPUTS) hevea -O -fix $< -o $@ $(top_srcdir)/milena/doc/tools/clearbanner.sh $@ - mv -f white_paper_html $(srcdir) WHITE_PAPER_PDF = $(srcdir)/white_paper.pdf @@ -77,7 +76,7 @@ $(WHITE_PAPER_PDF): white_paper.tex $(PNGS) TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv white_paper.pdf $(srcdir) + && mv -f white_paper.pdf $(srcdir) dist_doc_DATA = \ -- 1.5.6.5

1 0

4283: NEWS: Add release date.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

--- ChangeLog | 4 ++++ NEWS | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c596b0..999d8b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-07-13 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * NEWS: Add release date. + +2009-07-13 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new dev tools. * build-aux/check_source_has_test.sh, diff --git a/NEWS b/NEWS index 7401310..9702ab6 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -* Olena 1.0 +* Olena 1.0 July 14, 2009 * The core C++ library, renamed to Milena, has been rewritten from scratch and features numerous additions over the past -- 1.5.6.5

1 0

4282: Fix data-regen rule in documentation.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* doc/examples/Makefile.am: fix 'data-regen' rule. * doc/tools/split_sample.sh: add support for file name suffix. --- milena/ChangeLog | 8 ++++++++ milena/doc/examples/Makefile.am | 9 +++++---- milena/doc/tools/split_sample.sh | 12 ++++++++---- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6ab45c8..17453d8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix data-regen rule in documentation. + + * doc/examples/Makefile.am: fix 'data-regen' rule. + + * doc/tools/split_sample.sh: add support for file name suffix. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Update a tutorial example. * doc/outputs/tuto4_site_set_create.txt, diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index a0d812a..e0d14bc 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -143,8 +143,9 @@ tuto4_point2d_SOURCES = tuto4/point2d.cc examples: $(EXTRA_PROGRAMS) run-examples: examples + mkdir -p $(top_builddir)/milena/doc/figures; \ @failcom='exit 1'; \ - list='$(noinst_PROGRAMS)'; for bin in $$list; do \ + list='$(EXTRA_PROGRAMS)'; for bin in $$list; do \ echo "Running $$bin"; \ ./$$bin > $(OUTPUTS_SRCDIR)/$$bin.txt || eval $$failcom; \ done @@ -241,14 +242,14 @@ fix-refdata: diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ || echo "Updating reference file for $$split_ex"; \ cp $$split_ex $(SPLIT_EXAMPLES_SRCDIR); \ - done; + done; split-examples: test -d $(SPLIT_EXAMPLES_SRCDIR) || mkdir $(SPLIT_EXAMPLES_SRCDIR) @failcom='exit 1'; \ list=`find $(EXAMPLES_SRCDIR) -type f -name '*.cc'`; for file in $$list; do \ - $(DOC_SRCDIR)/tools/split_sample.sh $$file cc $(SPLIT_EXAMPLES_SRCDIR)\ + $(DOC_SRCDIR)/tools/split_sample.sh $$file cc raw $(SPLIT_EXAMPLES_SRCDIR)\ || eval $$failcom; \ done @@ -256,7 +257,7 @@ split-outputs: test -d $(SPLIT_OUTPUTS_SRCDIR) || mkdir $(SPLIT_OUTPUTS_SRCDIR) @failcom='exit 1'; \ list='$(OUTPUTS_SRCDIR)/*.txt'; for file in $$list; do \ - $(DOC_SRCDIR)/tools/split_sample.sh $$file txt $(SPLIT_OUTPUTS_SRCDIR)\ + $(DOC_SRCDIR)/tools/split_sample.sh $$file txt "" $(SPLIT_OUTPUTS_SRCDIR)\ || eval $$failcom; \ done diff --git a/milena/doc/tools/split_sample.sh b/milena/doc/tools/split_sample.sh index 9712f40..aeb5e26 100755 --- a/milena/doc/tools/split_sample.sh +++ b/milena/doc/tools/split_sample.sh @@ -1,23 +1,27 @@ # /bin/sh -if ! [ $# -eq 3 ]; then - echo "Usage: $0 <file1> <file extension> <dst dir>" +if ! [ $# -eq 4 ]; then + echo "Usage: $0 <file1> <file extension> <suffix> <dst dir>" exit 1; fi begins=`grep -n -R '//[[:space:]]*\\\{' $1 | cut -d ':' -f 1` ends=`grep -n -R '//[[:space:]]*\\\}' $1 | cut -d ':' -f 1` +if ! [ -z "$3" ]; then + suffix=".$3" +fi + split=false i=1 for begin in $begins; do partend=$((`echo $ends | cut -d ' ' -f $i` - 1)) subdir=`basename \`dirname $1\`` - out_name="`basename $1 .$2`-$i.$2" + out_name="`basename $1 .$2`-$i.$2$suffix" if [ "$subdir" != "examples" ] && [ "$subdir" != "outputs" ]; then out_name="${subdir}_$out_name" fi - head -n $partend $1 | tail -n $(($partend - $begin)) > "$3/$out_name" + head -n $partend $1 | tail -n $(($partend - $begin)) > "$4/$out_name" i=$((i+1)) split=true done -- 1.5.6.5

1 0

4281: Update a tutorial example.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* doc/outputs/tuto4_site_set_create.txt, * doc/outputs/split/tuto4_site_set_create-1.txt, * doc/outputs/split/tuto4_site_set_create-2.txt, * doc/outputs/split/tuto4_site_set_create-3.txt, * doc/examples/split/tuto4_site_set_create-2.cc.raw, * doc/examples/split/tuto4_site_set_create-3.cc.raw, * doc/examples/split/tuto4_site_set_create-4.cc.raw, * doc/examples/split/tuto4_site_set_create-5.cc.raw: New reference files. * doc/examples/tuto4/site_set_create.cc: Add more sample code. --- milena/ChangeLog | 16 ++++++++++ .../examples/split/tuto4_site_set_create-2.cc.raw | 7 ++-- .../examples/split/tuto4_site_set_create-3.cc.raw | 7 ++-- .../examples/split/tuto4_site_set_create-4.cc.raw | 5 ++- ...ate-4.cc.raw => tuto4_site_set_create-5.cc.raw} | 0 milena/doc/examples/tuto4/site_set_create.cc | 32 +++++++++++++------ .../doc/outputs/split/tuto4_site_set_create-1.txt | 1 + .../doc/outputs/split/tuto4_site_set_create-2.txt | 1 + .../doc/outputs/split/tuto4_site_set_create-3.txt | 1 + milena/doc/outputs/tuto4_site_set_create.txt | 11 ++++-- 10 files changed, 59 insertions(+), 22 deletions(-) copy milena/doc/examples/split/{tuto4_site_set_create-4.cc.raw => tuto4_site_set_create-5.cc.raw} (100%) create mode 100644 milena/doc/outputs/split/tuto4_site_set_create-1.txt create mode 100644 milena/doc/outputs/split/tuto4_site_set_create-2.txt create mode 100644 milena/doc/outputs/split/tuto4_site_set_create-3.txt diff --git a/milena/ChangeLog b/milena/ChangeLog index 37322db..6ab45c8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Update a tutorial example. + + * doc/outputs/tuto4_site_set_create.txt, + * doc/outputs/split/tuto4_site_set_create-1.txt, + * doc/outputs/split/tuto4_site_set_create-2.txt, + * doc/outputs/split/tuto4_site_set_create-3.txt, + * doc/examples/split/tuto4_site_set_create-2.cc.raw, + * doc/examples/split/tuto4_site_set_create-3.cc.raw, + * doc/examples/split/tuto4_site_set_create-4.cc.raw, + * doc/examples/split/tuto4_site_set_create-5.cc.raw: New reference + files. + + * doc/examples/tuto4/site_set_create.cc: Add more sample code. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/geom/rotate.hh: use mln_domain instead of mln_box. 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> diff --git a/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw index 06a04e3..63ceee5 100644 --- a/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw +++ b/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw @@ -1,3 +1,4 @@ - p_array<point2d> arr; - arr.append(point2d(2,2)); - arr.append(point2d(1,2)); + mln_piter_(box2d) p(b); + for_all(p) + std::cout << p << ", "; + std::cout << std::endl; diff --git a/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw index 63ceee5..45970ad 100644 --- a/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw +++ b/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw @@ -1,4 +1,3 @@ - mln_piter_(box2d) p(b); - for_all(p) - std::cout < arr; + arr.append(point2d(2,2)); + arr.append(point2d(1,2)); diff --git a/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw index 1bbf4c0..ccff7e6 100644 --- a/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw +++ b/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw @@ -1 +1,4 @@ - box2d b = make::box2d(-2,-2, 2, 2); + mln_piter_(p_array<point2d>) p(arr); + for_all(p) + std::cout << p << ", "; + std::cout << std::endl; diff --git a/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-5.cc.raw similarity index 100% copy from milena/doc/examples/split/tuto4_site_set_create-4.cc.raw copy to milena/doc/examples/split/tuto4_site_set_create-5.cc.raw diff --git a/milena/doc/examples/tuto4/site_set_create.cc b/milena/doc/examples/tuto4/site_set_create.cc index 8c80c2e..8f0e5fe 100644 --- a/milena/doc/examples/tuto4/site_set_create.cc +++ b/milena/doc/examples/tuto4/site_set_create.cc @@ -10,31 +10,43 @@ int main() box2d b(4,4); // \} - // \{ - p_array<point2d> arr; - arr.append(point2d(2,2)); - arr.append(point2d(1,2)); - // \} - - std::cout << "\\{" << std::endl; + std::cout << "// \\{" << std::endl; // \{ mln_piter_(box2d) p(b); for_all(p) std::cout < arr; + arr.append(point2d(2,2)); + arr.append(point2d(1,2)); + // \} + + std::cout << "// \\{" << std::endl; + // \{ + mln_piter_(p_array<point2d>) p(arr); + for_all(p) + std::cout << p << ", "; + std::cout << std::endl; + // \} + std::cout << "// \\}" << std::endl; + } { // \{ box2d b = make::box2d(-2,-2, 2, 2); // \} - std::cout << "\\{" << std::endl; + std::cout << "// \\{" << std::endl; mln_piter_(box2d) p(b); for_all(p) std::cout << p << ", "; std::cout << std::endl; - std::cout << "\\}" << std::endl; + std::cout << "// \\}" << std::endl; } } diff --git a/milena/doc/outputs/split/tuto4_site_set_create-1.txt b/milena/doc/outputs/split/tuto4_site_set_create-1.txt new file mode 100644 index 0000000..915e60e --- /dev/null +++ b/milena/doc/outputs/split/tuto4_site_set_create-1.txt @@ -0,0 +1 @@ +(0,0), (0,1), (0,2), (0,3), (1,0), (1,1), (1,2), (1,3), (2,0), (2,1), (2,2), (2,3), (3,0), (3,1), (3,2), (3,3), diff --git a/milena/doc/outputs/split/tuto4_site_set_create-2.txt b/milena/doc/outputs/split/tuto4_site_set_create-2.txt new file mode 100644 index 0000000..ad9805f --- /dev/null +++ b/milena/doc/outputs/split/tuto4_site_set_create-2.txt @@ -0,0 +1 @@ +(2,2), (1,2), diff --git a/milena/doc/outputs/split/tuto4_site_set_create-3.txt b/milena/doc/outputs/split/tuto4_site_set_create-3.txt new file mode 100644 index 0000000..ecb9a3b --- /dev/null +++ b/milena/doc/outputs/split/tuto4_site_set_create-3.txt @@ -0,0 +1 @@ +(-2,-2), (-2,-1), (-2,0), (-2,1), (-2,2), (-1,-2), (-1,-1), (-1,0), (-1,1), (-1,2), (0,-2), (0,-1), (0,0), (0,1), (0,2), (1,-2), (1,-1), (1,0), (1,1), (1,2), (2,-2), (2,-1), (2,0), (2,1), (2,2), diff --git a/milena/doc/outputs/tuto4_site_set_create.txt b/milena/doc/outputs/tuto4_site_set_create.txt index 1cfac41..c711d72 100644 --- a/milena/doc/outputs/tuto4_site_set_create.txt +++ b/milena/doc/outputs/tuto4_site_set_create.txt @@ -1,6 +1,9 @@ -\{ +// \{ (0,0), (0,1), (0,2), (0,3), (1,0), (1,1), (1,2), (1,3), (2,0), (2,1), (2,2), (2,3), (3,0), (3,1), (3,2), (3,3), -\} -\{ +// \} +// \{ +(2,2), (1,2), +// \} +// \{ (-2,-2), (-2,-1), (-2,0), (-2,1), (-2,2), (-1,-2), (-1,-1), (-1,0), (-1,1), (-1,2), (0,-2), (0,-1), (0,0), (0,1), (0,2), (1,-2), (1,-1), (1,0), (1,1), (1,2), (2,-2), (2,-1), (2,0), (2,1), (2,2), -\} +// \} -- 1.5.6.5

1 0

4280: mln/geom/rotate.hh: use mln_domain instead of mln_box.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

--- milena/ChangeLog | 4 ++++ milena/mln/geom/rotate.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 40e09ce..37322db 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/geom/rotate.hh: use mln_domain instead of mln_box. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Add missing headers to doc examples. * doc/examples/tuto2_first_image.cc, diff --git a/milena/mln/geom/rotate.hh b/milena/mln/geom/rotate.hh index 6cb6773..87cc94c 100644 --- a/milena/mln/geom/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -168,8 +168,8 @@ namespace mln // Old versions of GCC (including Apple GCC 4.0.1) do not parse // correctly `mln_box(I)()'. Hence, we need to typedef // `mln_box(I)' first. - typedef mln_box(I) box_t; - return rotate(input, angle, extension, box_t()); + typedef mln_domain(I) domain_t; + return rotate(input, angle, extension, domain_t()); } -- 1.5.6.5

1 0

4279: Add missing headers to doc examples.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* milena/doc/examples/tuto2_first_image.cc, * milena/doc/examples/tuto3_rw_image.cc, * milena/doc/examples/tuto4_genericity_and_algorithms.cc: Add copyright headers. --- milena/ChangeLog | 9 ++++++ milena/doc/examples/tuto2_first_image.cc | 27 ++++++++++++++++++++ milena/doc/examples/tuto3_rw_image.cc | 27 ++++++++++++++++++++ .../examples/tuto4_genericity_and_algorithms.cc | 27 ++++++++++++++++++++ 4 files changed, 90 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 030398e..40e09ce 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Add missing headers to doc examples. + + * doc/examples/tuto2_first_image.cc, + * doc/examples/tuto3_rw_image.cc, + * doc/examples/tuto4_genericity_and_algorithms.cc: Add + copyright headers. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * tests/tools/pretty_check.sh: Correctly grep XFAIL and FAIL tests output. diff --git a/milena/doc/examples/tuto2_first_image.cc b/milena/doc/examples/tuto2_first_image.cc index 7515a8e..7b4cee7 100644 --- a/milena/doc/examples/tuto2_first_image.cc +++ b/milena/doc/examples/tuto2_first_image.cc @@ -1,3 +1,30 @@ +// 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 + #include <mln/core/image/image2d.hh> #include <mln/make/image.hh> #include <mln/debug/println.hh> diff --git a/milena/doc/examples/tuto3_rw_image.cc b/milena/doc/examples/tuto3_rw_image.cc index 7bc10d8..14ba056 100644 --- a/milena/doc/examples/tuto3_rw_image.cc +++ b/milena/doc/examples/tuto3_rw_image.cc @@ -1,3 +1,30 @@ +// 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 + #include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <mln/data/fill.hh> diff --git a/milena/doc/examples/tuto4_genericity_and_algorithms.cc b/milena/doc/examples/tuto4_genericity_and_algorithms.cc index 2fd1413..b906a60 100644 --- a/milena/doc/examples/tuto4_genericity_and_algorithms.cc +++ b/milena/doc/examples/tuto4_genericity_and_algorithms.cc @@ -1,3 +1,30 @@ +// 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 + #include <mln/core/image/image2d.hh> #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/duplicate.hh> -- 1.5.6.5

1 0

4278: tests/tools/pretty_check.sh: Correctly grep XFAIL and FAIL tests output.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

--- milena/ChangeLog | 5 +++++ milena/tests/tools/pretty_check.sh | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7fe6681..030398e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + * tests/tools/pretty_check.sh: Correctly grep XFAIL and FAIL tests + output. + 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> Do not use Doxygen-style comments within an implementation. diff --git a/milena/tests/tools/pretty_check.sh b/milena/tests/tools/pretty_check.sh index a13fc62..9ba1635 100755 --- a/milena/tests/tools/pretty_check.sh +++ b/milena/tests/tools/pretty_check.sh @@ -1,18 +1,18 @@ #!/bin/sh # 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/>. @@ -90,7 +90,7 @@ fi if [ -z "$TEST_CXX" ]; then TEST_CXX="$CXX" fi - + gcc_wrapper="$PWD/$output_directory/gcc-wrapper.sh" cleanup_last_results() @@ -140,7 +140,7 @@ end_tmp_files() { local ef="error_entry_html.tmp" local wf="warning_entry_html.tmp" - close_dir_entry $ef + close_dir_entry $ef close_dir_entry $wf echo "</ol> " >> $ef echo "</ol> " >> $wf @@ -178,7 +178,7 @@ open_dir() </table> EOF - + } close_dir() @@ -384,7 +384,7 @@ main() # failed during execution. if [ "$status" == "FAIL" ] || [ "$status" == "XFAIL" ]; then - grep -B 2 ": $name\$" $check_log | head -n 1 > "$dir/$name.log" + grep -B 1 "X*FAIL: $name\$" $check_log | head -n 1 > "$dir/$name.log" error_entry $name $bdir error $status error_node $name $log "./$name" "$dir/$name" $bdir error $status fi @@ -417,11 +417,11 @@ main() fi done done - + # Build pretty output. end_tmp_files make_output_file - + # Cleanup temporary files. cleanup_tmp_files cleanup_gcc_wrapper -- 1.5.6.5

1 0