Olena-patches May 2013

olena-patches@lrde.epita.fr

6 participants
133 discussions

[Olena] #147: Write a script to automatically generate file skeletons for Olena

by Olena

#147: Write a script to automatically generate file skeletons for Olena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: trivial | Milestone: Component: Milena | Version: 1.0 Keywords: generator | -----------------------+---------------------------------------------------- A Ruby script would be nice, but the language doesn't really matter. -- Ticket URL: <https://trac.lrde.org/olena/ticket/147> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #190: Handle Trimesh's dependencies on third-party packages.

by Olena Trac

#190: Handle Trimesh's dependencies on third-party packages. --------------------------------+------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: minor | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Keywords: Autoconf configure | --------------------------------+------------------------------------------- * OpenGL/Mesa (for Trimesh) * We should check for the presence of `GL/gl.h`, `GL/glu.h` and `libXmu.{a,so}` to enable OpenGL conditionally. * Note: on Debian, Mesa users have to install these packages: * `mesa-common-dev` (for `GL/gl.h`) * `libglu1-mesa-dev` (for `GL/glu.h`) * `libxmu-dev` (for `libXmu.{a,so}`). -- Ticket URL: <https://trac.lrde.org/olena/ticket/190> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #238: Have Swilena be compatible with (also) Python 2.6 (and greater)

by Olena Trac

#238: Have Swilena be compatible with (also) Python 2.6 (and greater) -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Component: Swilena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Swilena does not work with Python 2.6 (and probably greater versions). Swig seems to generates wrappers correctly, and they compile fine, but tests fail at run time. There may have been changes in Python's API between versions 2.5 and 2.6 (perhaps iterators?). Investigate. -- Ticket URL: <https://trac.lrde.org/olena/ticket/238> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #160: Revamp complexes

by Olena

#160: Revamp complexes ----------------------------+----------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: cleanup rename | ----------------------------+----------------------------------------------- * Move complexes from `mln/core/` to `mln/topo/`. * The '''dynamic''' access(es) to the set of ''n''-faces of a complex (e.g., `mln::complex::nfaces(unsigned)`) has (have) a linear complexity! We should get rid of that. We could create an index at the creation of the complex, mapping dynamic dimension numbers to the corresponding (static) mixin/data. Ask Roland for details. -- Ticket URL: <https://trac.lrde.org/olena/ticket/160> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #227: List of dependencies out of date in the wiki

by Olena Trac

#227: List of dependencies out of date in the wiki --------------------------+------------------------------------------------- Reporter: jonathan | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Milena | Version: 1.0 Keywords: Dependencies | --------------------------+------------------------------------------------- In the download page, [http://www.lrde.epita.fr/cgi- bin/twiki/view/Olena/Download], the list of dependencies is out of date. Especially for the git repository version, additional dependencies are needed to build the documentation. It should be clarified in the wiki or the building procedure should be improved. ****************** A non exhaustive(?) list of dependencies: autogen automake1.7 autoconf make g++ libboost-dev texlive-latex-base texlive-extra-utils pgf HeVeA latex2html doxygen imagemagick dot2tex -- Ticket URL: <https://trac.lrde.org/olena/ticket/227> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 3 months

[Olena] #232: Update contributors' list on Olena's Web site

by Olena Trac

#232: Update contributors' list on Olena's Web site ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.1 Component: Web | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- This page : https://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/Contributors should be updated with the latest version (e.g., from branch `next`) of this file : source:AUTHORS Better: write a script to automate the conversion, so as to simplify the process of updating this page down to a copy-and-paste operation. -- Ticket URL: <https://trac.lrde.org/olena/ticket/232> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

11 years, 5 months

olena: branch sandbox/anthony updated: olena-2.0-595-gc54e2d1

