https://svn.lrde.epita.fr/svn/oln/trunk/milena
Index: ChangeLog
from Nicolas Ballas <ballas(a)lrde.epita.fr>
Update documentation about image types and properties.
* sandbox/ballas/doc/image_tours.txt: add the morpher types.
* sandbox/ballas/doc/draft.txt: update.
draft.txt | 10 ++++++
image_tours.txt | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 86 insertions(+), 9 deletions(-)
Index: sandbox/ballas/doc/image_tours.txt
--- sandbox/ballas/doc/image_tours.txt (revision 1864)
+++ sandbox/ballas/doc/image_tours.txt (working copy)
@@ -432,20 +432,87 @@
No change in the property.
+FIXME: Is there any property define for these types?
+
+**** decorated_image
+ templated image: I (image), D (decorator).
+Image that can have additional features.
+
+
+**** plain
+ Prevent an image from sharing data.
+
+**** safe
+ Make an image accessible at undefined location.
+
+
+**** interpolated
+ Make an image readable with float coordinates.
+
+**** neigh::image
+ Add a neighbohood to an image.
+
+Changed properties:
+category -> morpher
+neighb -> some
+
+
*** Domain morpher
-*** Value morpher
+**** sub_image
+
+Make image restricted to a given pset.
+
+Changed Properties:
+ category -> domain_morpher
+ border -> none
-*** Image_if
+**** hexa
-???
+ Make an hexagonal Mesh of the image.
+(work only with 2D image).
+
+Changed Properties:
+ category -> domain_morpher
+ grid -> regular
+
+**** Image_if
+ Parameter I, F
+ Make an image which has its domain restricted to a function.
+
+Changed Properties:
+ category -> domain_morpher
+ io -> read_only if I is cont, trait::image_<I>::io otherwise
+ data -> if the data property of I is linear then stored (FIXME why?)
+ else like I
+
+
+
+**** Image_if_interval
+ Image which domain is restricted by an interval
+
+Changed Property:
+ Same as image_if
+
+
+
+**** translate
+ Translate an Image with a delta point.
+Changed Property:
+ category -> domain_morpher_category.
+
+*** Value morpher
+**** cast_image
+Make the user see the same image but with another data type.
+Changed properties:
+ io -> read_only
+**** value::stack_image
+ Represent a Stack of image.
-Note:
-The different grid (retrieve from point_ class):
- - tick,
- - square,
- - hexa,
- - cube
+Changed properties:
+ category -> value_morpher
+ value -> value::vectorial
+ speed -> fast
Index: sandbox/ballas/doc/draft.txt
--- sandbox/ballas/doc/draft.txt (revision 1864)
+++ sandbox/ballas/doc/draft.txt (working copy)
@@ -315,6 +315,16 @@
the value.
We can access directly to the value of an image image.value
+ values_access: none,
+ random,
+ browsing
+
+ values_io: read,
+ write,
+ read_only < read,// This is dummy
+ write_only < write,
+ read_write < both read'n write
+
https://svn.lrde.epita.fr/svn/oln/trunk
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
More on CXXFLAGS in configure.ac.
* configure.ac (TESTS_CXXFLAGS_SPEED): New variable.
(TOOLS_CXXFLAGS): Append `-Wall -W'.
configure.ac | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
Index: configure.ac
--- configure.ac (revision 1861)
+++ configure.ac (working copy)
@@ -33,23 +33,32 @@
AC_LANG([C++])
AC_PROG_CXX
-# Speed the compilation up.
+# Speed up compiling times.
if test "$GXX" = yes; then
CXXFLAGS="$CXXFLAGS -pipe"
fi
# C++ compiler flags for tests.
AC_ARG_VAR([TESTS_CXXFLAGS])
-# We want no optimization for the tests (too slow), and a lot of debugging.
+# We want no optimization for the tests (it slows down compiling
+# times), and a lot of debugging.
if test "$GXX" = yes && test -z "$TESTS_CXXFLAGS"; then
TESTS_CXXFLAGS="-O0 -ggdb -Wall -W"
fi
+# C++ compiler flags for complex tests.
+AC_ARG_VAR([TESTS_CXXFLAGS_SPEED])
+# We want optimization for complex tests, and keep debugging flags
+# (still useful).
+if test "$GXX" = yes && test -z "$TESTS_CXXFLAGS_SPEED"; then
+ TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -ggdb -Wall -W"
+fi
+
# C++ compiler flags for tools.
AC_ARG_VAR([TOOLS_CXXFLAGS])
# On the contrary, we want fast binaries for tools.
if test "$GXX" = yes && test -z "$TOOLS_CXXFLAGS"; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb"
+ TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb -Wall -W"
fi
https://svn.lrde.epita.fr/svn/oln/trunk
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Add a test on regular neighborhoods.
* milena/tests/core/neighb.cc: New.
* milena/tests/core/Makefile.am (check_PROGRAMS): Add neighb.
(neighb_SOURCES): New.
Makefile.am | 2 ++
neighb.cc | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
Index: milena/tests/core/neighb.cc
--- milena/tests/core/neighb.cc (revision 0)
+++ milena/tests/core/neighb.cc (revision 0)
@@ -0,0 +1,58 @@
+// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE)
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// 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
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library 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 tests/core/neighb.cc
+/// \brief Tests on mln::neighb<D> specializations.
+
+#include <mln/core/neighb1d.hh>
+#include <mln/core/neighb2d.hh>
+#include <mln/core/neighb3d.hh>
+
+using namespace mln;
+
+template <typename N>
+void test(const Neighborhood<N>& nbh, const mln_point(N)& p_ref,
+ unsigned size)
+{
+ mln_niter(N) n(nbh, p_ref);
+ unsigned i = 0;
+ for_all(n)
+ ++i;
+ mln_assertion(i == size);
+}
+
+int main()
+{
+ test(c2(), make::point1d(0), 2);
+
+ test(c4(), make::point2d(0, 0), 4);
+ test(c8(), make::point2d(0, 0), 8);
+
+ test( c6(), make::point3d(0, 0, 0), 6);
+ test(c18(), make::point3d(0, 0, 0), 18);
+ test(c26(), make::point3d(0, 0, 0), 26);
+}
Index: milena/tests/core/Makefile.am
--- milena/tests/core/Makefile.am (revision 1860)
+++ milena/tests/core/Makefile.am (working copy)
@@ -17,6 +17,7 @@
line_graph_image_wst \
mono_obased_rle_image \
mono_rle_image \
+ neighb \
obased_rle_image \
p_priority_queue \
p_priority_queue_fast \
@@ -44,6 +45,7 @@
line_graph_image_wst_SOURCES = line_graph_image_wst.cc
mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc
mono_rle_image_SOURCES = mono_rle_image.cc
+neighb_SOURCES = neighb.cc
obased_rle_image_SOURCES = obased_rle_image.cc
p_priority_queue_SOURCES = p_priority_queue.cc
p_priority_queue_fast_SOURCES = p_priority_queue_fast.cc