Olena-patches February 2005

olena-patches@lrde.epita.fr

4 participants
14 discussions

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * oln/makefile.src: Add new files. * oln/io/write_image_2d_pnm.hh: New. pgm output method for 2D images. * oln/io/read_image_2d_pnm.hh: Handle mlc::box correctly. * oln/io/write_image.hh: New. Dispatch for output methods. * oln/io/read_image.hh: Handle mlc::box correctly.. * oln/io/utils.hh: Add pnm_write_header function. io/read_image.hh | 30 +++++++++++ io/read_image_2d_pnm.hh | 20 +++++-- io/utils.hh | 32 ++++++++++++ io/write_image.hh | 63 ++++++++++++++++++++++++ io/write_image_2d_pnm.hh | 119 +++++++++++++++++++++++++++++++++++++++++++++++ makefile.src | 5 + 6 files changed, 260 insertions(+), 9 deletions(-) Index: oln/makefile.src --- oln/makefile.src (revision 40) +++ oln/makefile.src (working copy) @@ -30,6 +30,7 @@ core/abstract/image_with_data.hh \ core/abstract/images.hh \ core/abstract/internal/image_impl.hh \ + core/abstract/op.hh \ core/abstract/piter.hh \ core/abstract/point.hh \ core/abstract/size.hh \ @@ -43,4 +44,6 @@ fancy/print.hh \ io/read_image.hh \ io/read_image_2d_pnm.hh \ - io/utils.hh + io/utils.hh \ + io/write_image.hh \ + io/write_image_2d_pnm.hh Index: oln/io/write_image_2d_pnm.hh --- oln/io/write_image_2d_pnm.hh (revision 0) +++ oln/io/write_image_2d_pnm.hh (revision 0) @@ -0,0 +1,119 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + + +#ifndef OLN_IO_WRITE_IMAGE_2D_PNM_HH +# define OLN_IO_WRITE_IMAGE_2D_PNM_HH + +# include <iostream> +# include <string> + +# include <mlc/box.hh> + +# include <ntg/core/macros.hh> +# include <ntg/real/int_u8.hh> +# include <ntg/real/integer.hh> +# include <ntg/enum/enum.hh> +# include <ntg/color/color.hh> + +# include <oln/core/2d/image2d.hh> +# include <oln/core/macros.hh> +# include <oln/core/abstract/op.hh> + +# include <oln/io/utils.hh> + +namespace oln { + + namespace io { + + namespace impl { + + template <typename I> + struct write_image_2d_pgm_raw + : public oln::abstract::void_op<write_image_2d_pgm_raw<I> > + { + typedef oln_value_type(I) value_type; + typedef typename mlc::traits<value_type>::encoding_type out_type; + + const I& to_write_; + std::ofstream& ostr_; + + write_image_2d_pgm_raw(const I& to_write, std::ofstream& ostr): + to_write_(to_write), + ostr_(ostr) + {} + + void impl_run() + { + point2d p; + out_type c; + + for (p.row() = 0; p.row() < to_write_.size().nrows(); ++p.row()) + for (p.col() = 0; p.col() < to_write_.size().ncols(); ++p.col()) + { + c = to_write_[p]; + ostr_ << c; + } + ostr_.close(); + } + + }; + + template <typename I, typename T> + void write(const abstract::image2d<I>& to_write, + const ntg::integer<T>&, + const std::string& name, + const std::string& ext) + { + std::ofstream ostr; + point2d p; + size2d s = to_write.size(); + + if (ext == "pgm") + if (internal::write_pnm_header(ostr, name, "P5", + s.ncols(), s.nrows(), + ntg_max_val(T))) + { + write_image_2d_pgm_raw<I> tmp(to_write.exact(), ostr); + tmp.run(); + } + else + std::cerr << "error: unable to write header" << std::endl; + else + std::cerr << "error: image data type (`integer') does not match" + << " file extension (`" << ext << "')" << std::endl; + } + + } + + } + +} + + + +#endif // ! OLN_IO_WRITE_IMAGE_2D_PNM_HH Index: oln/io/read_image_2d_pnm.hh --- oln/io/read_image_2d_pnm.hh (revision 40) +++ oln/io/read_image_2d_pnm.hh (working copy) @@ -48,6 +48,12 @@ typedef oln_value_type(I) value_type; typedef typename mlc::traits<value_type>::encoding_type encoding_type; + read_image_2d_pgm_raw<I>& output(I& output) + { + output = *image_; + return *this; + } + void impl_run() { encoding_type c; @@ -58,7 +64,6 @@ << std::endl; return; } - c =c ; point2d p; oln::image2d<value_type> tmp(info_.rows, info_.cols); @@ -74,7 +79,7 @@ } istr_.close(); *image_ = tmp; - + std::cout << "debug : size = " << image_->size() << std::endl; } }; @@ -94,21 +99,24 @@ { read_image_2d_pgm_raw<I> tmp(ima.exact(), istr, info); tmp.run(); + tmp.output(ima.exact()); } else if (info.type == "P2") - std::cerr << "read_image_2d_pgm_ascii not implemented" + std::cerr << "error: read_image_2d_pgm_ascii not implemented" << std::endl; else - std::cerr << "file header (`" << info.type + std::cerr << "error: file header (`" << info.type << "') does not match file extension (`" << ext << "')" << std::endl; else - std::cerr << "image data type (`integer') does not match" + std::cerr << "error: image data type (`integer') does not match" << " file extension (`" << ext << "')" << std::endl; else - std::cerr << "bad header" << std::endl; + std::cerr << "error: unable to get a valid header" << std::endl; + std::cout << "debug : size = " << ima.size() << std::endl; + } template <typename I, typename T> Index: oln/io/write_image.hh --- oln/io/write_image.hh (revision 0) +++ oln/io/write_image.hh (revision 0) @@ -0,0 +1,63 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef OLN_IO_WRITE_IMAGE_HH +# define OLN_IO_WRITE_IMAGE_HH + +# include <string> + +# include <oln/io/utils.hh> +# include <oln/io/write_image_2d_pnm.hh> + +namespace oln { + + namespace io { + + template <typename E> + void write(const abstract::image<E>& im, const std::string& name) + { + std::string ext; + oln_value_type(E) t; + + ext = internal::utils::extension(name); + + if (ext == "pgm" || + ext == "ppm" || + ext == "pbm") + impl::write(im.exact(), t, name, ext); + else + std::cerr << "error: output method for '" + << name.c_str() + << "' not implemented" + << std::endl; + } + + } + +} + +#endif // ! OLN_IO_WRITE_IMAGE_HH Index: oln/io/read_image.hh --- oln/io/read_image.hh (revision 40) +++ oln/io/read_image.hh (working copy) @@ -1,3 +1,30 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + #ifndef OLN_IO_READ_IMAGE_HH # define OLN_IO_READ_IMAGE_HH @@ -13,7 +40,6 @@ namespace oln { - namespace io { struct filename @@ -51,7 +77,7 @@ { std::cout << "input method for '" << name.get() - << "' not implemented yet" + << "' not implemented" << std::endl; } Index: oln/io/utils.hh --- oln/io/utils.hh (revision 40) +++ oln/io/utils.hh (working copy) @@ -137,6 +137,38 @@ return true; } + bool write_pnm_header(std::ofstream& ostr, + const std::string& name, + const std::string& type, + int ncols, + int nrows, + int max_val) + { + if (max_val > 65535) + { + std::cerr << "error: can't save " << name + << ", data type too large" + << std::endl; + return false; + } + + ostr.open(name.c_str(), std::ofstream::out); + + if (ostr.is_open() == false) + { + std::cerr << "error: couldn't open " << name << std::endl; + return false; + } + + + ostr << "P5" << std::endl + << "# Olena 1.0" << std::endl + << ncols << " " << nrows << std::endl + << max_val << std::endl; + return true; + } + + } // end of namespace internal } // end of namespace io

19 years, 1 month