by git＠lrde.epita.fr

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 sandbox/anthony has been updated via c54e2d15a72f95f744770ff7d91f2a48ee1cfa02 (commit) from 3748427f0634fa0a7e531042cba2bba85a93447a (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 ----------------------------------------------------------------- c54e2d1 Improve extremum ----------------------------------------------------------------------- Summary of changes: milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/src/keypoint.cc | 39 +++++- milena/sandbox/anthony/src/keypoint.hh | 29 +++-- milena/sandbox/anthony/src/main.cc | 226 ++++++++++++++++++++++++------- milena/sandbox/anthony/src/matrix.cc | 30 ++++- milena/sandbox/anthony/src/matrix.hh | 5 +- 6 files changed, 259 insertions(+), 72 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

olena: olena-2.0-595-gc54e2d1 Improve extremum

by Anthony Seure

--- milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/src/keypoint.cc | 39 +++++- milena/sandbox/anthony/src/keypoint.hh | 29 +++-- milena/sandbox/anthony/src/main.cc | 226 ++++++++++++++++++++++++------- milena/sandbox/anthony/src/matrix.cc | 30 ++++- milena/sandbox/anthony/src/matrix.hh | 5 +- 6 files changed, 259 insertions(+), 72 deletions(-) diff --git a/milena/sandbox/anthony/Makefile b/milena/sandbox/anthony/Makefile index 83ee52b..2953013 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/matrix.cc src/keypoint.cc src/main.cc +SRC=src/main.cc src/matrix.cc src/keypoint.cc OUTPUT=a.out all: scale diff --git a/milena/sandbox/anthony/src/keypoint.cc b/milena/sandbox/anthony/src/keypoint.cc index bf0a5f5..937e78d 100644 --- a/milena/sandbox/anthony/src/keypoint.cc +++ b/milena/sandbox/anthony/src/keypoint.cc @@ -1,8 +1,8 @@ #include "keypoint.hh" // Constructor -Keypoint::Keypoint(unsigned i, unsigned j, - unsigned scale, unsigned size, bool maximum) +Keypoint::Keypoint(int i, int j, + int scale, int size, bool maximum) { this->i = i; this->j = j; @@ -11,8 +11,35 @@ Keypoint::Keypoint(unsigned i, unsigned j, this->maximum = maximum; } +bool Keypoint::add(Matrix& offset, Keypoint& old) +{ + if (offset.get(0, 0) >= 1 || offset.get(0, 0) <= -1 + || offset.get(1, 0) >= 1 || offset.get(1, 0) <= -1) + { + i += offset.get(0, 0); + j += offset.get(1, 0); + scale += offset.get(2, 0); + + return (i != old.getI() && j != old.getJ()); + } + else + return false; +} + +//mln::point2d Keypoint::getPoint() +//{ + //mln::point2d p(i, j); + + //return p; +//} + // Getters -unsigned Keypoint::getI() { return i; } -unsigned Keypoint::getJ() { return j; } -unsigned Keypoint::getScale() { return scale; } -unsigned Keypoint::getSize() { return size; } +int Keypoint::getI() { return i; } +int Keypoint::getJ() { return j; } +int Keypoint::getScale() { return scale; } +int Keypoint::getSize() { return size; } + +// Setters +void Keypoint::setI(int offsetI) { i = offsetI; } +void Keypoint::setJ(int offsetJ) { j = offsetJ; } +void Keypoint::setScale(int offsetScale) { scale = offsetScale; } diff --git a/milena/sandbox/anthony/src/keypoint.hh b/milena/sandbox/anthony/src/keypoint.hh index 798a980..af24a4c 100644 --- a/milena/sandbox/anthony/src/keypoint.hh +++ b/milena/sandbox/anthony/src/keypoint.hh @@ -1,26 +1,35 @@ #ifndef KEYPOINT_HH # define KEYPOINT_HH +//# include <mln/core/alias/point2d.hh> # include <ostream> +# include "matrix.hh" class Keypoint { public: // Constructor - Keypoint(unsigned i, unsigned j, - unsigned scale, unsigned size, bool maximum); + Keypoint(int i, int j, + int scale, int size, bool maximum); + + bool add(Matrix& k, Keypoint& old); + //mln::point2d getPoint(); // Getters - unsigned getI(); - unsigned getJ(); - unsigned getScale(); - unsigned getSize(); + int getI(); + int getJ(); + int getScale(); + int getSize(); + + void setI(int offsetI); + void setJ(int offsetJ); + void setScale(int offsetScale); private: - unsigned i; - unsigned j; - unsigned scale; - unsigned size; + int i; + int j; + int scale; + int size; bool maximum; }; diff --git a/milena/sandbox/anthony/src/main.cc b/milena/sandbox/anthony/src/main.cc index 9cc956b..fae3c64 100644 --- a/milena/sandbox/anthony/src/main.cc +++ b/milena/sandbox/anthony/src/main.cc @@ -472,18 +472,11 @@ bool hasEdgeResponse(const I& dog, const P& p, const T& center) // Build the extrema image template<typename I, typename C> -void buildExtrema(C extrema, - I original, +void buildExtrema(C& extrema, + const I& original, std::vector< std::vector >& dogSpace, std::vector<Keypoint>& keypoints) { - const bool black = false; - - if (black) - initialize(extrema, original); - else - extrema = data::convert(value::rgb8(), original); - // Number of scales (gaussian meaning) unsigned scales = dogSpace.at(0).size(); @@ -523,7 +516,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; + extrema(pOriginal) = literal::red; keypoints.push_back(Keypoint(p.row(), p.col(), i, j, false)); } } @@ -543,75 +536,191 @@ void buildExtrema(C extrema, } } } - - io::ppm::save(extrema, "output/extrema.ppm"); } -/*****************************************************************************/ -/*****************************************************************************/ -/*****************************************************************************/ - +// Compute the first order matrix for interpolation template<typename I> -Matrix *computeFirstOrderMatrix(const std::vector< std::vector >& dogSpace, - const Keypoint& k) +void computeFirstOrderMatrix(const std::vector< std::vector >& dogSpace, + Keypoint& k, + Matrix& matrix) { - Matrix *matrix = new Matrix(3, 1); + matrix.initialize(); + + std::vector current = dogSpace.at(1); + std::vector upper = dogSpace.at(2); + std::vector lower = dogSpace.at(0); + + /* Point naming convention + * n1 + * n2 c n3 + * n4 + */ + point2d c(k.getI(), k.getJ()); + + point2d n1(k.getI(), k.getJ() - 1); + point2d n2(k.getI() - 1, k.getJ()); + point2d n3(k.getI() + 1, k.getJ()); + point2d n4(k.getI(), k.getJ() + 1); + + point2d cupper(c.row() / 2, c.col() / 2); + point2d clower(c.row() * 2, c.col() * 2); + + // Compute partial x + matrix.set(0, 0, (current.at(0)(n3) - current.at(0)(n2)) / 2.0); - return matrix; + // Compute partial y + matrix.set(1, 0, (current.at(0)(n3) - current.at(0)(n2)) / 2.0); + + // Compute partial scale + matrix.set(2, 0, (lower.at(0)(clower) - upper.at(0)(cupper)) / 2.0); } +// Compute the inversed second order matrix for interpolation template<typename I> -Matrix *computeSecondOrderMatrix(const std::vector< std::vector >& dogSpace, - const Keypoint& k) +void computeSecondOrderMatrix(const std::vector< std::vector >& dogSpace, + Keypoint& k, + Matrix& matrix) { - Matrix *matrix = new Matrix(3, 3); + matrix.initialize(); - return matrix; -} + const static std::vector current = dogSpace.at(1); + const static I upper = dogSpace.at(2).at(0); + const static I lower = dogSpace.at(0).at(0); + const static I main = current.at(0); -bool isBetter(Matrix offset) -{ - return (offset.get(0, 0) > 0.5 - || offset.get(0, 1) > 0.5 - || offset.get(0, 2) > 0.5); -} + /* Point naming convention + * n5 n1 n6 + * n2 c n3 + * n7 n4 n8 + */ + point2d c(k.getI(), k.getJ()); -void changeKeypoint(Keypoint& k, Matrix& offset) -{ + point2d n1(k.getI(), k.getJ() - 1); + point2d n2(k.getI() - 1, k.getJ()); + point2d n3(k.getI() + 1, k.getJ()); + point2d n4(k.getI(), k.getJ() + 1); + + point2d n5(k.getI() - 1, k.getJ() - 1); + point2d n6(k.getI() + 1, k.getJ() - 1); + point2d n7(k.getI() + 1, k.getJ() + 1); + point2d n8(k.getI() - 1, k.getJ() + 1); + + point2d cupper(c.row() / 2, c.col() / 2); + point2d n1upper(n1.row() / 2, n1.col() / 2); + point2d n2upper(n2.row() / 2, n3.col() / 2); + point2d n3upper(n3.row() / 2, n3.col() / 2); + point2d n4upper(n4.row() / 2, n4.col() / 2); + + point2d clower(c.row() * 2, c.col() * 2); + point2d n1lower(n1.row() * 2, n1.col() * 2); + point2d n2lower(n2.row() * 2, n2.col() * 2); + point2d n3lower(n3.row() * 2, n3.col() * 2); + point2d n4lower(n4.row() * 2, n4.col() * 2); + + float partial_xx, partial_yy, partial_ss, partial_xy, partial_xs, partial_ys; + + // Compute partial xx + partial_xx = main(n3) - 2 * main(c) + main(n2); + + // Compute partial yy + partial_yy = main(n4) - 2 * main(c) + main(n1); + + // Compute partial ss + partial_ss = lower(clower) - 2 * main(c) + + upper(cupper); + + // Compute partial xy + partial_xy = (main(n8) - main(n6) - main(n7) + main(n5)) / 4.0; + + // Compute partial xs + partial_xs = (upper(n3upper) - lower(n3lower) + - upper(n2upper) + lower(n2lower)) / 4.0; + + // Compute partial ys + partial_ys = (upper(n4upper) - lower(n4lower) + - upper(n1upper) + lower(n1lower)) / 4.0; + + matrix.set(0, 0, partial_xx); + matrix.set(0, 1, partial_xy); + matrix.set(0, 2, partial_xs); + + matrix.set(1, 0, partial_xy); + matrix.set(1, 1, partial_yy); + matrix.set(1, 2, partial_ys); + + matrix.set(2, 0, partial_xs); + matrix.set(2, 1, partial_ys); + matrix.set(2, 2, partial_ss); } // 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> +template<typename I, typename C> void discardLowContrastKeypoints(const std::vector< std::vector >& dogSpace, - std::vector<Keypoint>& keypoints) + std::vector<Keypoint>& keypoints, + C& extrema) { + Keypoint k_old(0, 0, 0, 0, true); + 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); + Matrix firstOrder(3, 1); + Matrix secondOrder(3, 3); + Matrix inversed(secondOrder.getHeight(), secondOrder.getWidth()); - if (inversible) + computeFirstOrderMatrix(dogSpace, k, firstOrder); + computeSecondOrderMatrix(dogSpace, k, secondOrder); + bool hasInversed = secondOrder.inverse(inversed); + + if (hasInversed) { - Matrix offset = (*fom) * (*som); - - if (isBetter(offset)) + Matrix x = inversed * firstOrder; + bool isMajorOffset = x.isMajorOffset(); + + if (isMajorOffset) + { + std::cout << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<" << std::endl; + std::cout << "First order matrix:" << std::endl; + firstOrder.print(); + + std::cout << "Second order matrix:" << std::endl; + secondOrder.print(); + + std::cout << "Offset: " << std::endl; + x.print(); + + std::cout << "k_old: " << k_old.getI() << " " << k_old.getJ() << std::endl; + std::cout << "k: " << k.getI() << " " << k.getJ() << std::endl; + bool hasMoved = k.add(x, k_old); + std::cout << "k++: " << k.getI() << " " << k.getJ() + << "\thasMoved: " << hasMoved << std::endl; + + point2d p(k.getI(), k.getJ()); + std::cout << "Final point: " << extrema.domain() << "\t" <= 0 && p.row() < geom::max_row(extrema) + && p.col() >= 0 && p.col() < geom::max_col(extrema)) + { + std::cout << "VALID" << std::endl; + extrema(p) = literal::red; + k_old = keypoints.at(i); + keypoints.at(i--) = k; + } + + std::cout << std::endl; + } + else { - changeKeypoint(k, offset); + point2d p(k.getI(), k.getJ()); + extrema(p) = literal::red; } } } } -/*****************************************************************************/ -/*****************************************************************************/ -/*****************************************************************************/ - // Main entry point int main(int argc, char** argv) { @@ -624,18 +733,33 @@ int main(int argc, char** argv) std::vector< std::vector > dogSpace; std::vector<Keypoint> keypoints; I original; - C extrema; + C extrema, improved; + bool black = true; io::pgm::load(original, "images/lena.pgm"); + if (black) + { + initialize(extrema, original); + initialize(improved, original); + } + else + { + extrema = data::convert(value::rgb8(), original); + improved = data::convert(value::rgb8(), original); + } + // Localization buildScaleSpace(scaleSpace, original, octave_level, blur_level); buildDifferenceOfGaussianSpace(scaleSpace, dogSpace); buildExtrema(extrema, original, dogSpace, keypoints); - //discardLowContrastKeypoints(dogSpace, keypoints); + discardLowContrastKeypoints(dogSpace, keypoints, improved); // Processing // TODO + io::ppm::save(extrema, "output/extrema.ppm"); + io::ppm::save(improved, "output/extrema_improved.ppm"); + return 0; } diff --git a/milena/sandbox/anthony/src/matrix.cc b/milena/sandbox/anthony/src/matrix.cc index 1c5784d..ee00ffc 100644 --- a/milena/sandbox/anthony/src/matrix.cc +++ b/milena/sandbox/anthony/src/matrix.cc @@ -46,7 +46,6 @@ void Matrix::print() std::cout << std::endl; } - float Matrix::determinant() { float d1 = m.at(0).at(0) * m.at(1).at(1) * m.at(2).at(2); @@ -99,7 +98,6 @@ bool Matrix::inverse(Matrix& inversed) for (unsigned j = 0; j < comatrix.getHeight(); ++j) comatrix.set(i, j, comatrix.get(i,j) / det); - comatrix.print(); inversed = comatrix; canInverse = true; @@ -120,7 +118,33 @@ Matrix Matrix::operator*(Matrix& right) result.add(i, k, m.at(i).at(j) * right.get(j, k)); return result; -}; +} + +void Matrix::absolute() +{ + for (unsigned i = 0; i < height; ++i) + for (unsigned j = 0; j < width; ++j) + m.at(i).at(j) *= (m.at(i).at(j) >= 0) ? 1 : -1; +} + +bool Matrix::isMajorOffset() +{ + unsigned i = 0; + unsigned j = 0; + bool isMajorOffset = false; + + while (!isMajorOffset && i < height) + { + while (!isMajorOffset && j < width) + { + isMajorOffset = m.at(i).at(j) > 0.5 || - m.at(i).at(j) > 0.5; + ++j; + } + ++i; + } + + return isMajorOffset; +} // Getters and Setters unsigned Matrix::getHeight() { return height; } diff --git a/milena/sandbox/anthony/src/matrix.hh b/milena/sandbox/anthony/src/matrix.hh index b2ca124..de83912 100644 --- a/milena/sandbox/anthony/src/matrix.hh +++ b/milena/sandbox/anthony/src/matrix.hh @@ -13,8 +13,9 @@ class Matrix void initialize(); void initialize(float *values); void print(); - float determinant(); bool inverse(Matrix& inversed); + void absolute(); + bool isMajorOffset(); // Operators Matrix operator*(Matrix& right); @@ -30,6 +31,8 @@ class Matrix std::vector< std::vector<float> > m; unsigned height; unsigned width; + + float determinant(); }; #endif /* ! MATRIX_HH */ -- 1.7.2.5

11 years, 7 months

olena: branch sandbox/anthony updated: olena-2.0-594-g3748427

by git＠lrde.epita.fr

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 sandbox/anthony has been updated via 3748427f0634fa0a7e531042cba2bba85a93447a (commit) from 609a6a45b6b5d8725a1f7da78aa50604c841be44 (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 ----------------------------------------------------------------- 3748427 Add matrix class to handle Taylor approximation (dirty version) ----------------------------------------------------------------------- Summary of changes: 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 hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

olena: olena-2.0-594-g3748427 Add matrix class to handle Taylor approximation (dirty version)

by Anthony Seure

--- 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

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches May 2013