Olena-patches July 2013

olena-patches@lrde.epita.fr

6 participants
109 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.

10 years, 8 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.

10 years, 8 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.

10 years, 8 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.

10 years, 8 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.

10 years, 8 months

olena: branch sandbox/anthony updated: olena-2.0-603-gbc40c1b

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 bc40c1bcd0075922ff6620e7f51397abc0d79c3d (commit) via 3afeb98c8ca527f142d52eb95ec6b1e37a5d4f5a (commit) from dd94dbd31e4982a8e33fc948391eaac6c378f754 (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 ----------------------------------------------------------------- bc40c1b [SIFT] Add keypoint interpolation + Low contrast elimination 3afeb98 [SIFT] Switch OpenCV implementation compilator (clang++ instead of g++) ----------------------------------------------------------------------- Summary of changes: milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/opencv/Makefile | 15 +- milena/sandbox/anthony/src/dog-space.hh | 545 ++++++++++++++++++++----------- milena/sandbox/anthony/src/keypoint.hh | 2 + milena/sandbox/anthony/src/main.cc | 9 +- milena/sandbox/anthony/src/matrix.cc | 50 +++ milena/sandbox/anthony/src/matrix.hh | 2 + 7 files changed, 426 insertions(+), 199 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 9 months

olena: olena-2.0-603-gbc40c1b [SIFT] Add keypoint interpolation + Low contrast elimination

by Anthony Seure

--- milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/src/dog-space.hh | 545 ++++++++++++++++++++----------- milena/sandbox/anthony/src/keypoint.hh | 2 + milena/sandbox/anthony/src/main.cc | 9 +- milena/sandbox/anthony/src/matrix.cc | 50 +++ milena/sandbox/anthony/src/matrix.hh | 2 + 6 files changed, 418 insertions(+), 192 deletions(-) diff --git a/milena/sandbox/anthony/Makefile b/milena/sandbox/anthony/Makefile index 5441d9a..44edf3b 100644 --- a/milena/sandbox/anthony/Makefile +++ b/milena/sandbox/anthony/Makefile @@ -2,7 +2,7 @@ CCACHE= CC=g++ CFLAGS=-Wall -Wextra CLIBS=-I../../ -CLEAN=*.o output/* log debug_* +CLEAN=*.o output/* log SRC=src/main.cc src/matrix.cc OUTPUT=a.out diff --git a/milena/sandbox/anthony/src/dog-space.hh b/milena/sandbox/anthony/src/dog-space.hh index a93b52a..da35820 100644 --- a/milena/sandbox/anthony/src/dog-space.hh +++ b/milena/sandbox/anthony/src/dog-space.hh @@ -15,219 +15,384 @@ #include "scale-space.hh" #include "keypoint.hh" +#include "matrix.hh" using namespace mln; template<typename I, typename S> class DoGSpace : protected ScaleSpace<S> { - public: - DoGSpace(ScaleSpace* _ss) - { - ss = _ss; - } - - ~DoGSpace() - { - ScaleSpace<S>::~ScaleSpace(); - } - - void build(void) - { - ScaleSpace<S>::o = ss->octave_count(); - ScaleSpace<S>::g = ss->gradient_count() - 1; - - typedef typename std::vector< std::vector >::iterator PIT; - typedef typename std::vector::iterator IIT; - - std::vector< std::vector > sspyramid = ss->getPyramid(); - S dog; - - for (PIT pit = sspyramid.begin(); pit != sspyramid.end(); ++pit) - { - std::vector<S> octave; - for (IIT iit = pit->begin(); (iit + 1) != pit->end(); ++iit) + public: + DoGSpace(ScaleSpace* _ss) { - initialize(dog, *iit); - mln_piter(I) p(iit->domain()); + ss = _ss; + } - for_all(p) - { - value::int_s16 up = (value::int_s16) (*iit)(p); - value::int_s16 down = (value::int_s16) (*(iit+1))(p); - value::int_s16 diff = down - up; - //value::int_s16 diff = ( (int) (*iit)(p) ) - ( (int) ((*(iit+1))(p)) ); + ~DoGSpace() + { + ScaleSpace<S>::~ScaleSpace(); + } + + void build(void) + { + ScaleSpace<S>::o = ss->octave_count(); + ScaleSpace<S>::g = ss->gradient_count() - 1; - //std::cout << up << " - " << down << " = " << diff << std::endl; + typedef typename std::vector< std::vector >::iterator PIT; + typedef typename std::vector::iterator IIT; - dog(p) = diff; - } - octave.push_back(dog); + std::vector< std::vector > sspyramid = ss->getPyramid(); + S dog; + + for (PIT pit = sspyramid.begin(); pit != sspyramid.end(); ++pit) + { + std::vector<S> octave; + for (IIT iit = pit->begin(); (iit + 1) != pit->end(); ++iit) + { + initialize(dog, *iit); + mln_piter(I) p(iit->domain()); + + for_all(p) + { + value::int_s16 up = (value::int_s16) (*iit)(p); + value::int_s16 down = (value::int_s16) (*(iit+1))(p); + value::int_s16 diff = down - up; + //value::int_s16 diff = ( (int) (*iit)(p) ) - ( (int) ((*(iit+1))(p)) ); + + //std::cout << up << " - " << down << " = " << diff << std::endl; + + dog(p) = diff; + } + octave.push_back(dog); + } + ScaleSpace<S>::pyramid.push_back(octave); + } } - ScaleSpace<S>::pyramid.push_back(octave); - } - } - - void findKeypoints(std::list<Keypoint>& keypoints) - { - typedef typename std::vector< std::vector<S> >::iterator PIT; - typedef typename std::vector<S>::iterator IIT; - - unsigned octave = 0; - for (PIT pit = ScaleSpace<S>::pyramid.begin(); pit != ScaleSpace<S>::pyramid.end(); ++pit) - { - unsigned gradient = 1; - for (IIT iit = pit->begin() + 1; (iit + 1) != pit->end(); ++iit) + + void findKeypoints(std::list<Keypoint>& keypoints) { - S upper = *(iit-1); - S current = *iit; - S lower = *(iit+1); + typedef typename std::vector< std::vector<S> >::iterator PIT; + typedef typename std::vector<S>::iterator IIT; - mln_piter(I) p(current.domain()); + unsigned octave = 0; + for (PIT pit = ScaleSpace<S>::pyramid.begin(); pit != ScaleSpace<S>::pyramid.end(); ++pit) + { + unsigned gradient = 1; + for (IIT iit = pit->begin() + 1; (iit + 1) != pit->end(); ++iit) + { + S upper = *(iit-1); + S current = *iit; + S lower = *(iit+1); + + mln_piter(I) p(current.domain()); + + for_all(p) + { + value::int_s16 center = current(p); + value::int_s16 min = 255; + value::int_s16 max = -256; + mln_niter(neighb2d) n(c8(), p); + + int extrema = isExtrema(current, center, n); + + if (extrema == -1) // Is a minimum + { + findMin(min, lower, upper, p, n); + if (center < min) + keypoints.push_back(Keypoint(p.col(), p.row(), octave, gradient, false)); + } + else if (extrema == 1) // Is a maximum + { + findMax(max, lower, upper, p, n); + if (center > max) + keypoints.push_back(Keypoint(p.col(), p.row(), octave, gradient, true)); + } + } + + ++gradient; + } + + ++octave; + } + } - for_all(p) - { - value::int_s16 center = current(p); - value::int_s16 min = 255; - value::int_s16 max = -256; - mln_niter(neighb2d) n(c8(), p); + void discardLowContrastKeypoints(std::list<Keypoint>& keypoints) + { + const static unsigned max_interpolation_depth = 5; + unsigned count = 0; + bool enough = false; + std::list<Keypoint>::iterator k = keypoints.begin(); + Matrix* offset = NULL; + Matrix* previous_offset = NULL; + + while (k != keypoints.end()) + { + while (!enough && count < max_interpolation_depth) + { + std::cout << "test1" << std::endl; + unsigned octave = k->getOctave(); + unsigned gradient = k->getGradient(); + S dog = ScaleSpace<S>::pyramid[octave][gradient]; + S dog_up = ScaleSpace<S>::pyramid[octave][gradient + 1]; + S dog_down = ScaleSpace<S>::pyramid[octave][gradient - 1]; + unsigned col = k->getX(); + unsigned row = k->getY(); + std::cout << "test2" << std::endl; + + /* Set the neighbors of the current level: + * n5 n1 n6 + * n2 p n3 + * n7 n4 n8 + */ + float p = dog(mln_psite(S)(row, col)); + + float n1 = dog(mln_psite(S)(row - 1, col)); + float n2 = dog(mln_psite(S)(row, col - 1)); + float n3 = dog(mln_psite(S)(row, col + 1)); + float n4 = dog(mln_psite(S)(row + 1, col)); + + float n5 = dog(mln_psite(S)(row - 1, col - 1)); + float n6 = dog(mln_psite(S)(row - 1, col + 1)); + float n7 = dog(mln_psite(S)(row + 1, col - 1)); + float n8 = dog(mln_psite(S)(row + 1, col + 1)); + + /* Set the neighbors of the upper level: + * u1 + * u2 u u3 + * u4 + */ + float u = dog_up(mln_psite(S)(row, col)); + float u1 = dog_up(mln_psite(S)(row - 1, col)); + float u2 = dog_up(mln_psite(S)(row, col - 1)); + float u3 = dog_up(mln_psite(S)(row, col + 1)); + float u4 = dog_up(mln_psite(S)(row + 1, col)); + + /* Set the neighbors of the lower level: + * l1 + * l2 l l3 + * l4 + */ + float l = dog_down(mln_psite(S)(row, col)); + float l1 = dog_down(mln_psite(S)(row - 1, col)); + float l2 = dog_down(mln_psite(S)(row, col - 1)); + float l3 = dog_down(mln_psite(S)(row, col + 1)); + float l4 = dog_down(mln_psite(S)(row + 1, col)); + + // Compute the offset + + float dxx = n3 - 2.0 * p + n2; + float dyy = n4 - 2.0 * p + n1; + float dss = u - 2.0 * p + l; + + float dxy = (n8 - n6 - n7 + n5) / 4.0; + float dxs = (u3 - u2 - l3 + l2) / 4.0; + float dys = (u4 - u1 - l4 + l1) / 4.0; + + std::cout << "test3" << std::endl; + Matrix m1(3, 1); + m1.initialize(); + m1.set(0, 0, n3 - n2); + m1.set(1, 0, n4 - n1); + m1.set(2, 0, u - l); + + Matrix m2(3, 3); + m2.initialize(); + m2.set(0, 0, dxx); m2.set(0, 1, dxy); m2.set(0, 2, dxs); + m2.set(1, 0, dxy); m2.set(1, 1, dyy); m2.set(1, 2, dys); + m2.set(2, 0, dxs); m2.set(2, 1, dys); m2.set(2, 2, dss); + + std::cout << "test4" << std::endl; + previous_offset = offset; + offset = m2.solve3x3(m1); + std::cout << "test5" << std::endl; + + if (offset == NULL) + { + offset = previous_offset; + enough = true; + } + else + { + if (std::abs(offset->get(0,0)) > 0.5 || + std::abs(offset->get(1,0)) > 0.5 || + std::abs(offset->get(2,0)) > 0.5) + { + std::cout << "test51" << std::endl; + ++count; + k->setX(k->getX() + (int) offset->get(0, 0)); + k->setY(k->getX() + (int) offset->get(1, 0)); + k->setGradient(k->getGradient() + (int) offset->get(1, 0)); + + //FIXME Check boundaries + + if (k->getGradient() < 1 || + k->getGradient() >= ScaleSpace<S>::pyramid[0].size() - 1) + count = max_interpolation_depth; // Remove keypoint + } + else + { + std::cout << "test52" << std::endl; + enough = true; + } + } + } + + std::cout << "test6" << std::endl; + if (count >= max_interpolation_depth) + { + std::cout << "test61" << std::endl; + k = keypoints.erase(k); + } + else + { + std::cout << "test62" << std::endl; + unsigned octave = k->getOctave(); + unsigned gradient = k->getGradient(); + + S dog = ScaleSpace<S>::pyramid[octave][gradient]; + S dog_up = ScaleSpace<S>::pyramid[octave][gradient + 1]; + S dog_down = ScaleSpace<S>::pyramid[octave][gradient - 1]; + unsigned col = k->getX(); + unsigned row = k->getY(); + + /* Set the neighbors of the current level: + * n1 + * n2 p n3 + * n4 + */ + float p = dog(mln_psite(S)(row, col)); + + float n1 = dog(mln_psite(S)(row - 1, col)); + float n2 = dog(mln_psite(S)(row, col - 1)); + float n3 = dog(mln_psite(S)(row, col + 1)); + float n4 = dog(mln_psite(S)(row + 1, col)); + + // Set the neighbors of the upper/lower level: + float u = dog_up(mln_psite(S)(row, col)); + float l = dog_down(mln_psite(S)(row, col)); + + Matrix firstOrder(3, 1); + firstOrder.initialize(); + + /************ WARNING ************/ + /* Maybe missing /255 */ + /*********************************/ + + firstOrder.set(0, 0, n3 - n2); + firstOrder.set(1, 0, n4 - n1); + firstOrder.set(2, 0, u - l); + + float product = firstOrder.dotProduct(offset); + float contrast = p + product / 2.0; + + if (contrast < 0.03) + k = keypoints.erase(k); + else + k++; + } + + enough = false; + count = 0; + } + } - int extrema = isExtrema(current, center, n); + void eliminateEdgeResponses(std::list<Keypoint>& keypoints) + { + const static float bound_ratio = 12.1; - if (extrema == -1) // Is a minimum + for (std::list<Keypoint>::iterator k = keypoints.begin(); + k != keypoints.end(); ++k) { - findMin(min, lower, upper, p, n); - if (center < min) - keypoints.push_back(Keypoint(p.col(), p.row(), octave, gradient, false)); + unsigned octave = k->getOctave(); + unsigned gradient = k->getGradient(); + S dog = ScaleSpace<S>::pyramid[octave][gradient]; + unsigned col = k->getX(); + unsigned row = k->getY(); + + /* Set the neighbors: + * n5 n1 n6 + * n2 p n3 + * n7 n4 n8 + */ + float p = dog(mln_psite(S)(row, col)); + + float n1 = dog(mln_psite(S)(row - 1, col)); + float n2 = dog(mln_psite(S)(row, col - 1)); + float n3 = dog(mln_psite(S)(row, col + 1)); + float n4 = dog(mln_psite(S)(row + 1, col)); + + float n5 = dog(mln_psite(S)(row - 1, col - 1)); + float n6 = dog(mln_psite(S)(row - 1, col + 1)); + float n7 = dog(mln_psite(S)(row + 1, col - 1)); + float n8 = dog(mln_psite(S)(row + 1, col + 1)); + + // Set Hessian matrix and find the ratio + + float dxx = n3 - 2.0 * p + n2; + float dyy = n4 - 2.0 * p + n1; + float dxy = (n8 - n6 - n7 + n5) / 4.0; + + float trace = dxx + dyy; + float determinant = dxx * dyy - dxy * dxy; + float ratio = (trace * trace) / determinant; + + if (determinant <= 0 || ratio >= bound_ratio) + keypoints.erase(k); } - else if (extrema == 1) // Is a maximum + } + + virtual void save() + { + } + + private: + ScaleSpace* ss; + + int isExtrema(S& current, value::int_s16& center, + typename neighb2d::fwd_niter n) + { + bool min = true; + bool max = true; + + for_all(n) { - findMax(max, lower, upper, p, n); - if (center > max) - keypoints.push_back(Keypoint(p.col(), p.row(), octave, gradient, true)); + min = (min && center < current(n)); + max = (max && center > current(n)); } - } - ++gradient; + if (min) + return -1; + else if (max) + return 1; + else + return 0; + } + + void findMin(value::int_s16& min, S& lower, S& upper, + typename S::piter& p, typename neighb2d::fwd_niter& n) + { + min = (lower(p) < min) ? lower(p) : min; + min = (upper(p) < min) ? upper(p) : min; + + for_all(n) + { + min = (lower(n) < min) ? lower(n) : min; + min = (upper(n) < min) ? upper(n) : min; + } } - ++octave; - } - } - - void discardLowContrastKeypoints(std::list<Keypoint>& keypoints) - { - keypoints = keypoints; - } - - void eliminateEdgeResponses(std::list<Keypoint>& keypoints) - { - const static float bound_ratio = 12.1; - - for (std::list<Keypoint>::iterator k = keypoints.begin(); - k != keypoints.end(); ++k) - { - unsigned octave = k->getOctave(); - unsigned gradient = k->getGradient(); - S dog = ScaleSpace<S>::pyramid[octave][gradient]; - unsigned col = k->getX(); - unsigned row = k->getY(); - - /* Set the neighbors: - * n5 n1 n6 - * n2 p n3 - * n7 n4 n8 - */ - float p = dog(mln_psite(S)(row, col)); - - float n1 = dog(mln_psite(S)(row - 1, col)); - float n2 = dog(mln_psite(S)(row, col - 1)); - float n3 = dog(mln_psite(S)(row, col + 1)); - float n4 = dog(mln_psite(S)(row + 1, col)); - - float n5 = dog(mln_psite(S)(row - 1, col - 1)); - float n6 = dog(mln_psite(S)(row - 1, col + 1)); - float n7 = dog(mln_psite(S)(row + 1, col - 1)); - float n8 = dog(mln_psite(S)(row + 1, col + 1)); - - // Set Hessian matrix and find the ratio - - float dxx = n3 - 2.0 * p + n2; - float dyy = n4 - 2.0 * p + n1; - float dxy = (n8 - n6 - n7 + n5) / 4.0; - - float trace = dxx + dyy; - float determinant = dxx * dyy - dxy * dxy; - float ratio = (trace * trace) / determinant; - - if (determinant <= 0 || ratio >= bound_ratio) - keypoints.erase(k); - } - } - - virtual void save() - { - //std::stringstream name; - - //for (unsigned i = 0; i < ScaleSpace<S>::pyramid.size(); ++i) - //{ - //for (unsigned j = 0; j < ScaleSpace<S>::pyramid[i].size(); ++j) - //{ - //name << "output/dogs-o" <::pyramid[i][j], name.str()); - //name.str(""); - //} - //} - } - - private: - ScaleSpace* ss; - - int isExtrema(S& current, value::int_s16& center, - typename neighb2d::fwd_niter n) - { - bool min = true; - bool max = true; - - for_all(n) - { - min = (min && center < current(n)); - max = (max && center > current(n)); - } - - if (min) - return -1; - else if (max) - return 1; - else - return 0; - } - - void findMin(value::int_s16& min, S& lower, S& upper, - typename S::piter& p, typename neighb2d::fwd_niter& n) - { - min = (lower(p) < min) ? lower(p) : min; - min = (upper(p) < min) ? upper(p) : min; - - for_all(n) - { - min = (lower(n) < min) ? lower(n) : min; - min = (upper(n) < min) ? upper(n) : min; - } - } - - void findMax(value::int_s16& max, S& lower, S& upper, - typename S::piter& p, typename neighb2d::fwd_niter& n) - { - max = (lower(p) > max) ? lower(p) : max; - max = (upper(p) > max) ? upper(p) : max; - - for_all(n) - { - max = (lower(n) > max) ? lower(n) : max; - max = (upper(n) > max) ? upper(n) : max; - } - } + void findMax(value::int_s16& max, S& lower, S& upper, + typename S::piter& p, typename neighb2d::fwd_niter& n) + { + max = (lower(p) > max) ? lower(p) : max; + max = (upper(p) > max) ? upper(p) : max; + + for_all(n) + { + max = (lower(n) > max) ? lower(n) : max; + max = (upper(n) > max) ? upper(n) : max; + } + } }; #endif /* ! DOG_SPACE_HH */ diff --git a/milena/sandbox/anthony/src/keypoint.hh b/milena/sandbox/anthony/src/keypoint.hh index b6b2415..9ea86ca 100644 --- a/milena/sandbox/anthony/src/keypoint.hh +++ b/milena/sandbox/anthony/src/keypoint.hh @@ -26,8 +26,10 @@ class Keypoint inline void setX(int _x) { x = _x; } inline void setY(int _y) { y = _y; } + inline void setGradient(int _gradient) { gradient = _gradient; } inline void setOrientation(float _o) { orientation = _o; } + friend std::ostream& operator<< (std::ostream& stream, const Keypoint& k) { stream << "(" << k.getX() << "," << k.getY() << ")" diff --git a/milena/sandbox/anthony/src/main.cc b/milena/sandbox/anthony/src/main.cc index afbb476..5cf4860 100644 --- a/milena/sandbox/anthony/src/main.cc +++ b/milena/sandbox/anthony/src/main.cc @@ -55,11 +55,18 @@ int main(void) writeKeypoints(keypoints, extrema, extrema_b); + std::cout << "BEFORE: Low contrast discarding: " << keypoints.size() << std::endl; dogs->discardLowContrastKeypoints(keypoints); - dogs->eliminateEdgeResponses(keypoints); + std::cout << "AFTER: Low contrast discarding: " << keypoints.size() << std::endl; + + std::cout << "BEFORE: Elimination of edge responses: " << keypoints.size() << std::endl; + //dogs->eliminateEdgeResponses(keypoints); + std::cout << "AFTER: Elimination of edge responses: " << keypoints.size() << std::endl; writeKeypoints(keypoints, extrema2, extrema2_b); + //writeKeypoints(keypoints, extrema2, extrema2_b); + // Save io::ppm::save(extrema, "output/extrema.ppm"); io::ppm::save(extrema_b, "output/extrema_b.ppm"); diff --git a/milena/sandbox/anthony/src/matrix.cc b/milena/sandbox/anthony/src/matrix.cc index ee00ffc..77b77c5 100644 --- a/milena/sandbox/anthony/src/matrix.cc +++ b/milena/sandbox/anthony/src/matrix.cc @@ -106,6 +106,56 @@ bool Matrix::inverse(Matrix& inversed) return canInverse; } +Matrix* Matrix::solve3x3(Matrix& b) +{ + Matrix* solution = NULL; + float det = determinant(); + + if (det > 0.1 || det < -0.1) + { + solution = new Matrix(3, 1); + solution->initialize(); + + float x = b.get(0, 0); + float y = b.get(1, 0); + float z = b.get(2, 0); + + Matrix m1(3, 3); + m1.initialize(); + m1.set(0, 0, x); m1.set(0, 1, m[0][1]); m1.set(0, 2, m[0][2]); + m1.set(1, 0, y); m1.set(1, 1, m[1][1]); m1.set(1, 2, m[1][2]); + m1.set(2, 0, z); m1.set(2, 1, m[2][1]); m1.set(2, 2, m[2][2]); + float d1 = m1.determinant(); + + Matrix m2(3, 3); + m2.initialize(); + m2.set(0, 0, m[0][0]); m2.set(0, 1, x); m2.set(0, 2, m[0][2]); + m2.set(1, 0, m[1][0]); m2.set(1, 1, y); m2.set(1, 2, m[1][2]); + m2.set(2, 0, m[2][0]); m2.set(2, 1, z); m2.set(2, 2, m[2][2]); + float d2 = m2.determinant(); + + Matrix m3(3, 3); + m3.initialize(); + m3.set(0, 0, m[0][0]); m3.set(0, 1, m[0][1]); m3.set(0, 2, x); + m3.set(1, 0, m[1][0]); m3.set(1, 1, m[1][1]); m3.set(1, 2, y); + m3.set(2, 0, m[2][0]); m3.set(2, 1, m[2][1]); m3.set(2, 2, z); + float d3 = m3.determinant(); + + solution->set(0, 0, d1 / det); + solution->set(1, 0, d2 / det); + solution->set(2, 0, d3 / det); + } + + return solution; +} + +float Matrix::dotProduct(Matrix* vec) +{ + return (m[0][0] * vec->get(0, 0) + + m[1][0] * vec->get(1, 0) + + m[2][0] * vec->get(2, 0)); +} + // Operators Matrix Matrix::operator*(Matrix& right) { diff --git a/milena/sandbox/anthony/src/matrix.hh b/milena/sandbox/anthony/src/matrix.hh index c42de59..795f5d6 100644 --- a/milena/sandbox/anthony/src/matrix.hh +++ b/milena/sandbox/anthony/src/matrix.hh @@ -17,6 +17,8 @@ class Matrix void absolute(); bool isMajorOffset(); float determinant(); + Matrix* solve3x3(Matrix& b); + float dotProduct(Matrix* vec); // Operators Matrix operator*(Matrix& right); -- 1.7.10.4

10 years, 9 months

*****SPAM***** Great Opportunity - Environmental Company Expanding and Looking for Reps

by olena-patches＠lrde.epita.fr

Environmental enterprise searching for representation internationally 5% commission on 200K cash flow originated from promotion and sales of proprietary research articles Necessary conditions: - Own a company - Be reachable on daily basis through E-mail, phone or Skype - Proper execution of all planned undertakings In case if being interested, please provide: - Name and Surname - Age - Telephone number (including country code) - City and Country - Email Please answer to: Rufus(a)googleapps-consult.com Faithfully yours, HR dept

10 years, 9 months

olena: branch next updated: olena-2.0-589-g19cf0bf

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 next has been updated via 19cf0bfdd73f029d2e92843a587d3d9148c62f6c (commit) via 215777f7213dc458fc16299b95a05a777a023e48 (commit) via 28582ba9109d77a6979472f95e6797308e55674f (commit) via 77cc306a85e350e52ec09390e237e1ff6601760c (commit) from 45b2fd98e041d1988cbf3112ba96bb1a285ee4fb (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 48 ++++++++++++++++++++ scribo/headers.mk | 3 ++ scribo/{src => scribo}/afp/components.hh | 8 ++-- scribo/{src => scribo}/afp/link.hh | 11 +++-- scribo/{src => scribo}/afp/regroup.hh | 9 ++-- scribo/scribo/filter/object_groups_with_holes.hh | 2 +- .../primitive/regroup/from_single_left_link.hh | 4 +- .../toolchain/internal/text_in_picture_functor.hh | 44 ++++++++++-------- scribo/src/Makefile.am | 8 +--- scribo/src/text_recognition_in_picture.cc | 4 +- scribo/tests/unit_test/unit-tests.mk | 3 ++ 11 files changed, 103 insertions(+), 41 deletions(-) rename scribo/{src => scribo}/afp/components.hh (96%) rename scribo/{src => scribo}/afp/link.hh (94%) rename scribo/{src => scribo}/afp/regroup.hh (94%) hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 9 months

olena: branch fixes updated: olena-2.0-589-g19cf0bf

by git＠lrde.epita.fr

10 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches July 2013