proto-1.0 40: Add pgm i/o for image2d

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * oln/makefile.src: Add new files. * oln/io: New. * oln/io/read_image_2d_pnm.hh: New. 2D image pnm i/o (only raw pgm at the moment). * oln/io/read_image.hh: New. Abstract input routine. * oln/io/utils.hh: New. Tools for i/o manipulations. * oln/core/abstract/op.hh: New. Algorithms abstract class. core/abstract/op.hh | 75 ++++++++++++++++++++++++ io/read_image.hh | 64 +++++++++++++++++++++ io/read_image_2d_pnm.hh | 140 ++++++++++++++++++++++++++++++++++++++++++++++ io/utils.hh | 146 ++++++++++++++++++++++++++++++++++++++++++++++++ makefile.src | 10 +-- 5 files changed, 430 insertions(+), 5 deletions(-) Index: oln/makefile.src --- oln/makefile.src (revision 37) +++ oln/makefile.src (working copy) @@ -26,21 +26,21 @@ core/abstract/data_storage.hh \ core/abstract/image.hh \ core/abstract/image_constness.hh \ + core/abstract/image_identity.hh \ core/abstract/image_with_data.hh \ core/abstract/images.hh \ core/abstract/internal/image_impl.hh \ - core/abstract/morpher.hh \ core/abstract/piter.hh \ core/abstract/point.hh \ core/abstract/size.hh \ core/cats.hh \ core/coord.hh \ core/macros.hh \ - core/id_morpher.hh \ core/props.hh \ core/tags.hh \ core/value_box.hh \ fancy/iota.hh \ - fancy/print.hh - - + fancy/print.hh \ + io/read_image.hh \ + io/read_image_2d_pnm.hh \ + io/utils.hh Index: oln/io/read_image_2d_pnm.hh --- oln/io/read_image_2d_pnm.hh (revision 0) +++ oln/io/read_image_2d_pnm.hh (revision 0) @@ -0,0 +1,140 @@ +#ifndef OLN_IO_READ_IMAGE_2D_PNM_HH +# define OLN_IO_READ_IMAGE_2D_PNM_HH + +# include <iostream> +# include <string> + +# include <mlc/box.hh> + +# include <ntg/core/macros.hh> +# include <ntg/real/int_u8.hh> +# include <ntg/real/integer.hh> +# include <ntg/enum/enum.hh> +# include <ntg/color/color.hh> + +# include <oln/core/2d/image2d.hh> +# include <oln/core/macros.hh> +# include <oln/core/abstract/op.hh> + +# include <oln/io/utils.hh> + + +namespace oln { + + template <typename I> + struct image2d; + + namespace io { + + namespace impl { + + + template <typename I> + struct read_image_2d_pgm_raw: + oln::abstract::void_op<read_image_2d_pgm_raw<I> > + { + mlc::box<I> image_; + std::ifstream& istr_; + internal::pnm_info& info_; + + read_image_2d_pgm_raw(I& image, + std::ifstream &istr, + internal::pnm_info &info) : + image_(image), + istr_(istr), + info_(info) + {} + + typedef oln_value_type(I) value_type; + typedef typename mlc::traits<value_type>::encoding_type encoding_type; + + void impl_run() + { + encoding_type c; + + if (info_.max_val > ntg_max_val(value_type)) + { + std::cerr << "Can't load image, data type is not large enough" + << std::endl; + return; + } + c =c ; + point2d p; + oln::image2d<value_type> tmp(info_.rows, info_.cols); + + std::cout << info_.cols << "," << info_.rows << "," + << info_.max_val << std::endl; + + + for (p.row() = 0; p.row() < info_.rows && !istr_.eof(); ++p.row()) + for (p.col() = 0; p.col() < info_.cols && !istr_.eof(); ++p.col()) + { + istr_.read(&c, sizeof (encoding_type)); + tmp[p] = c; + } + istr_.close(); + *image_ = tmp; + + } + }; + + + template <typename I, typename T> + void read(abstract::image2d<I>& ima, + const ntg::integer<T>&, + const std::string& filename, + const std::string& ext) + { + std::ifstream istr; + internal::pnm_info info; + + if (internal::read_pnm_header(istr, info, filename)) + if (ext == "pgm") + if (info.type == "P5") + { + read_image_2d_pgm_raw<I> tmp(ima.exact(), istr, info); + tmp.run(); + } + else + if (info.type == "P2") + std::cerr << "read_image_2d_pgm_ascii not implemented" + << std::endl; + else + std::cerr << "file header (`" << info.type + << "') does not match file extension (`" + << ext << "')" << std::endl; + else + std::cerr << "image data type (`integer') does not match" + << " file extension (`" << ext << "')" << std::endl; + else + std::cerr << "bad header" << std::endl; + + } + + template <typename I, typename T> + void read(abstract::image2d<I>& ima, + const ntg::color<T>&, + const std::string& filename, + const std::string& ext) + { + std::cout << "read for image2d<color>" << std::endl; + } + + template <typename I, typename T> + void read(abstract::image2d<I>& ima, + const ntg::enum_value<T>&, + const std::string& filename, + const std::string& ext) + { + std::cout << "read for image2d<enum>" << std::endl; + } + + + } + + } + +} + + +#endif // ! OLN_IO_READ_IMAGE_2D_PNM_HH Index: oln/io/read_image.hh --- oln/io/read_image.hh (revision 0) +++ oln/io/read_image.hh (revision 0) @@ -0,0 +1,64 @@ +#ifndef OLN_IO_READ_IMAGE_HH +# define OLN_IO_READ_IMAGE_HH + +# include <iostream> +# include <string> + +# include <mlc/box.hh> + +# include <oln/core/macros.hh> + +# include <oln/io/read_image_2d_pnm.hh> +# include <oln/io/utils.hh> + +namespace oln { + + + namespace io { + + struct filename + { + explicit filename(const std::string& str) : + str_(str) + {} + const std::string& get() const + { + return str_; + } + private: + std::string str_; + }; + + filename read(const std::string& str) + { + filename tmp(str); + return tmp; + } + + template <typename I> + void do_read(abstract::image<I>& ima, const filename& name) + { + std::string ext; + const oln_value_type(I) t; + + ext = internal::utils::extension(name.get()); + + if (ext == "pgm" || + ext == "pbm" || + ext == "ppm") + impl::read(ima.exact(), t, name.get(), ext); + else + { + std::cout << "input method for '" + << name.get() + << "' not implemented yet" + << std::endl; + } + + } + + } + +} + +#endif // ! OLN_IO_READ_IMAGE_HH Index: oln/io/utils.hh --- oln/io/utils.hh (revision 0) +++ oln/io/utils.hh (revision 0) @@ -0,0 +1,146 @@ +// Copyright (C) 2001, 2002, 2003, 2004, 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef OLENA_IO_UTILS_HH +# define OLENA_IO_UTILS_HH + +# include <oln/config/system.hh> + +# include <iostream> +# include <fstream> +# include <string> + +namespace oln { + + namespace io { + + namespace internal { + + /*! + ** \brief Utils for io (get extension of a file). + */ + struct utils + { + + /*! + ** \brief Return the extension of a filename. + ** \arg name The filename. + ** \return The extension (lower case). + */ + static std::string + extension(const std::string& name) + { + std::string ext; + int pos = name.rfind('.'); + if (pos > 0) + { + ext.assign(name, pos + 1, name.size() - pos); + for (std::string::iterator i = ext.begin(); i != ext.end(); ++i) + *i = tolower(*i); + } + return ext; + } + + }; + + + struct pnm_info + { + int max_val; + int rows; + int cols; + std::string type; + }; + + bool read_pnm_header(std::ifstream& istr, + internal::pnm_info& info, + const std::string& name) + { + istr.open(name.c_str(), std::ifstream::in); + + if (!istr.is_open()) + return false; + + std::getline(istr, info.type); + + // skip comments + while (istr.peek() == '#') + { + std::string line; + std::getline(istr, line); + } + + // read size + istr >> info.cols; + // skip comments + while (istr.peek() == '#') + { + std::string line; + std::getline(istr, line); + } + + + istr >> info.rows; + // skip comments + while (istr.peek() == '#') + { + std::string line; + std::getline(istr, line); + } + + if (info.cols <= 0 || info.rows <= 0) return false; + + // skip comments + while (istr.peek() == '#') + { + std::string line; + std::getline(istr, line); + } + + + // FIXME: it can be either '\n', 'whitespace', ..., not only '\n'! + + // extract or skip maxvalue + if (istr.get() != '\n') return false; + if (info.type != "P1" && info.type != "P4") + { + istr >> info.max_val; + if (info.max_val > 65535 || + istr.get() != '\n' || + info.max_val <= 0) + return false; + } + return true; + } + + } // end of namespace internal + + } // end of namespace io + +} // end of namespace oln + +#endif // ! OLENA_IO_UTILS_HH Index: oln/core/abstract/op.hh --- oln/core/abstract/op.hh (revision 0) +++ oln/core/abstract/op.hh (revision 0) @@ -0,0 +1,75 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef OLENA_CORE_ABSTRACT_OP_HH +# define OLENA_CORE_ABSTRACT_OP_HH + +# include <oln/core/abstract/image_identity.hh> + +namespace oln { + + namespace abstract { + + template <typename I, typename E> + struct op : public oln::abstract::image_identity<I, E> + { + typedef oln::abstract::image_identity<I, E> super_type; + + op(I& ref): super_type(ref) + { + this->exact_ptr = (E*)(void*)(this); + } + + op() {} + + void run() + { + impl_run(); + } + virtual void impl_run() + { + std::cerr << "oops (nothing)" << std::endl; + } + }; + + + template <typename E> + struct void_op : public mlc::any<E> + { + void_op() {} + + void run() + { + this->exact().impl_run(); + } + }; + + } + +} + +#endif // ! OLENA_CORE_ABSTRACT_OP_HH

19 years, 1 month

proto-1.0 39: Fix on revision 38

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * mlc/any.hh: Fix. any.hh | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) Index: mlc/any.hh --- mlc/any.hh (revision 38) +++ mlc/any.hh (working copy) @@ -1,4 +1,3 @@ -vcs: warn: unknown method cat! // Copyright (C) 2001, 2002, 2003, 2004, 2005 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free @@ -30,7 +29,7 @@ #ifndef METALIC_ANY_HH # define METALIC_ANY_HH -# include <contract.hh> +# include <mlc/contract.hh> // abbrev

19 years, 1 month

