Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ambrosio-Tortorelli package #280

Merged
merged 52 commits into from
Nov 7, 2016
Merged

Conversation

JacquesOlivierLachaud
Copy link
Member

@JacquesOlivierLachaud JacquesOlivierLachaud commented Oct 16, 2016

Thanks a lot for contributing to DGtalTools, before submitting your PR, please fill up the description and make sure that all checkboxes are checked.

PR Description

This PR introduces the imageProcessing package for DGtalTools. It is composed of two programs and some helper classes to do image restoration (and inpainting) with Ambrosio-Tortorelli functional.

Checklist

  • Doxygen documentation of the code completed (classes, methods, types, members...).
  • Main tool doxygen documentation (following existing documentation of DGtalTools documentation.
  • Check if it follows the tools structure described in CONTRIBUTING.md
    Note: I propose to add a subdirectory imageProcessing
  • New entry in the ChangeLog.md added.
  • Update the readme with potentially a screenshot of the tools if it applies.
  • No warning raised in Debug cmake mode (otherwise, Travis C.I. will fail).

I think it is okay now. For the readme, I think I have to wait for a first generation of the documentation before adding snapshots.

@JacquesOlivierLachaud
Copy link
Member Author

Looks like the problem with Appveyor is related to boost program options. Perhaps there is something specific to do for VC++ ?

@dcoeurjo
Copy link
Member

Strange.. appveyor was fine with boost_programpotions in previous PR.. @kerautret, would you have an idea?

@kerautret
Copy link
Member

I look it but yes that is strange! ;(

@@ -47,7 +47,7 @@ SET(DGTALTOOLS_VERSION "${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.
SET(PROJECT_VERSION "${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH}")
SET(VERSION ${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH})

SET(Boost_USE_STATIC_LIBS ON)
SET(Boost_USE_STATIC_LIBS OFF)
SET(Boost_USE_MULTITHREADED ON)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JacquesOlivierLachaud I wonder if it is not related to this change (boost recommend to set it to true)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be that. I have to change it because I have a problem with boost static lib on my laptop.
I will try that.

@kerautret
Copy link
Member

the new error looks to be related to eigen that I have not tested in appveyor.
I try to looks it

@JacquesOlivierLachaud
Copy link
Member Author

Yes. I forgot to specify that we need Eigen for these two tools (because DEC needs Eigen).

Copy link
Member

@kerautret kerautret left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine just found some typos in doc.
I tested and I reproduce all contents ;)
Not read the details of code but we can merge I think

Discrete Hodge star operators \f$ \mathbf{\star} \f$ send \f$ k \f$-forms
of the primal complex \a K onto \f$ (n-k) \f$-forms of the dual complex
\a K'.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps precise also: $\bar{ \mathbf{\star} \f} $ for the dual .


A second possibility is to define \f$ u \f$ and \f$ g \f$ on the vertices
and \f$ v \f$ on the edges. We denote this formulation
AT10. Gray levels are seen as point mass on the center of pixels, so
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AT01 instead AT10

is a dual 1-form in between \f$ u \f$. It follows:
\f[
\displaystyle
AT10(u,v) = \Sigma_{i=1}^n
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Idem

& (2.2)
\end{array}\right.
\f]
for the derivative of AT10. Since all matrices are
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AT01

OPTIMIZE-AT01( (g_1, ..., g_N ): 0-forms,
(\alpha, \lambda, \varepsilon_1, \varepsilon_2, \varepsilon_r): reals );
\f$

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here after it proceed that on my doc: (with doxyen 1.8.11)
capture d ecran 2016-11-05 a 15 10 42


@subsection AT3_1 Some examples of restoration and discontinuity detections

We display below the different resconstruction of image "lena" with
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reconstructionS


[3] Marion Foare, Jacques-Olivier Lachaud, and Hugues Talbot. "Numerical
implementation of the Ambrosio-Tortorelli functional using discrete
calculus and application to image restoration and inpainting." ????
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can complete since accepted ;)
To appears to the first Workshop on Reproducible Reaseach In Pattern Recognition (RRPR 2016), Springer LNCS

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review. I look at it this afternoon.

@JacquesOlivierLachaud
Copy link
Member Author

Every comment has been addressed.

@kerautret
Copy link
Member

looks fine, thanks, going to merge just waiting for travis ;)

@kerautret kerautret merged commit b7c54db into DGtal-team:master Nov 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants