- Olena-patches

olena: olena-2.0-594-g3748427 Add matrix class to handle Taylor approximation (dirty version)
by Anthony Seure 27 May '13

27 May '13

--- milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/src/main.cc | 78 ++++++++++++++++++--- milena/sandbox/anthony/src/matrix.cc | 130 ++++++++++++++++++++++++++++++++++ milena/sandbox/anthony/src/matrix.hh | 35 +++++++++ 4 files changed, 234 insertions(+), 11 deletions(-) create mode 100644 milena/sandbox/anthony/src/matrix.cc create mode 100644 milena/sandbox/anthony/src/matrix.hh diff --git a/milena/sandbox/anthony/Makefile b/milena/sandbox/anthony/Makefile index ff62f9e..83ee52b 100644 --- a/milena/sandbox/anthony/Makefile +++ b/milena/sandbox/anthony/Makefile @@ -4,7 +4,7 @@ CFLAGS=-Wall -Werror CLIBS=-I../../ CLEAN=*.o output/* log -SRC=src/main.cc src/keypoint.cc +SRC=src/matrix.cc src/keypoint.cc src/main.cc OUTPUT=a.out all: scale diff --git a/milena/sandbox/anthony/src/main.cc b/milena/sandbox/anthony/src/main.cc index eea1c86..9cc956b 100644 --- a/milena/sandbox/anthony/src/main.cc +++ b/milena/sandbox/anthony/src/main.cc @@ -9,6 +9,7 @@ #include <cmath> #include "keypoint.hh" +#include "matrix.hh" using namespace mln; @@ -523,7 +524,7 @@ void buildExtrema(C extrema, mln_psite(I) pOriginal(p.row() * pow(2, (j-1)), p.col() * pow(2, (j-1))); extrema(pOriginal) = literal::green; - keypoints.push_back(Keypoint(p.row(), p.col(), j, i, false)); + keypoints.push_back(Keypoint(p.row(), p.col(), i, j, false)); } } else if (center >= max) @@ -536,7 +537,7 @@ void buildExtrema(C extrema, mln_psite(I) pOriginal(p.row() * pow(2, (j-1)), p.col() * pow(2, (j-1))); extrema(pOriginal) = literal::red; - keypoints.push_back(Keypoint(p.row(), p.col(), j, i, true)); + keypoints.push_back(Keypoint(p.row(), p.col(), i, j, true)); } } } @@ -546,13 +547,71 @@ void buildExtrema(C extrema, io::ppm::save(extrema, "output/extrema.ppm"); } +/*****************************************************************************/ +/*****************************************************************************/ +/*****************************************************************************/ + template<typename I> -void discardEdgeResponses(std::vector< std::vector >& dogSpace, - std::vector<Keypoint>& keypoints) +Matrix *computeFirstOrderMatrix(const std::vector< std::vector >& dogSpace, + const Keypoint& k) +{ + Matrix *matrix = new Matrix(3, 1); + + return matrix; +} + +template<typename I> +Matrix *computeSecondOrderMatrix(const std::vector< std::vector >& dogSpace, + const Keypoint& k) +{ + Matrix *matrix = new Matrix(3, 3); + + return matrix; +} + +bool isBetter(Matrix offset) { - // FIXME Move work from buildExtrema here + return (offset.get(0, 0) > 0.5 + || offset.get(0, 1) > 0.5 + || offset.get(0, 2) > 0.5); } +void changeKeypoint(Keypoint& k, Matrix& offset) +{ +} + +// Discard low contrast keypoints thanks to taylor interpolation +// See Brown and Lowe paper (2002) +// FIXME Move to object representation (size-templated matrix maybe ?) +template<typename I> +void discardLowContrastKeypoints(const std::vector< std::vector >& dogSpace, + std::vector<Keypoint>& keypoints) +{ + for (unsigned i = 0; i < keypoints.size(); ++i) + { + Keypoint k = keypoints.at(i); + + Matrix *fom = computeFirstOrderMatrix(dogSpace, k); + Matrix *som = computeSecondOrderMatrix(dogSpace, k); + Matrix inversed(som->getHeight(), som->getWidth()); + bool inversible = som->inverse(inversed); + + if (inversible) + { + Matrix offset = (*fom) * (*som); + + if (isBetter(offset)) + { + changeKeypoint(k, offset); + } + } + } +} + +/*****************************************************************************/ +/*****************************************************************************/ +/*****************************************************************************/ + // Main entry point int main(int argc, char** argv) { @@ -569,15 +628,14 @@ int main(int argc, char** argv) io::pgm::load(original, "images/lena.pgm"); + // Localization buildScaleSpace(scaleSpace, original, octave_level, blur_level); buildDifferenceOfGaussianSpace(scaleSpace, dogSpace); buildExtrema(extrema, original, dogSpace, keypoints); - // TODO Interpolation of nearby data for accurate position - // TODO Discard low-contrast keypoints - //discardEdgeResponses(dogSpace, keypoints); - - std::cout << keypoints.size() << std::endl; + //discardLowContrastKeypoints(dogSpace, keypoints); + // Processing + // TODO return 0; } diff --git a/milena/sandbox/anthony/src/matrix.cc b/milena/sandbox/anthony/src/matrix.cc new file mode 100644 index 0000000..1c5784d --- /dev/null +++ b/milena/sandbox/anthony/src/matrix.cc @@ -0,0 +1,130 @@ +#include "matrix.hh" + +Matrix::Matrix(unsigned h, unsigned w) +{ + height = h; + width = w; +} + +void Matrix::initialize() +{ + for (unsigned i = 0; i < height; ++i) + { + std::vector<float> line; + + for (unsigned j = 0; j < width; ++j) + line.push_back(0); + + m.push_back(line); + } +} + +void Matrix::initialize(float *values) +{ + for (unsigned i = 0; i < height; ++i) + { + std::vector<float> line; + + for (unsigned j = 0; j < width; ++j) + line.push_back(values[i * width + j]); + + m.push_back(line); + } +} + +void Matrix::print() +{ + for (unsigned i = 0; i < height; ++i) + { + std::cout << "|"; + + for (unsigned j = 0; j < width; ++j) + std::cout << " " << m.at(i).at(j); + + std::cout << " |" << std::endl; + } + std::cout << std::endl; +} + + +float Matrix::determinant() +{ + float d1 = m.at(0).at(0) * m.at(1).at(1) * m.at(2).at(2); + float d2 = m.at(0).at(1) * m.at(1).at(2) * m.at(2).at(0); + float d3 = m.at(0).at(2) * m.at(1).at(0) * m.at(2).at(1); + + float d4 = m.at(0).at(2) * m.at(1).at(1) * m.at(2).at(0); + float d5 = m.at(1).at(2) * m.at(2).at(1) * m.at(0).at(0); + float d6 = m.at(2).at(2) * m.at(0).at(1) * m.at(1).at(0); + + return (d1 + d2 + d3 - d4 - d5 - d6); +} + +bool Matrix::inverse(Matrix& inversed) +{ + bool canInverse = false; + + float det = determinant(); + + if (det != 0) + { + float a = m.at(0).at(0); + float b = m.at(0).at(1); + float c = m.at(0).at(2); + + float d = m.at(1).at(0); + float e = m.at(1).at(1); + float f = m.at(1).at(2); + + float g = m.at(2).at(0); + float h = m.at(2).at(1); + float i = m.at(2).at(2); + + Matrix comatrix(3, 3); + comatrix.initialize(); + + comatrix.set(0, 0, e*i - f*h); + comatrix.set(0, 1, c*h - b*i); + comatrix.set(0, 2, b*f - c*e); + + comatrix.set(1, 0, f*g - d*i); + comatrix.set(1, 1, a*i - c*g); + comatrix.set(1, 2, c*d - a*f); + + comatrix.set(2, 0, d*h - e*g); + comatrix.set(2, 1, b*g - a*h); + comatrix.set(2, 2, a*e - b*d); + + for (unsigned i = 0; i < comatrix.getWidth(); ++i) + for (unsigned j = 0; j < comatrix.getHeight(); ++j) + comatrix.set(i, j, comatrix.get(i,j) / det); + + comatrix.print(); + inversed = comatrix; + + canInverse = true; + } + + return canInverse; +} + +// Operators +Matrix Matrix::operator*(Matrix& right) +{ + Matrix result(height, right.getWidth()); + result.initialize(); + + for (unsigned i = 0; i < height; ++i) + for (unsigned j = 0; j < width; ++j) + for (unsigned k = 0; k < right.getWidth(); ++k) + result.add(i, k, m.at(i).at(j) * right.get(j, k)); + + return result; +}; + +// Getters and Setters +unsigned Matrix::getHeight() { return height; } +unsigned Matrix::getWidth() { return width; } +float Matrix::get(unsigned i, unsigned j) { return m.at(i).at(j); } +void Matrix::set(unsigned i, unsigned j, float x) { m.at(i).at(j) = x; } +void Matrix::add(unsigned i, unsigned j, float x) { m.at(i).at(j) += x; } diff --git a/milena/sandbox/anthony/src/matrix.hh b/milena/sandbox/anthony/src/matrix.hh new file mode 100644 index 0000000..b2ca124 --- /dev/null +++ b/milena/sandbox/anthony/src/matrix.hh @@ -0,0 +1,35 @@ +#ifndef MATRIX_HH +# define MATRIX_HH + +# include <iostream> +# include <vector> + +class Matrix +{ + public: + // Constructor + Matrix(unsigned i, unsigned j); + + void initialize(); + void initialize(float *values); + void print(); + float determinant(); + bool inverse(Matrix& inversed); + + // Operators + Matrix operator*(Matrix& right); + + // Getters and Setters + unsigned getHeight(); + unsigned getWidth(); + float get(unsigned i, unsigned j); + void set(unsigned i, unsigned j, float value); + void add(unsigned i, unsigned j, float value); + + private: + std::vector< std::vector<float> > m; + unsigned height; + unsigned width; +}; + +#endif /* ! MATRIX_HH */ -- 1.7.2.5

1 0

*****SPAM***** You do not have much money? We offer a solution to - work in your spare time in our company
by olena-patches＠lrde.epita.fr 20 May '13

20 May '13

We invite you to work in the remote assistant position. This work takes 2-3 hours per week and requires absolutely no investment. The essence of this work for incoming client requests in your city. The starting salary is about ~2000 Euro per month + bonuses. You get paid your salary every 2 weeks and your bonuses after fulfilling each task! We guarantee work for everyone. But we accept applications this week only! Therefore, you should write a request right now. And you will start earning money, starting from next week. Please indicate in the request: Your name: Your Contact number: Your email address: City of residence: Please send the request to my email Debra(a)google-eurojob.com and I will answer you personally as soon as possible Sincerely, Debra Maloney

1 0

*****SPAM***** Your monthly income can be increased to 1950 EURO paid.
by roland＠lrde.epita.fr 20 May '13

20 May '13

We invite you to work in the remote assistant position. This work takes 2-3 hours per week and requires absolutely no investment. The essence of this work for incoming client requests in your city. The starting salary is about ~2000 Euro per month + bonuses. You get paid your salary every 2 weeks and your bonuses after fulfilling each task! We guarantee work for everyone. But we accept applications this week only! Therefore, you should write a request right now. And you will start earning money, starting from next week. Please indicate in the request: Your name: Your Contact number: Your email address: City of residence: Please send the request to my email Melvin(a)google-eurojob.com and I will answer you personally as soon as possible Sincerely, Melvin Dickerson

1 0

*****SPAM***** Learn how people in your profession can earn a 30% increase!
by olena-patches＠lrde.epita.fr 20 May '13

20 May '13

We invite you to work in the remote assistant position. This work takes 2-3 hours per week and requires absolutely no investment. The essence of this work for incoming client requests in your city. The starting salary is about ~2000 Euro per month + bonuses. You get paid your salary every 2 weeks and your bonuses after fulfilling each task! We guarantee work for everyone. But we accept applications this week only! Therefore, you should write a request right now. And you will start earning money, starting from next week. Please indicate in the request: Your name: Your Contact number: Your email address: City of residence: Please send the request to my email Winston(a)google-eurojob.com and I will answer you personally as soon as possible Sincerely, Winston Rodrigues

1 0

*****SPAM***** Looking for remote assistants, paid 100 Euro per hour helping other people
by olena-patches＠lrde.epita.fr 20 May '13

20 May '13

Our company is engaged in sales of pharmaceutical additives. The company is well known all over the world, also in Europe. Therefore, in connection with the expansion of our production market is recruiting staff in your area. To work needed representatives residing directly in the country, who can speak on native language and necessarily on English. The main requirements to the applicant as follows: -Accommodation in Europe -Knowledge of the English language, as well as all reports and documents we have only English -Responsibility and sociability -Knowledge in the field of international bank transfers Responsibilities: -Talks with customers -Control over payments in your area -Recordkeeping -Reports of all news to head office Job offers: -High-wage -Instant bonuses -Payment of taxes -Paid leave -Career Please send the request to my email Burton(a)google-eurojob.com,and I will answer you personally as soon as possible: Full name Contact number Country of residence Good luck! Sincerely, Burton Amos

1 0

*****SPAM***** You do not have much money? We offer a solution to - work in your spare time in our company
by olena-patches＠lrde.epita.fr 20 May '13

20 May '13

Our company is engaged in sales of pharmaceutical additives. The company is well known all over the world, also in Europe. Therefore, in connection with the expansion of our production market is recruiting staff in your area. To work needed representatives residing directly in the country, who can speak on native language and necessarily on English. The main requirements to the applicant as follows: -Accommodation in Europe -Knowledge of the English language, as well as all reports and documents we have only English -Responsibility and sociability -Knowledge in the field of international bank transfers Responsibilities: -Talks with customers -Control over payments in your area -Recordkeeping -Reports of all news to head office Job offers: -High-wage -Instant bonuses -Payment of taxes -Paid leave -Career Please send the request to my email Royce(a)google-eurojob.com,and I will answer you personally as soon as possible: Full name Contact number Country of residence Good luck! Sincerely, Royce Crow

1 0

olena: branch exp/newdoc updated: olena-2.0-614-g38af498
by git＠lrde.epita.fr 15 May '13

15 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/newdoc has been updated via 38af4980d93b128f944d972d6492e3a5e3a250f2 (commit) from f0a568aef6407af4cf8287055b96a501586d615d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 38af498 Add more links into main documentation. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 ++++++++++ doc/doxygen.css | 55 +++++++++++++++++++++++---------------------- doc/mainpage.dox | 14 ++++++------ doc/modules_list.dox | 4 +- doc/online_resources.dox | 13 ++++++---- 5 files changed, 57 insertions(+), 41 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-614-g38af498 Add more links into main documentation.
by Guillaume Lazzara 15 May '13

15 May '13

* doc/doxygen.css: Fix links boldness. * doc/mainpage.dox: Add links. * doc/modules_list.dox: Link to respective documentation. * doc/online_resources.dox: Fix link to build farm. --- ChangeLog | 12 ++++++++++ doc/doxygen.css | 55 +++++++++++++++++++++++---------------------- doc/mainpage.dox | 14 ++++++------ doc/modules_list.dox | 4 +- doc/online_resources.dox | 13 ++++++---- 5 files changed, 57 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d14142..7333963 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2013-05-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add more links into main documentation. + + * doc/doxygen.css: Fix links boldness. + + * doc/mainpage.dox: Add links. + + * doc/modules_list.dox: Link to respective documentation. + + * doc/online_resources.dox: Fix link to build farm. + +2013-05-15 Guillaume Lazzara <z(a)lrde.epita.fr> + New page related to Olena powered programs. * doc/mainpage.dox: Add link to Olena powered programs page. diff --git a/doc/doxygen.css b/doc/doxygen.css index dc14a84..fdb9f0f 100644 --- a/doc/doxygen.css +++ b/doc/doxygen.css @@ -138,14 +138,15 @@ a.el { } a.elRef { + font-weight: bold; } a.code, a.code:visited { - color: #4665A2; + color: #4665A2; } a.codeRef, a.codeRef:visited { - color: #4665A2; + color: #4665A2; } /* @end */ @@ -289,7 +290,7 @@ p.formulaDsp { } img.formulaDsp { - + } img.formulaInl { @@ -347,20 +348,20 @@ span.charliteral { color: #008080 } -span.vhdldigit { - color: #ff00ff +span.vhdldigit { + color: #ff00ff } -span.vhdlchar { - color: #000000 +span.vhdlchar { + color: #000000 } -span.vhdlkeyword { - color: #700070 +span.vhdlkeyword { + color: #700070 } -span.vhdllogic { - color: #ff0000 +span.vhdllogic { + color: #ff0000 } blockquote { @@ -555,9 +556,9 @@ table.memberdecls { } .memdoc, dl.reflist dd { - border-bottom: 1px solid #A8B8D9; - border-left: 1px solid #A8B8D9; - border-right: 1px solid #A8B8D9; + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; padding: 6px 10px 2px 10px; background-color: #FBFCFD; border-top-width: 0; @@ -609,18 +610,18 @@ dl.reflist dd { .params, .retval, .exception, .tparams { margin-left: 0px; padding-left: 0px; -} +} .params .paramname, .retval .paramname { font-weight: bold; vertical-align: top; } - + .params .paramtype { font-style: italic; vertical-align: top; -} - +} + .params .paramdir { font-family: "courier new",courier,monospace; vertical-align: top; @@ -793,8 +794,8 @@ table.fieldtable { .fieldtable td.fielddoc p:first-child { margin-top: 2px; -} - +} + .fieldtable td.fielddoc p:last-child { margin-bottom: 2px; } @@ -868,7 +869,7 @@ table.fieldtable { color: #283A5D; font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); - text-decoration: none; + text-decoration: none; } .navpath li.navelem a:hover @@ -897,7 +898,7 @@ div.summary padding-right: 5px; width: 50%; text-align: right; -} +} div.summary a { @@ -1009,19 +1010,19 @@ dl.section dd { vertical-align: bottom; border-collapse: separate; } - + #projectlogo img -{ +{ border: 0px none; } - + #projectname { font: 300% Tahoma, Arial,sans-serif; margin: 0px; padding: 2px 0px; } - + #projectbrief { font: 120% Tahoma, Arial,sans-serif; @@ -1116,7 +1117,7 @@ div.toc ul { list-style: none outside none; border: medium none; padding: 0px; -} +} div.toc li.level1 { margin-left: 0px; diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 4c5e5cf..a1b47ef 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -24,7 +24,7 @@ \li Swilena </td> <td> - \li Report Bugs and Make Suggestions + \li \htmlonly <a class="el" href="mailto:olena@lrde.epita.fr">Report Bugs and Make Suggestions</a>\endhtmlonly \li \ref getsources \li \ref onlineres </td> @@ -38,14 +38,14 @@ </tr> <tr> <td> - \li SCOOP 2 - \li Genericity and Performance in Olena + \li <a class="el" href="http://www.lrde.epita.fr/cgi-bin/twiki/view/Publications/200807-MPOOL">SCOOP 2</a> + \li <a class="el" href="http://www.lrde.epita.fr/cgi-bin/twiki/view/Publications/201009-ICIP">Genericity and Performance in Olena</a> </td> <td> - \li Image Manipulation - \li Image Morphers - \li Mathematical Morphology - \li Document Image Analysis + \li \ref imagemanip + \li \ref modimagemorpher + \li \ref mlnmorpho + \li \link grptoolchaindoc Document Image Analysis \endlink </td> <td> \li <a class="el" href="http://olena.lrde.epita.fr/demos">Online Demos</a> diff --git a/doc/modules_list.dox b/doc/modules_list.dox index 6b872ef..d271e89 100644 --- a/doc/modules_list.dox +++ b/doc/modules_list.dox @@ -2,8 +2,8 @@ As a platform, Olena is divided in several modules: -\li Milena, a generic image processing library. -\li Scribo, a framework for document image analysis. +\li <a class="el" href="@relcommondocpath@../milena/doc/user-refman/html/index.html">Milena</a>, a generic image processing library. +\li <a class="el" href="@relcommondocpath@../scribo/doc/user-refman/html/index.html">Scribo</a>, a framework for document image analysis. \li Swilena, Python bindings for Milena. */ diff --git a/doc/online_resources.dox b/doc/online_resources.dox index 32cd18d..60bd873 100644 --- a/doc/online_resources.dox +++ b/doc/online_resources.dox @@ -14,12 +14,15 @@ href="http://git.lrde.epita.fr/?p=olena.git">http://git.lrde.epita.fr/?p=olena.g It is also a way to keep an eye on current develop. -\section BuildBot +\section Build Farm + +Olena is built continuously (each time changes are pushed into the Git +repository) on different architectures thanks to the TeamCity-powered +build farm of the lab. + +\li <a href="http://teamcity.lrde.epita.fr/project.html?projectId=project2&tab=projectOv…">Olena's build farm reports</a> + -During the development process, we need to be sure that changes don't -break the whole code. To do so, we have a buildfarm running several -architectures and compilers. A monitoring interface is available here -: <a href="https://buildfarm.lrde.org/buildfarm/oln/">https://buildfarm.lrde.org/buildfarm/oln/</a> \section Mailing-list -- 1.7.2.5

1 0

olena: branch exp/newdoc updated: olena-2.0-613-gf0a568a
by git＠lrde.epita.fr 15 May '13

15 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/newdoc has been updated via f0a568aef6407af4cf8287055b96a501586d615d (commit) from 549681511e1e366b98634862881a5bd795f4afaf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- f0a568a Be more precise about relationship between sites and iterators. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 ++++++++ milena/doc/mln/core/image/images.dox | 14 +++++++------- milena/doc/mln/core/neighb.dox | 3 ++- milena/doc/mln/win/win.dox | 3 ++- 4 files changed, 19 insertions(+), 9 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-613-gf0a568a Be more precise about relationship between sites and iterators.
by Guillaume Lazzara 15 May '13

15 May '13

* doc/mln/core/image/images.dox, * doc/mln/core/neighb.dox, * doc/mln/win/win.dox: Here. --- milena/ChangeLog | 8 ++++++++ milena/doc/mln/core/image/images.dox | 14 +++++++------- milena/doc/mln/core/neighb.dox | 3 ++- milena/doc/mln/win/win.dox | 3 ++- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8acf1b4..f14e23c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-05-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Be more precise about relationship between sites and iterators. + + * doc/mln/core/image/images.dox, + * doc/mln/core/neighb.dox, + * doc/mln/win/win.dox: Here. + +2013-05-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/mln/io/io.dox: Move package dependencies documentation into "note" environnement. diff --git a/milena/doc/mln/core/image/images.dox b/milena/doc/mln/core/image/images.dox index d559794..17685fd 100644 --- a/milena/doc/mln/core/image/images.dox +++ b/milena/doc/mln/core/image/images.dox @@ -35,7 +35,7 @@ \subsection docaccvalpiter Site-Based Iterators - A generic way of iterating over the values of an image is to use + A generic way of iterating over the domain of an image is to use mln_piter() macro to declare an iterator. \code @@ -48,12 +48,12 @@ \endcode Note that iterator \c p must be first declared over the domain of - the target image \c ima. Then iterator \c p is moved over the image - thanks to the for_all() macro. An iterator declared with - mln_piter() can be considered as having the same interface as a site - of the target image. Here, \c p can be considered as a mln::point2d - and thus can be passed to image2d::operator() to access the value of - the current point. + the target image \c ima. Then iterator \c p is moved over all the + image sites thanks to the for_all() macro. An iterator declared + with mln_piter() can be considered as having the same interface as a + site of the target image. Here, \c p can be considered as a + mln::point2d and thus can be passed to image2d::operator() to access + the value of the current point. The for_all() is in charge of initializing the iterator and move it forward. It is safe to have two for_all() loops successively with diff --git a/milena/doc/mln/core/neighb.dox b/milena/doc/mln/core/neighb.dox index 1748928..f8f545b 100644 --- a/milena/doc/mln/core/neighb.dox +++ b/milena/doc/mln/core/neighb.dox @@ -26,7 +26,8 @@ \c p is a site iterator over all the sites of the image \c ima. \c q, being a neighborhood iterator centered on that iterator, is automatically updated and centered to the current site pointed by \p - p. + p. The neighborhood iterator \c q points to a neighbor site of \c p + and can be considered as having the same interface than image sites. A full example is available in \link neighborhood_iterator.cc neighborhood_iterator.cc \endlink diff --git a/milena/doc/mln/win/win.dox b/milena/doc/mln/win/win.dox index 2ce3cb1..b9f38a5 100644 --- a/milena/doc/mln/win/win.dox +++ b/milena/doc/mln/win/win.dox @@ -24,7 +24,8 @@ \c p is a site iterator over all the sites of the image \c ima. \c q, being a window iterator centered on that iterator, is automatically updated and centered to the current site pointed by \p - p. + p. The window iterator \c q points to a neighbor site of \c p and + can be considered as having the same interface than image sites. A full example is available in \link window_iterator.cc window_iterator.cc \endlink -- 1.7.2.5

1 0