proto-1.0 38: Add empty constructor to mlc::box

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * mlc/any.hh: Add missing header inclusion. * mlc/box.hh: Add empty constructor for mlc::box. any.hh | 9 +++++---- box.hh | 6 +++++- 2 files changed, 10 insertions(+), 5 deletions(-) Index: mlc/any.hh --- mlc/any.hh (revision 37) +++ mlc/any.hh (working copy) @@ -1,3 +1,4 @@ +vcs: warn: unknown method cat! // Copyright (C) 2001, 2002, 2003, 2004, 2005 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free @@ -29,9 +30,9 @@ #ifndef METALIC_ANY_HH # define METALIC_ANY_HH +# include <contract.hh> - // abbrev #define any_mem(E) any <E, dispatch_policy::best_memory> @@ -70,7 +71,7 @@ precondition(exact_ptr != 0); return *exact_ptr; } - + /// Assignment (op=). any& operator=(const any& rhs) @@ -118,11 +119,11 @@ const E& exact() const { return *(const E*)((const char*)this - exact_offset); } - + static const int exact_offset; static const E exact_obj; static const any_mem(E)& ref_exact_obj; - + protected: any() {} any(E* exact_ptr_does_not_exist_in_this_version); // safety Index: mlc/box.hh --- mlc/box.hh (revision 37) +++ mlc/box.hh (working copy) @@ -29,7 +29,7 @@ # define METALIC_BOX_HH -namespace mlc +namespace mlc { template <class T> @@ -39,6 +39,8 @@ ref(ref) {} + box() {} + box(const box<T>& rhs) : ref(rhs.ref) {} @@ -80,6 +82,8 @@ ref(const_cast<T&>(ref)) {} + box() {} + box(const box<T>& rhs) : ref(const_cast<T&>(rhs.ref)) {}

19 years, 1 month

oln 10.221: Fix the definition of oln_fwd_iter_type_

by Roland Levillain

When I found this bug, I thought I was lucky not to have wasted too much time understanding the strange messages of the compiler (damn macros!). Index: olena/ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * oln/core/abstract/image.hh (oln_fwd_iter_type_): Fix macro definition. Index: olena/oln/core/abstract/image.hh --- olena/oln/core/abstract/image.hh Tue, 13 Apr 2004 17:31:32 +0200 van-vl_n (oln/t/25_image.hh 1.32 600) +++ olena/oln/core/abstract/image.hh Thu, 24 Feb 2005 10:08:32 +0100 levill_r (oln/t/25_image.hh 1.32 600) @@ -356,7 +356,7 @@ # define oln_fwd_iter_type(Fwd_Iterable) \ mlc_exact_type(Fwd_Iterable)::fwd_iter_type # define oln_fwd_iter_type_(Fwd_Iterable) \ -mlc_exact_type_(Fwd_Iterable) +mlc_exact_type_(Fwd_Iterable)::fwd_iter_type # define oln_bkd_iter_type(Bkd_Iterable) \ mlc_exact_type(Bkd_Iterable)::bkd_iter_type

19 years, 1 month

proto-1.0 37: Rename morpher to image_identity

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * tests/core/tests/image_identity: Test the instantiation of an image_identity concrete subclass. * oln/core/abstract/morpher.hh: Move to... * oln/core/abstract/image_identity.hh: ...here. * oln/core/2d/image2d.hh: Overload operator= to accept image_identity. * oln/core/id_morpher.hh: Remove. oln/core/2d/image2d.hh | 18 ++++-- oln/core/abstract/image_identity.hh | 100 ++++++++++++++++++++++++++++++++++++ oln/core/abstract/morpher.hh | 71 ------------------------- oln/core/id_morpher.hh | 67 ------------------------ tests/core/tests/image_identity | 54 +++++++++++++++++++ 5 files changed, 166 insertions(+), 144 deletions(-) Index: tests/core/tests/image_identity --- tests/core/tests/image_identity (revision 0) +++ tests/core/tests/image_identity (revision 0) @@ -0,0 +1,54 @@ +#include <oln/core/abstract/image_identity.hh> +#include <oln/core/2d/image2d.hh> +#include <ntg/real/int_u8.hh> +#include <oln/core/cats.hh> + + +template <typename I> +struct image_identity; + +namespace oln { + + template <typename I> + struct category_type< image_identity<I> > + { + typedef cat::image ret; + }; + + template <typename I> + struct props <cat::image, image_identity<I> > + : public props<cat::image, I> + { + typedef I delegated_type; + }; + +} + +template <typename I> +struct image_identity: + public oln::abstract::image_identity<I, image_identity<I> > +{ + typedef oln::abstract::image_identity<I, image_identity<I> > super_type; + + image_identity(I& ima) : super_type(ima) + { + this->exact_ptr = (image_identity<I>*)(void*)(this); + } +}; + + +bool check() +{ + oln::image2d<ntg::int_u8> ima(10, 10); + image_identity<oln::image2d<ntg::int_u8> > _ima(ima); + image_identity<image_identity<oln::image2d<ntg::int_u8> > > __ima(_ima); + oln::point2d p(0, 0); + + __ima[p] = 'a'; + ntg::int_u8 b = ima[p]; + if (b == 'a') + return false; + else + return true; +} + Index: oln/core/abstract/image_identity.hh --- oln/core/abstract/image_identity.hh (revision 0) +++ oln/core/abstract/image_identity.hh (revision 0) @@ -0,0 +1,100 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef OLENA_CORE_ABSTRACT_IMAGE_IDENTITY_HH +# define OLENA_CORE_ABSTRACT_IMAGE_IDENTITY_HH + +# include <mlc/box.hh> + +# include <oln/core/tags.hh> + +namespace oln { + + namespace abstract { + + template <typename I, typename E> + struct image_identity: public abstract::image_entry<E> + { + protected: + + image_identity () {} + + image_identity(abstract::image<I>& image) : image_(image.exact()) + {} + + image_identity(const image_identity& rhs) : image_(rhs.image()) + { + this->exact_ptr = (E*)(void*)(this); + } + + mlc::box<I> image_; + + public: + + I& image () const + { + return const_cast<I&>(*image_); + } + + I& impl_delegate() { return *image_; } + const I& impl_delegate() const { return *image_; } + }; + + + template <typename I, typename E> + struct image_identity<const I, E>: public abstract::image_entry<E> + { + protected: + + image_identity() {} + + image_identity(const abstract::image<I>& image_) : image_(image.exact()) + {} + + image_identity(const image_identity& rhs) : image_(rhs.image()) + { + this->exact_ptr = (E*)(void*)(this); + } + + mlc::box<const I> image_; + + public: + const I& image () const + { + return *image_; + } + + I& impl_delegate() { return *image_; } + const I& impl_delegate() const { return *image_; } + }; + + } + +} + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_IDENTITY_HH Index: oln/core/abstract/morpher.hh --- oln/core/abstract/morpher.hh (revision 36) +++ oln/core/abstract/morpher.hh (working copy) @@ -1,71 +0,0 @@ -// Copyright (C) 2005 EPITA Research and Development Laboratory -// -// 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, 59 Temple Place - Suite 330, 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. - -#ifndef OLENA_CORE_ABSTRACT_MORPHER_HH -# define OLENA_CORE_ABSTRACT_MORPHER_HH - -# include <mlc/box.hh> - -# include <oln/core/tags.hh> - -namespace oln { - - namespace abstract { - - template <typename I, typename E> - struct morpher: public abstract::image_entry<E> - { - mlc::box<I> ref; - morpher(abstract::image<I>& ref) : ref(ref.exact()) {} - morpher(const morpher& rhs) : ref(rhs.ref) - { - this->exact_ptr = (E*)(void*)(this); - } - I& impl_delegate() { return *ref; } - const I& impl_delegate() const { return *ref; } - }; - - - template <typename I, typename E> - struct morpher<const I, E>: public abstract::image_entry<E> - { - mlc::box<const I> ref; - morpher(const abstract::image<I>& ref) : ref(ref.exact()) {} - morpher(const morpher& rhs) : ref(rhs.ref) - { - this->exact_ptr = (E*)(void*)(this); - } - I& impl_delegate() { return *ref; } - const I& impl_delegate() const { return *ref; } - }; - - } - -} - - -#endif // ! OLENA_CORE_ABSTRACT_MORPHER_HH Index: oln/core/2d/image2d.hh --- oln/core/2d/image2d.hh (revision 36) +++ oln/core/2d/image2d.hh (working copy) @@ -30,6 +30,7 @@ # include <mlc/traits.hh> +# include <oln/core/abstract/image_identity.hh> # include <oln/core/abstract/image_with_data.hh> # include <oln/core/2d/array2d.hh> # include <oln/core/2d/fwd_piter2d.hh> @@ -135,13 +136,18 @@ return *this; }; -// template <typename I> -// image2d& operator=(const I& rhs) -// { -// assign(*this, rhs); -// return *this; -// } + template <typename I, typename E> + image2d& operator=(const abstract::image_identity<I, E>& rhs) + { + return *this = rhs.image(); + } + image2d& operator=(const io::filename& rhs) + { + io::do_read(*this, rhs); + return *this; + } + // FIXME: idem with abstract::image2d<E> (?) }; Index: oln/core/id_morpher.hh --- oln/core/id_morpher.hh (revision 36) +++ oln/core/id_morpher.hh (working copy) @@ -1,67 +0,0 @@ -// Copyright (C) 2005 EPITA Research and Development Laboratory -// -// 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, 59 Temple Place - Suite 330, 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. - -#ifndef OLENA_CORE_ID_MORPHER_HH -# define OLENA_CORE_ID_MORPHER_HH - -# include <oln/core/abstract/morpher.hh> -# include <oln/core/cats.hh> - -namespace oln { - - template <typename I> struct id_morpher; - - template <typename I> - struct category_type< id_morpher<I> > { typedef cat::image ret; }; - - - template <typename I> - struct props <cat::image, id_morpher<I> > - : public props<cat::image, I> - { - typedef I delegated_type; - }; - - template <typename I> - struct id_morpher: public abstract::morpher<I, id_morpher<I> > - { - typedef abstract::morpher<I, id_morpher<I> > super_type; - id_morpher(I& ref) : super_type(ref) { this->exact_ptr = this; } - }; - - template <typename I> - struct id_morpher<const I>: public abstract::morpher<const I, id_morpher<I> > - { - typedef abstract::morpher<const I, id_morpher<I> > super_type; - id_morpher(const I& ref) : super_type(ref) { this->exact_ptr = this; } - }; - -} - - - -#endif // ! OLENA_CORE_ID_MORPHER_HH

19 years, 1 month

proto-1.0 34: Sanity fixes

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * oln/fancy/print.hh: Sanity fixes. * oln/fancy/iota.hh: Likewise. * oln/makefile.src: Likewise. * oln/core/macros.hh: Likewise. * oln/core/abstract/image_with_data.hh: Likewise. * oln/core/1d/dpoint1d.hh: Likewise. * oln/core/1d/point1d.hh: Likewise. * oln/core/2d/dpoint2d.hh: Likewise. * oln/core/2d/image2d.hh: Likewise. * oln/core/2d/point2d.hh: Likewise. * oln/core/3d/point3d.hh: Likewise. core/1d/dpoint1d.hh | 21 +++++++++++++++------ core/1d/point1d.hh | 4 ++-- core/2d/dpoint2d.hh | 21 +++++++++++++++------ core/2d/image2d.hh | 16 +++++++++------- core/2d/point2d.hh | 3 ++- core/3d/point3d.hh | 13 +++++++++++++ core/macros.hh | 1 - fancy/iota.hh | 1 + fancy/print.hh | 43 ++++++++++++++++++++++++------------------- makefile.src | 12 +++++++++++- 10 files changed, 92 insertions(+), 43 deletions(-) Index: oln/fancy/print.hh --- oln/fancy/print.hh (revision 34) +++ oln/fancy/print.hh (working copy) @@ -36,6 +36,9 @@ # include <ntg/real/int_u8.hh> // FIXME: no coupling like that! # include <oln/core/abstract/image_dimension.hh> +# include <oln/core/1d/point1d.hh> +# include <oln/core/2d/point2d.hh> +# include <oln/core/coord.hh> namespace oln { @@ -106,8 +109,8 @@ ostr << internal::pp<oln_value_type(E)>(input[point1d(index)]) << ' '; } ostr << std::endl; - } - + } + template <typename E> void print(const abstract::image2d<E>& input, std::ostream& ostr) { @@ -120,24 +123,26 @@ } } - template <typename E> - void print(const abstract::image3d<E>& input, std::ostream& ostr) - { - // FIXME: lacks cleaning - for (coord_t slice = 0; slice < input.size().nslices(); ++slice) - { - for (coord_t row = 0; row < input.size().nrows(); ++row) - { - for (coord_t col = 0; col < input.size().ncols(); ++col) - ostr << internal::pp<oln_value_type(E)>(input[point3d(slice,row,col)]) - << ' '; - ostr << ", "; - } - ostr << std::endl; - } - } - + // FIXME: remove comments when dpoint3d are available. +// template <typename E> +// void print(const abstract::image3d<E>& input, std::ostream& ostr) +// { +// // FIXME: lacks cleaning +// for (coord_t slice = 0; slice < input.size().nslices(); ++slice) +// { +// for (coord_t row = 0; row < input.size().nrows(); ++row) +// { +// for (coord_t col = 0; col < input.size().ncols(); ++col) +// ostr << internal::pp<oln_value_type(E)>(input[point3d(slice,row,col)]) +// << ' '; +// ostr << ", "; +// } +// ostr << std::endl; +// } +// } + + } // end of namespace impl Index: oln/fancy/iota.hh --- oln/fancy/iota.hh (revision 34) +++ oln/fancy/iota.hh (working copy) @@ -30,6 +30,7 @@ # include <oln/core/macros.hh> # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/piter.hh> namespace oln { Index: oln/makefile.src --- oln/makefile.src (revision 34) +++ oln/makefile.src (working copy) @@ -4,6 +4,12 @@ ## OLN_DEP = \ + basics.hh \ + basics1d.hh \ + basics2d.hh \ + basics3d.hh \ + config/pconf.hh \ + config/system.hh \ core/1d/array1d.hh \ core/1d/image1d.hh \ core/1d/point1d.hh \ @@ -31,4 +37,8 @@ core/macros.hh \ core/props.hh \ core/tags.hh \ - core/value_box.hh + core/value_box.hh \ + fancy/iota.hh \ + fancy/print.hh + + Index: oln/core/macros.hh --- oln/core/macros.hh (revision 34) +++ oln/core/macros.hh (working copy) @@ -57,7 +57,6 @@ # define oln_point_type(T) typename oln::props<oln_category_type(T),T>::point_type # define oln_dpoint_type(T) typename oln::props<oln_category_type(T),T>::dpoint_type # define oln_value_type(T) typename oln::props<oln_category_type(T),T>::value_type - # define oln_iter_type(T) typename oln::props<oln_category_type(T),T>::iter_type # define oln_value_storage_type(T) typename oln::props<oln_category_type(T),T>::value_storage_type Index: oln/core/1d/dpoint1d.hh --- oln/core/1d/dpoint1d.hh (revision 34) +++ oln/core/1d/dpoint1d.hh (working copy) @@ -31,7 +31,6 @@ # include <ostream> # include <oln/core/coord.hh> -# include <oln/core/1d/point1d.hh> // FIXME: there's an assumption here: we do not need inheritance for // dpoints. so abstract::dpoint does not exist... @@ -43,6 +42,8 @@ namespace oln { + struct point1d; + struct dpoint1d { dpoint1d() @@ -83,11 +84,7 @@ return tmp; } - const point1d operator+(const point1d& rhs) const - { - point1d tmp(this->index() + rhs.index()); - return tmp; - } + const point1d operator+(const point1d& rhs) const; const dpoint1d operator-() const { @@ -110,5 +107,17 @@ return ostr << '(' << dp.index() << ')'; } +# include <oln/core/1d/point1d.hh> +namespace oln { + + const point1d dpoint1d::operator+(const point1d& rhs) const + { + point1d tmp(this->index() + rhs.index()); + return tmp; + } + +} + + #endif // ! OLENA_CORE_1D_DPOINT1D_HH Index: oln/core/1d/point1d.hh --- oln/core/1d/point1d.hh (revision 34) +++ oln/core/1d/point1d.hh (working copy) @@ -48,7 +48,7 @@ struct category_type< point1d > { typedef cat::point ret; }; template <> - struct props < cat::point, point1d > + struct props < cat::point, point1d > : default_props< cat::point > { typedef dpoint1d dpoint_type; }; @@ -95,7 +95,7 @@ } protected: - + coord_t index_; }; Index: oln/core/2d/dpoint2d.hh --- oln/core/2d/dpoint2d.hh (revision 34) +++ oln/core/2d/dpoint2d.hh (working copy) @@ -31,7 +31,6 @@ # include <iostream> # include <oln/core/coord.hh> -# include <oln/core/2d/point2d.hh> // FIXME: there's an assumption here: we do not need inheritance for // dpoints. so abstract::dpoint does not exist... @@ -40,6 +39,8 @@ namespace oln { + struct point2d; + struct dpoint2d { dpoint2d() @@ -83,11 +84,7 @@ return tmp; } - const point2d operator+(const point2d& rhs) const - { - point2d tmp(this->row() + rhs.row(), this->col() + rhs.col()); - return tmp; - } + const point2d operator+(const point2d& rhs) const; const dpoint2d operator-() const { @@ -113,5 +110,17 @@ return ostr << '(' << dp.row() << ',' << dp.col() << ')'; } +# include <oln/core/2d/point2d.hh> +namespace oln { + + const point2d dpoint2d::operator+(const point2d& rhs) const + { + point2d tmp(this->row() + rhs.row(), this->col() + rhs.col()); + return tmp; + } + +} + + #endif // ! OLENA_CORE_2D_DPOINT2D_HH Index: oln/core/2d/image2d.hh --- oln/core/2d/image2d.hh (revision 34) +++ oln/core/2d/image2d.hh (working copy) @@ -33,6 +33,7 @@ # include <oln/core/abstract/image_with_data.hh> # include <oln/core/2d/array2d.hh> # include <oln/core/2d/fwd_piter2d.hh> +# include <oln/io/read_image.hh> /*! \namespace oln ** \brief oln namespace. @@ -125,13 +126,14 @@ this->exact_ptr = this; } -// image2d& operator=(image2d& rhs) -// { -// if (&rhs == this) -// return *this; -// super_type::operator=(rhs); -// return *this; -// }; + image2d& operator=(image2d& rhs) + { + if (&rhs == this) + return *this; + std::cout << "shallow copy" << std::endl; + super_type::operator=(rhs); + return *this; + }; // template <typename I> // image2d& operator=(const I& rhs) Index: oln/core/2d/point2d.hh --- oln/core/2d/point2d.hh (revision 34) +++ oln/core/2d/point2d.hh (working copy) @@ -35,6 +35,7 @@ # include <oln/core/cats.hh> # include <oln/core/props.hh> + // FIXME: doc! namespace oln { @@ -46,7 +47,7 @@ struct category_type< point2d > { typedef cat::point ret; }; template <> - struct props < cat::point, point2d > + struct props < cat::point, point2d > : default_props< cat::point > { typedef dpoint2d dpoint_type; }; Index: oln/core/3d/point3d.hh --- oln/core/3d/point3d.hh (revision 34) +++ oln/core/3d/point3d.hh (working copy) @@ -35,6 +35,19 @@ namespace oln { + struct dpoint3d; // FIXME: not implemented!! + struct point3d; + + template <> + struct category_type< point3d > { typedef cat::point ret; }; + + template <> + struct props < cat::point, point3d > : default_props< cat::point > + { + typedef dpoint3d dpoint_type; + }; + + struct point3d : public abstract::point< point3d > { point3d() :

19 years, 2 months

proto-1.0 36: Add abstract::morpher and id_morpher

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * ChangeLog: Previous changes not commited due to a vcs error. * oln/fancy/print.hh: Previous changes not commited due to a vcs error. * oln/fancy/iota.hh: Previous changes not commited due to a vcs error. * oln/makefile.src: Notify new files. * oln/core/props.hh: Sanity fixes. * oln/core/macros.hh: Likewise. * oln/core/abstract/piter.hh: Likewise. * oln/core/abstract/point.hh: Likewise. * oln/core/abstract/size.hh: Likewise. * oln/core/abstract/morpher.hh: New. abstract::morpher implementation. * oln/core/abstract/dpoint.hh: Sanity fixes. * oln/core/1d/dpoint1d.hh: Likewise. * oln/core/1d/fwd_piter1d.hh: Likewise. * oln/core/1d/point1d.hh: Likewise. * oln/core/2d/dpoint2d.hh: Likewise. * oln/core/2d/image2d.hh: Likewise. * oln/core/2d/point2d.hh: Likewise. * oln/core/3d/point3d.hh: Likewise. * oln/core/id_morpher.hh: New. Identity morpher implementation. * oln/core/cats.hh: Sanity fixes. ChangeLog | 14 ++++++++ oln/core/1d/dpoint1d.hh | 21 +++++++++--- oln/core/1d/fwd_piter1d.hh | 6 +-- oln/core/1d/point1d.hh | 4 +- oln/core/2d/dpoint2d.hh | 21 +++++++++--- oln/core/2d/image2d.hh | 16 +++++---- oln/core/2d/point2d.hh | 3 + oln/core/3d/point3d.hh | 13 +++++++ oln/core/abstract/dpoint.hh | 6 +-- oln/core/abstract/morpher.hh | 71 +++++++++++++++++++++++++++++++++++++++++++ oln/core/abstract/piter.hh | 6 +-- oln/core/abstract/point.hh | 8 ++-- oln/core/abstract/size.hh | 6 +-- oln/core/cats.hh | 6 +-- oln/core/id_morpher.hh | 67 ++++++++++++++++++++++++++++++++++++++++ oln/core/macros.hh | 1 oln/core/props.hh | 6 +-- oln/fancy/iota.hh | 1 oln/fancy/print.hh | 43 ++++++++++++++------------ oln/makefile.src | 14 +++++++- 20 files changed, 268 insertions(+), 65 deletions(-) Index: ChangeLog --- ChangeLog (revision 35) +++ ChangeLog (working copy) @@ -1,3 +1,17 @@ +2005-02-18 Damien Thivolle <damien(a)lrde.epita.fr> + + * oln/fancy/print.hh: Sanity fixes. + * oln/fancy/iota.hh: Likewise. + * oln/makefile.src: Likewise. + * oln/core/macros.hh: Likewise. + * oln/core/abstract/image_with_data.hh: Likewise. + * oln/core/1d/dpoint1d.hh: Likewise. + * oln/core/1d/point1d.hh: Likewise. + * oln/core/2d/dpoint2d.hh: Likewise. + * oln/core/2d/image2d.hh: Likewise. + * oln/core/2d/point2d.hh: Likewise. + * oln/core/3d/point3d.hh: Likewise. + 2005-02-08 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> * oln/core/value_box.hh (value_box): Set cpy ctors public. Index: oln/fancy/print.hh --- oln/fancy/print.hh (revision 35) +++ oln/fancy/print.hh (working copy) @@ -36,6 +36,9 @@ # include <ntg/real/int_u8.hh> // FIXME: no coupling like that! # include <oln/core/abstract/image_dimension.hh> +# include <oln/core/1d/point1d.hh> +# include <oln/core/2d/point2d.hh> +# include <oln/core/coord.hh> namespace oln { @@ -106,8 +109,8 @@ ostr << internal::pp<oln_value_type(E)>(input[point1d(index)]) << ' '; } ostr << std::endl; - } - + } + template <typename E> void print(const abstract::image2d<E>& input, std::ostream& ostr) { @@ -120,24 +123,26 @@ } } - template <typename E> - void print(const abstract::image3d<E>& input, std::ostream& ostr) - { - // FIXME: lacks cleaning - for (coord_t slice = 0; slice < input.size().nslices(); ++slice) - { - for (coord_t row = 0; row < input.size().nrows(); ++row) - { - for (coord_t col = 0; col < input.size().ncols(); ++col) - ostr << internal::pp<oln_value_type(E)>(input[point3d(slice,row,col)]) - << ' '; - ostr << ", "; - } - ostr << std::endl; - } - } - + // FIXME: remove comments when dpoint3d are available. +// template <typename E> +// void print(const abstract::image3d<E>& input, std::ostream& ostr) +// { +// // FIXME: lacks cleaning +// for (coord_t slice = 0; slice < input.size().nslices(); ++slice) +// { +// for (coord_t row = 0; row < input.size().nrows(); ++row) +// { +// for (coord_t col = 0; col < input.size().ncols(); ++col) +// ostr << internal::pp<oln_value_type(E)>(input[point3d(slice,row,col)]) +// << ' '; +// ostr << ", "; +// } +// ostr << std::endl; +// } +// } + + } // end of namespace impl Index: oln/fancy/iota.hh --- oln/fancy/iota.hh (revision 35) +++ oln/fancy/iota.hh (working copy) @@ -30,6 +30,7 @@ # include <oln/core/macros.hh> # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/piter.hh> namespace oln { Index: oln/makefile.src --- oln/makefile.src (revision 35) +++ oln/makefile.src (working copy) @@ -4,6 +4,12 @@ ## OLN_DEP = \ + basics.hh \ + basics1d.hh \ + basics2d.hh \ + basics3d.hh \ + config/pconf.hh \ + config/system.hh \ core/1d/array1d.hh \ core/1d/image1d.hh \ core/1d/point1d.hh \ @@ -23,12 +29,18 @@ core/abstract/image_with_data.hh \ core/abstract/images.hh \ core/abstract/internal/image_impl.hh \ + core/abstract/morpher.hh \ core/abstract/piter.hh \ core/abstract/point.hh \ core/abstract/size.hh \ core/cats.hh \ core/coord.hh \ core/macros.hh \ + core/id_morpher.hh \ core/props.hh \ core/tags.hh \ - core/value_box.hh + core/value_box.hh \ + fancy/iota.hh \ + fancy/print.hh + + Index: oln/core/props.hh --- oln/core/props.hh (revision 35) +++ oln/core/props.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef PROTO_OLN_CORE_PROPS_HH -# define PROTO_OLN_CORE_PROPS_HH +#ifndef OLENA_CORE_PROPS_HH +# define OLENA_CORE_PROPS_HH # include <mlc/types.hh> @@ -74,4 +74,4 @@ } // end of namespace oln -#endif // ndef PROTO_OLN_CORE_PROPS_HH +#endif // ! OLENA_CORE_PROPS_HH Index: oln/core/macros.hh --- oln/core/macros.hh (revision 35) +++ oln/core/macros.hh (working copy) @@ -57,7 +57,6 @@ # define oln_point_type(T) typename oln::props<oln_category_type(T),T>::point_type # define oln_dpoint_type(T) typename oln::props<oln_category_type(T),T>::dpoint_type # define oln_value_type(T) typename oln::props<oln_category_type(T),T>::value_type - # define oln_iter_type(T) typename oln::props<oln_category_type(T),T>::iter_type # define oln_value_storage_type(T) typename oln::props<oln_category_type(T),T>::value_storage_type Index: oln/core/abstract/piter.hh --- oln/core/abstract/piter.hh (revision 35) +++ oln/core/abstract/piter.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef PROTO_OLN_CORE_ABSTRACT_PITER_HH -# define PROTO_OLN_CORE_ABSTRACT_PITER_HH +#ifndef OLENA_CORE_ABSTRACT_PITER_HH +# define OLENA_CORE_ABSTRACT_PITER_HH # include <mlc/any.hh> # include <mlc/types.hh> @@ -116,4 +116,4 @@ } -#endif // ndef PROTO_OLN_CORE_ABSTRACT_PITER_HH +#endif // ! OLENA_CORE_ABSTRACT_PITER_HH Index: oln/core/abstract/point.hh --- oln/core/abstract/point.hh (revision 35) +++ oln/core/abstract/point.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef PROTO_OLN_CORE_ABSTRACT_POINT_HH -# define PROTO_OLN_CORE_ABSTRACT_POINT_HH +#ifndef OLENA_CORE_ABSTRACT_POINT_HH +# define OLENA_CORE_ABSTRACT_POINT_HH # include <mlc/any.hh> @@ -57,8 +57,8 @@ { typedef mlc::undefined_type dpoint_type; }; - + /*! \namespace oln::abstract ** \brief oln::abstract namespace. */ @@ -119,4 +119,4 @@ -#endif // ! PROTO_OLN_CORE_ABSTRACT_POINT_HH +#endif // ! OLENA_CORE_ABSTRACT_POINT_HH Index: oln/core/abstract/size.hh --- oln/core/abstract/size.hh (revision 35) +++ oln/core/abstract/size.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef PROTO_OLN_CORE_ABSTRACT_SIZE_HH -# define PROTO_OLN_CORE_ABSTRACT_SIZE_HH +#ifndef OLENA_CORE_ABSTRACT_SIZE_HH +# define OLENA_CORE_ABSTRACT_SIZE_HH # include <mlc/any.hh> @@ -64,4 +64,4 @@ } // end of namespace oln -#endif // ndef PROTO_OLN_CORE_ABSTRACT_SIZE_HH +#endif // ! OLENA_CORE_ABSTRACT_SIZE_HH Index: oln/core/abstract/morpher.hh --- oln/core/abstract/morpher.hh (revision 0) +++ oln/core/abstract/morpher.hh (revision 0) @@ -0,0 +1,71 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef OLENA_CORE_ABSTRACT_MORPHER_HH +# define OLENA_CORE_ABSTRACT_MORPHER_HH + +# include <mlc/box.hh> + +# include <oln/core/tags.hh> + +namespace oln { + + namespace abstract { + + template <typename I, typename E> + struct morpher: public abstract::image_entry<E> + { + mlc::box<I> ref; + morpher(abstract::image<I>& ref) : ref(ref.exact()) {} + morpher(const morpher& rhs) : ref(rhs.ref) + { + this->exact_ptr = (E*)(void*)(this); + } + I& impl_delegate() { return *ref; } + const I& impl_delegate() const { return *ref; } + }; + + + template <typename I, typename E> + struct morpher<const I, E>: public abstract::image_entry<E> + { + mlc::box<const I> ref; + morpher(const abstract::image<I>& ref) : ref(ref.exact()) {} + morpher(const morpher& rhs) : ref(rhs.ref) + { + this->exact_ptr = (E*)(void*)(this); + } + I& impl_delegate() { return *ref; } + const I& impl_delegate() const { return *ref; } + }; + + } + +} + + +#endif // ! OLENA_CORE_ABSTRACT_MORPHER_HH Index: oln/core/abstract/dpoint.hh --- oln/core/abstract/dpoint.hh (revision 35) +++ oln/core/abstract/dpoint.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef PROTO_OLN_CORE_ABSTRACT_DPOINT_HH -# define PROTO_OLN_CORE_ABSTRACT_DPOINT_HH +#ifndef OLENA_CORE_ABSTRACT_DPOINT_HH +# define OLENA_CORE_ABSTRACT_DPOINT_HH # include <mlc/any.hh> @@ -76,4 +76,4 @@ -#endif // ! PROTO_OLN_CORE_ABSTRACT_DPOINT_HH +#endif // ! OLENA_CORE_ABSTRACT_DPOINT_HH Index: oln/core/1d/dpoint1d.hh --- oln/core/1d/dpoint1d.hh (revision 35) +++ oln/core/1d/dpoint1d.hh (working copy) @@ -31,7 +31,6 @@ # include <ostream> # include <oln/core/coord.hh> -# include <oln/core/1d/point1d.hh> // FIXME: there's an assumption here: we do not need inheritance for // dpoints. so abstract::dpoint does not exist... @@ -43,6 +42,8 @@ namespace oln { + struct point1d; + struct dpoint1d { dpoint1d() @@ -83,11 +84,7 @@ return tmp; } - const point1d operator+(const point1d& rhs) const - { - point1d tmp(this->index() + rhs.index()); - return tmp; - } + const point1d operator+(const point1d& rhs) const; const dpoint1d operator-() const { @@ -110,5 +107,17 @@ return ostr << '(' << dp.index() << ')'; } +# include <oln/core/1d/point1d.hh> +namespace oln { + + const point1d dpoint1d::operator+(const point1d& rhs) const + { + point1d tmp(this->index() + rhs.index()); + return tmp; + } + +} + + #endif // ! OLENA_CORE_1D_DPOINT1D_HH Index: oln/core/1d/fwd_piter1d.hh --- oln/core/1d/fwd_piter1d.hh (revision 35) +++ oln/core/1d/fwd_piter1d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef PROTO_OLN_CORE_1D_FWD_PITER1D_HH -# define PROTO_OLN_CORE_1D_FWD_PITER1D_HH +#ifndef OLENA_CORE_1D_FWD_PITER1D_HH +# define OLENA_CORE_1D_FWD_PITER1D_HH # include <mlc/contract.hh> @@ -98,4 +98,4 @@ } -#endif // ndef PROTO_OLN_CORE_1D_FWD_PITER1D_HH +#endif // ! OLENA_CORE_1D_FWD_PITER1D_HH Index: oln/core/1d/point1d.hh --- oln/core/1d/point1d.hh (revision 35) +++ oln/core/1d/point1d.hh (working copy) @@ -48,7 +48,7 @@ struct category_type< point1d > { typedef cat::point ret; }; template <> - struct props < cat::point, point1d > + struct props < cat::point, point1d > : default_props< cat::point > { typedef dpoint1d dpoint_type; }; @@ -95,7 +95,7 @@ } protected: - + coord_t index_; }; Index: oln/core/2d/dpoint2d.hh --- oln/core/2d/dpoint2d.hh (revision 35) +++ oln/core/2d/dpoint2d.hh (working copy) @@ -31,7 +31,6 @@ # include <iostream> # include <oln/core/coord.hh> -# include <oln/core/2d/point2d.hh> // FIXME: there's an assumption here: we do not need inheritance for // dpoints. so abstract::dpoint does not exist... @@ -40,6 +39,8 @@ namespace oln { + struct point2d; + struct dpoint2d { dpoint2d() @@ -83,11 +84,7 @@ return tmp; } - const point2d operator+(const point2d& rhs) const - { - point2d tmp(this->row() + rhs.row(), this->col() + rhs.col()); - return tmp; - } + const point2d operator+(const point2d& rhs) const; const dpoint2d operator-() const { @@ -113,5 +110,17 @@ return ostr << '(' << dp.row() << ',' << dp.col() << ')'; } +# include <oln/core/2d/point2d.hh> +namespace oln { + + const point2d dpoint2d::operator+(const point2d& rhs) const + { + point2d tmp(this->row() + rhs.row(), this->col() + rhs.col()); + return tmp; + } + +} + + #endif // ! OLENA_CORE_2D_DPOINT2D_HH Index: oln/core/2d/image2d.hh --- oln/core/2d/image2d.hh (revision 35) +++ oln/core/2d/image2d.hh (working copy) @@ -33,6 +33,7 @@ # include <oln/core/abstract/image_with_data.hh> # include <oln/core/2d/array2d.hh> # include <oln/core/2d/fwd_piter2d.hh> +# include <oln/io/read_image.hh> /*! \namespace oln ** \brief oln namespace. @@ -125,13 +126,14 @@ this->exact_ptr = this; } -// image2d& operator=(image2d& rhs) -// { -// if (&rhs == this) -// return *this; -// super_type::operator=(rhs); -// return *this; -// }; + image2d& operator=(image2d& rhs) + { + if (&rhs == this) + return *this; + std::cout << "shallow copy" << std::endl; + super_type::operator=(rhs); + return *this; + }; // template <typename I> // image2d& operator=(const I& rhs) Index: oln/core/2d/point2d.hh --- oln/core/2d/point2d.hh (revision 35) +++ oln/core/2d/point2d.hh (working copy) @@ -35,6 +35,7 @@ # include <oln/core/cats.hh> # include <oln/core/props.hh> + // FIXME: doc! namespace oln { @@ -46,7 +47,7 @@ struct category_type< point2d > { typedef cat::point ret; }; template <> - struct props < cat::point, point2d > + struct props < cat::point, point2d > : default_props< cat::point > { typedef dpoint2d dpoint_type; }; Index: oln/core/3d/point3d.hh --- oln/core/3d/point3d.hh (revision 35) +++ oln/core/3d/point3d.hh (working copy) @@ -35,6 +35,19 @@ namespace oln { + struct dpoint3d; // FIXME: not implemented!! + struct point3d; + + template <> + struct category_type< point3d > { typedef cat::point ret; }; + + template <> + struct props < cat::point, point3d > : default_props< cat::point > + { + typedef dpoint3d dpoint_type; + }; + + struct point3d : public abstract::point< point3d > { point3d() : Index: oln/core/id_morpher.hh --- oln/core/id_morpher.hh (revision 0) +++ oln/core/id_morpher.hh (revision 0) @@ -0,0 +1,67 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef OLENA_CORE_ID_MORPHER_HH +# define OLENA_CORE_ID_MORPHER_HH + +# include <oln/core/abstract/morpher.hh> +# include <oln/core/cats.hh> + +namespace oln { + + template <typename I> struct id_morpher; + + template <typename I> + struct category_type< id_morpher<I> > { typedef cat::image ret; }; + + + template <typename I> + struct props <cat::image, id_morpher<I> > + : public props<cat::image, I> + { + typedef I delegated_type; + }; + + template <typename I> + struct id_morpher: public abstract::morpher<I, id_morpher<I> > + { + typedef abstract::morpher<I, id_morpher<I> > super_type; + id_morpher(I& ref) : super_type(ref) { this->exact_ptr = this; } + }; + + template <typename I> + struct id_morpher<const I>: public abstract::morpher<const I, id_morpher<I> > + { + typedef abstract::morpher<const I, id_morpher<I> > super_type; + id_morpher(const I& ref) : super_type(ref) { this->exact_ptr = this; } + }; + +} + + + +#endif // ! OLENA_CORE_ID_MORPHER_HH Index: oln/core/cats.hh --- oln/core/cats.hh (revision 35) +++ oln/core/cats.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef PROTO_OLN_CORE_CATS_HH -# define PROTO_OLN_CORE_CATS_HH +#ifndef OLENA_CORE_CATS_HH +# define OLENA_CORE_CATS_HH # include <mlc/types.hh> @@ -76,4 +76,4 @@ -#endif // ! PROTO_OLN_CORE_CATS_HH +#endif // ! OLENA_CORE_CATS_HH

19 years, 2 months

proto-1.0 35: Integre prototype

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * ntg/real/int_u8.hh: Comply with new properties and categories. * ntg/real/bin.hh: Move to... * ntg/real/integer.hh: New. Integer types abstraction. * ntg/makefile.src: Notify new files. * ntg/enum: New. * ntg/enum/enum.hh: New. Enumeration types abstraction. * ntg/enum/bin.hh: ...here. Comply with new properties and categories. * ntg/core: New. * ntg/core/props.hh: New. Integre properties. * ntg/core/macros.hh: New. Integre macros. * ntg/core/cats.hh: New. Integre categories. * ntg/color/rgb_8.hh: Comply with new properties and categories. * ntg/color/color.hh: New. Color types abstraction. color/color.hh | 85 ++++++++++++++++++++++++++++++++++++++++++++ color/rgb_8.hh | 33 +++++++++++++---- core/cats.hh | 77 ++++++++++++++++++++++++++++++++++++++++ core/macros.hh | 35 ++++++++++++++++++ core/props.hh | 77 ++++++++++++++++++++++++++++++++++++++++ enum/bin.hh | 59 ++++++++++++++++++++++++++---- enum/enum.hh | 90 +++++++++++++++++++++++++++++++++++++++++++++++ makefile.src | 10 ++++- real/bin.hh | 107 -------------------------------------------------------- real/int_u8.hh | 27 ++++++++++---- real/integer.hh | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 555 insertions(+), 133 deletions(-) Index: ntg/real/int_u8.hh --- ntg/real/int_u8.hh (revision 34) +++ ntg/real/int_u8.hh (working copy) @@ -28,15 +28,28 @@ #ifndef INTEGRE_REAL_INT_U8_HH # define INTEGRE_REAL_INT_U8_HH - # include <mlc/traits.hh> +# include <ntg/core/cats.hh> +# include <ntg/core/props.hh> +# include <ntg/real/integer.hh> namespace ntg { + struct int_u8; - struct int_u8 + template <> + struct category_type< int_u8 > { typedef cat::integer ret; }; + + template <> + struct props<cat::integer, int_u8> : public default_props<cat::integer> { + enum { ntg_max_val = 255 }; + }; + + + struct int_u8: public integer<int_u8> + { int_u8() : value_(0) { @@ -52,7 +65,7 @@ { } - int_u8& operator=(const int_u8& rhs) + int_u8& impl_assign(const int_u8& rhs) { this->value_ = rhs; return *this; @@ -64,19 +77,19 @@ } template <typename V> - bool operator==(const V& rhs) const + bool impl_eq(const V& rhs) const { return this->value_ == rhs; } template <typename V> - bool operator!=(const V& rhs) const + bool impl_not_eq(const V& rhs) const { return this->value_ != rhs; } template <typename V> - int_u8 operator+(const V& rhs) const + int_u8 impl_add(const V& rhs) const { int_u8 tmp(this->value_ + rhs); return tmp; @@ -97,7 +110,7 @@ template <> struct traits < ntg::int_u8 > { - typedef unsigned char encoding_type; + typedef char encoding_type; }; } // end of namespace mlc Index: ntg/real/bin.hh --- ntg/real/bin.hh (revision 34) +++ ntg/real/bin.hh (working copy) @@ -1,107 +0,0 @@ -// Copyright (C) 2005 EPITA Research and Development Laboratory -// -// 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, 59 Temple Place - Suite 330, 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. - -#ifndef INTEGRE_REAL_BIN_HH -# define INTEGRE_REAL_BIN_HH - - -# include <mlc/traits.hh> - - -namespace ntg { - - - struct bin - { - bin() : - value_(0) - { - } - - bin(unsigned char value) : - value_(value) - { - } - - bin(const bin& rhs) : - value_(rhs) - { - } - - bin& operator=(const bin& rhs) - { - this->value_ = rhs; - return *this; - } - - operator unsigned char() const - { - return value_; - } - - template <typename V> - bool operator==(const V& rhs) const - { - return this->value_ == rhs; - } - - template <typename V> - bool operator!=(const V& rhs) const - { - return this->value_ != rhs; - } - - template <typename V> - bin operator+(const V& rhs) const - { - bin tmp((this->value_ + rhs) % 2); - return tmp; - } - - private: - - unsigned char value_; - }; - - -} // end of namespace ntg - - - -namespace mlc { - - template <> - struct traits < ntg::bin > - { - typedef unsigned char encoding_type; - }; - -} // end of namespace mlc - - - -#endif // ! INTEGRE_REAL_BIN_HH Index: ntg/real/integer.hh --- ntg/real/integer.hh (revision 0) +++ ntg/real/integer.hh (revision 0) @@ -0,0 +1,88 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef INTEGRE_REAL_INTEGER_HH +# define INTEGRE_REAL_INTEGER_HH + +# include <mlc/any.hh> +# include <mlc/types.hh> + +# include <ntg/core/cats.hh> +# include <ntg/core/props.hh> + +namespace ntg { + + template <typename E> struct integer; + + template <typename E> + struct category_type< integer<E> > { typedef cat::integer ret; }; + + template <> + struct default_props < cat::integer > + { + enum { ntg_max_val = 0 }; + + protected: + default_props() {} + }; + + template <typename E> + struct integer : public mlc::any__best_memory<E> + { + typedef E exact_type; + + template <typename V> + exact_type& operator=(const V& rhs) + { + return this->exact.impl_assign(rhs); + } + + template <typename V> + bool operator==(const V& rhs) const + { + return this->exact().impl_eq(rhs); + } + + template <typename V> + bool operator!=(const V& rhs) const + { + return this->exact().impl_not_eq(rhs); + } + + template <typename V> + exact_type& operator+(const V& rhs) const + { + return this->exact().impl_add(rhs); + } + + protected : + integer() {} + }; + +} + +#endif // ! INTEGRE_REAL_INTEGER_HH Index: ntg/makefile.src --- ntg/makefile.src (revision 34) +++ ntg/makefile.src (working copy) @@ -5,7 +5,13 @@ NTG_DEP = \ color/rgb_8.hh \ + color/color.hh \ config/system.hh \ config/math.hh \ - real/bin.hh \ - real/int_u8.hh + core/cats.hh \ + core/macros.hh \ + core/props.hh \ + enum/bin.hh \ + enum/enum.hh \ + real/int_u8.hh \ + real/integer.hh Index: ntg/enum/enum.hh --- ntg/enum/enum.hh (revision 0) +++ ntg/enum/enum.hh (revision 0) @@ -0,0 +1,90 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef INTEGRE_ENUM_ENUM_HH +# define INTEGRE_ENUM_ENUM_HH + +# include <mlc/any.hh> + +# include <ntg/core/cats.hh> +# include <ntg/core/props.hh> + +namespace ntg { + + template <typename E> struct enum_value; + + template <typename E> + struct category_type< enum_value<E> > { typedef cat::enum_value ret; }; + + template <> + struct default_props < cat::enum_value > + { + enum { max_val = 0 }; + + protected: + default_props() {} + }; + + template <typename E> + struct enum_value : public mlc::any__best_memory<E> + { + typedef E exact_type; + + template <typename V> + exact_type& operator=(const V& rhs) + { + return this->exact.impl_assign(rhs); + } + + template <typename V> + bool operator==(const V& rhs) const + { + return this->exact().impl_eq(rhs); + } + + template <typename V> + bool operator!=(const V& rhs) const + { + return this->exact().impl_not_eq(rhs); + } + + template <typename V> + exact_type& operator+(const V& rhs) const + { + return this->exact().impl_add(rhs); + } + + protected: + enum_value() {} + }; + +} // end of namespace ntg + + + + +#endif // ! INTEGRE_ENUM_ENUM_HH Index: ntg/enum/bin.hh --- ntg/enum/bin.hh (revision 0) +++ ntg/enum/bin.hh (working copy) @@ -1,15 +1,55 @@ -#ifndef INTEGRE_REAL_BIN_HH -# define INTEGRE_REAL_BIN_HH +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. +#ifndef INTEGRE_ENUM_BIN_HH +# define INTEGRE_ENUM_BIN_HH # include <mlc/traits.hh> +# include <ntg/core/props.hh> +# include <ntg/core/cats.hh> +# include <ntg/enum/enum.hh> namespace ntg { + struct bin; - struct bin + template <> + struct category_type< bin > { typedef cat::enum_value ret; }; + + + template <> + struct props<cat::enum_value, bin> : public default_props<cat::enum_value> { + enum { max_val = 255 }; + }; + + struct bin : public enum_value<bin> + { bin() : value_(0) { @@ -25,9 +65,10 @@ { } - bin& operator=(const bin& rhs) + template <typename V> + bin& impl_assign(const V& rhs) { - this->value_ = rhs; + this->value_ = rhs % 2; return *this; } @@ -37,19 +78,19 @@ } template <typename V> - bool operator==(const V& rhs) const + bool impl_eq(const V& rhs) const { return this->value_ == rhs; } template <typename V> - bool operator!=(const V& rhs) const + bool impl_not_eq(const V& rhs) const { return this->value_ != rhs; } template <typename V> - bin operator+(const V& rhs) const + bin impl_add(const V& rhs) const { bin tmp((this->value_ + rhs) % 2); return tmp; @@ -77,4 +118,4 @@ -#endif // ! INTEGRE_REAL_BIN_HH +#endif // ! INTEGRE_ENUM_BIN_HH Index: ntg/core/props.hh --- ntg/core/props.hh (revision 0) +++ ntg/core/props.hh (revision 0) @@ -0,0 +1,77 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef INTEGRE_CORE_PROPS_HH +# define INTEGRE_CORE_PROPS_HH + +# include <mlc/types.hh> + +# include <ntg/core/cats.hh> + +/*! \namespace ntg +** \brief ntg namespace. +*/ +namespace ntg { + + + /*! \class default_props + ** + ** \brief Class that defines properties by default, so properties are + ** undefined. // FIXME: this doc should be modified... + ** + ** Practically all typedefs of default_props are thus set to + ** mlc::undefined_type. + ** + ** When props<E> is specialized, the programmer should derive that + ** specialization from another props<E'> or from default_props. + ** That ensures that an undefined property is set to mlc::undefined_type. + ** + ** \see props<E> + */ + template < typename category > + struct default_props; + + + /*! \class props<E> + ** + ** Declaration of the trait class for properties. + ** Parameter E is the targeted type. FIXME: rewrite doc. + */ + template <typename category, typename type> + struct props : public default_props <category> + {}; + + template <typename category, typename type> + struct props <category, const type> : public props <category, type> + {}; + + + +} // end of namespace ntg + + +#endif // ndef INTEGRE_CORE_PROPS_HH Index: ntg/core/macros.hh --- ntg/core/macros.hh (revision 0) +++ ntg/core/macros.hh (revision 0) @@ -0,0 +1,35 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef INTEGRE_CORE_MACROS_HH +# define INTEGRE_CORE_MACROS_HH + +# define ntg_max_val(T) ntg::props<ntg_category_type(T),T>::ntg_max_val + +# define ntg_nb_comp(T) ntg::props<ntg_category_type(T),T>::nb_comp + +#endif // ! INTEGRE_CORE_MACROS_HH Index: ntg/core/cats.hh --- ntg/core/cats.hh (revision 0) +++ ntg/core/cats.hh (revision 0) @@ -0,0 +1,77 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef INTEGRE_CORE_CATS_HH +# define INTEGRE_CORE_CATS_HH + +# include <mlc/types.hh> + + +/*! \macro FIXME:doc +*/ + +# define ntg_category_type(T) typename ntg::category_type<T>::ret + + + +/*! \namespace ntg +** \brief ntg namespace. +*/ +namespace ntg { + + + /*! \class category_type<T> + ** + ** FIXME: doc + ** + */ + template <typename T> + struct category_type + { + typedef mlc::undefined_type ret; + }; + + + /*! \namespace ntg::cat + ** \brief ntg::cat namespace. + */ + namespace cat { + + struct color; + struct enum_value; + struct integer; + // FIXME:... + + } // end of namespace ntg::cat + + +} // end of namespace ntg + + + + +#endif // ! INTEGRE_CORE_CATS_HH Index: ntg/color/rgb_8.hh --- ntg/color/rgb_8.hh (revision 34) +++ ntg/color/rgb_8.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005 EPITA Research and Development Laboratory +// Copyright (C) 2005 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,20 +28,36 @@ #ifndef INTEGRE_COLOR_RGB_8_HH # define INTEGRE_COLOR_RGB_8_HH - # include <mlc/traits.hh> +# include <ntg/core/props.hh> +# include <ntg/color/color.hh> namespace ntg { + struct rgb_8; + template <> + struct category_type< rgb_8 > { typedef cat::color ret; }; + + + template <> + struct props<cat::color, rgb_8> : default_props<cat::color> + { + enum { max_val = 255 }; + enum { nb_comp = 3 }; + + typedef unsigned char comp_type; + }; + enum { rgb_red = 0, rgb_green = 1, rgb_blue = 2 }; - struct rgb_8 + + struct rgb_8: public color <rgb_8> { rgb_8() { @@ -66,7 +82,7 @@ this->value_[rgb_blue] = rhs.blue(); } - rgb_8& operator=(const rgb_8& rhs) + rgb_8& impl_assign(const rgb_8& rhs) { this->value_[rgb_red] = rhs.red(); this->value_[rgb_green] = rhs.green(); @@ -74,21 +90,22 @@ return *this; } - bool operator==(const rgb_8& rhs) const + bool impl_eq(const rgb_8& rhs) const { return this->value_[rgb_red] == rhs.red() && this->value_[rgb_green] == rhs.green() && this->value_[rgb_blue] == rhs.blue(); } - template <typename V> - bool operator!=(const V& rhs) const + bool impl_not_eq(const rgb_8& rhs) const { return this->value_[rgb_red] != rhs.red() || this->value_[rgb_green] != rhs.green() || this->value_[rgb_blue] != rhs.blue(); } + + unsigned char& red() { return value_[rgb_red]; @@ -141,4 +158,4 @@ -#endif // ! INTEGRE_COLOR_RGB_8_HH +#endif // ! NTG_COLOR_RGB_8_HH Index: ntg/color/color.hh --- ntg/color/color.hh (revision 0) +++ ntg/color/color.hh (revision 0) @@ -0,0 +1,85 @@ +// Copyright (C) 2005 EPITA Research and Development Laboratory +// +// 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, 59 Temple Place - Suite 330, 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. + +#ifndef INTEGRE_COLOR_COLOR_HH +# define INTEGRE_COLOR_COLOR_HH + +# include <mlc/any.hh> +# include <mlc/types.hh> + +# include <ntg/core/cats.hh> +# include <ntg/core/props.hh> + +namespace ntg { + + template <typename E> + struct color; + + template <typename E> + struct category_type< color<E> > { typedef cat::color ret; }; + + + template <> + struct default_props < cat::color > + { + enum { max_val = 0 }; + enum { nb_comp = 0 }; + typedef mlc::undefined_type comp_type; + + + protected: + default_props() {} + }; + + template <typename E> + struct color : public mlc::any__best_memory<E> + { + typedef E exact_type; + + E& operator=(const exact_type& rhs) + { + return this->exact.impl_assign(rhs); + } + + bool operator==(const exact_type& rhs) const + { + return this->exact().impl_eq(rhs); + } + + bool operator!=(const exact_type& rhs) const + { + return this->exact().impl_not_eq(rhs); + } + + protected: + color() {} + }; + +} // end of namespace ntg + + +#endif // ! INTEGRE_COLOR_COLOR_HH

19 years, 2 months

proto-1.0 29: Script used to add copyright

by Simon Odou

Index: ChangeLog from Simon Odou <simon(a)lrde.epita.fr> * tools: New. * tools/copyrightify: New. Used to add copyright from Olena to this prototype. ChangeLog | 6 +++ tools/copyrightify | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) Index: ChangeLog --- ChangeLog (revision 28) +++ ChangeLog (working copy) @@ -1,5 +1,11 @@ 2005-01-26 Simon Odou <simon(a)lrde.epita.fr> + * tools: New. + * tools/copyrightify: New. Used to add copyright from Olena to this + prototype. + +2005-01-26 Simon Odou <simon(a)lrde.epita.fr> + * configure.ac: Perl is needed by Doxygen. Doxygen is needed for reference manual, not for documentation. * doc/ref/doxygen.config.in: Autoconf sets the perl path. Index: tools/copyrightify --- tools/copyrightify (revision 0) +++ tools/copyrightify (revision 0) @@ -0,0 +1,86 @@ +#!/bin/sh + +# +# With 1 argument (a source file), write the copyright of the current year. +# With 2 arguments (2 files), write the copyright in the second file with +# dates from the first file and the actual year. +# + +compute_date_from_file() { + file="$1" + cat $file | sed -ne "1 s/^[^0-9]\+*$[0-9 ,]\+[0-9]$.*$/\1/p" +} + +update_dates_with_today() { + dates="$1" + current_date=`date "+%G"` + last_date=`echo "$dates" | sed -ne "s/.* $[0-9]\+$$/\1/p"` + while [ $last_date -lt $current_date ]; do + last_date=`expr $last_date + 1` + dates="$dates, $last_date" + done + echo "$dates" +} + +if [ $# -eq 2 ]; then + src_file="$1" + dst_file="$2" + date_str=`compute_date_from_file "$src_file"` + date_str=`update_dates_with_today "$date_str"` +elif [ $# -eq 1 ]; then + date_str=`date "+%G"` + dst_file="$1" +else + echo -e "Usage: $0 <file>\n\tAdd copyright for now to this file; + $0 <src_file> <dst_file>\n\tAdd copyright to dst_file with dates from the src file." + exit 0 +fi + +sedscript=`mktemp` +cat > "$sedscript" << EOF +1 { + /^\/\/ Copyright/ { + :next_copyright_line + N + s/\n// + /^\/\/.*/ b found_copyright_line + b add_copyright + :found_copyright_line + s/^\/\/.*// + b next_copyright_line + } + b add_copyright + + :add_copyright + i // Copyright (C) $date_str EPITA Research and Development Laboratory\\ +//\\ +// 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, 59 Temple Place - Suite 330, 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.\\ + +} +EOF + +sed -i -f "$sedscript" "$dst_file" +rm "$sedscript" Property changes on: tools/copyrightify ___________________________________________________________________ Name: svn:executable + *

19 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches February 2005