From 538190cd74abe3f8d0ca6ac37554a5f7108fda80 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 24 Jan 2017 09:11:15 +0100 Subject: [PATCH 01/10] Preparing 0.9.3 --- CMakeLists.txt | 2 +- ChangeLog.md | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb5232c281..874f73bf73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ ENDIF() SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") SET(DGtal_VERSION_MAJOR 0) SET(DGtal_VERSION_MINOR 9) -SET(DGtal_VERSION_PATCH 3beta) +SET(DGtal_VERSION_PATCH 3) SET(DGTAL_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}") SET(PROJECT_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}") SET(VERSION ${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}) diff --git a/ChangeLog.md b/ChangeLog.md index 5d78fc8426..d553715251 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,16 +1,13 @@ - # DGtal 0.9.3 +# DGtal 0.9.3 ## New Features / Critical Changes - *Configuration/General* - - Set flag -std=c++11 only if needed. Modern compilers set compatible flags - by default (gnu++14, etc). (Pablo H Cerdan, - [#1222](https://github.com/DGtal-team/DGtal/pull/1222)) - The project has a now a unique compiled library: DGtal. The DGtalIO target has been removed. (David Coeurjolly, [#1226](https://github.com/DGtal-team/DGtal/pull/1226)) - New mandatory dependency for DGtal: zlib must be installed in the system. - (David Coeurjolly, #1228](https://github.com/DGtal-team/DGtal/pull/1228)) + (David Coeurjolly, [#1228](https://github.com/DGtal-team/DGtal/pull/1228)) - *Geometry Package* - VoronoiMap, PowerMap, (Reverse)DistanceTransformation and ReducedMedialAxis @@ -20,13 +17,16 @@ - *IO* - New version (3) for the VOL file format that allows (zlib) compressed volumetric data. VolReady and VolWriter can still manage Version 2 Vols. - (David Coeurjolly, #1228](https://github.com/DGtal-team/DGtal/pull/1228)) + (David Coeurjolly, [#1228](https://github.com/DGtal-team/DGtal/pull/1228)) ## Changes - - *Configuration/General* - - Continuous integration Travis bots are now based on ubunutu/trusty containers. - (David Coeurjolly, [#1227](https://github.com/DGtal-team/DGtal/pull/1208)) +- *Configuration/General* + - Continuous integration Travis bots are now based on ubunutu/trusty containers. + (David Coeurjolly, [#1227](https://github.com/DGtal-team/DGtal/pull/1208)) + - Set flag -std=c++11 only if needed. Modern compilers set compatible flags + by default (gnu++14, etc). (Pablo H Cerdan, + [#1222](https://github.com/DGtal-team/DGtal/pull/1222)) ## Bug Fixes From 9452b673f11c0c4eed8b79d3b3d117393a415cee Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 24 Jan 2017 09:17:25 +0100 Subject: [PATCH 02/10] reodering --- ChangeLog.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index d553715251..e132f6b4b4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,11 +9,17 @@ - New mandatory dependency for DGtal: zlib must be installed in the system. (David Coeurjolly, [#1228](https://github.com/DGtal-team/DGtal/pull/1228)) +- *Topology Package* + - Implementation of ParDirCollapse with CollapseSurface and CollapseIsthmus. + (Mohamad ONAYSSI, Bibiana MARTINEZ, Mohamed MELLOULI, Kacper PLUTA, + [#1199](https://github.com/DGtal-team/DGtal/pull/1199)) + - *Geometry Package* - VoronoiMap, PowerMap, (Reverse)DistanceTransformation and ReducedMedialAxis now work on toric domains (with per-dimension periodicity specification). (David Coeurjolly, Roland Denis, [#1206](https://github.com/DGtal-team/DGtal/pull/1206)) + - *IO* - New version (3) for the VOL file format that allows (zlib) compressed volumetric data. VolReady and VolWriter can still manage Version 2 Vols. @@ -49,10 +55,6 @@ - Viewer3D: fix bad rendering when changing the scale. (Bertrand Kerautret, [#1217](https://github.com/DGtal-team/DGtal/pull/1217)) -- *Topology Package* - - Implementation of ParDirCollapse with CollapseSurface and CollapseIsthmus. - (Mohamad ONAYSSI, Bibiana MARTINEZ, Mohamed MELLOULI, Kacper PLUTA, - [#1199](https://github.com/DGtal-team/DGtal/pull/1199)) # DGtal 0.9.2 From dac83e0f6cfb15b9c15afa6dceb6b00dbba32855 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 24 Jan 2017 11:19:01 +0100 Subject: [PATCH 03/10] cleanup --- .travis/main_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/main_build.sh b/.travis/main_build.sh index de95102192..2725e4e33b 100755 --- a/.travis/main_build.sh +++ b/.travis/main_build.sh @@ -20,7 +20,7 @@ echo "NeedExample $NEEDEXAMPLESANDTESTS" ### DGtal Examples and Examples if [ $NEEDEXAMPLESANDTESTS = "true" ]; then - cd examples ; make -j 3 ; echo "PWD"; pwd ; ls -l .. + cd examples ; make -j 3 cd ../tests ; make -j 3 make test ARGS=--output-on-failure fi From 8bb132cb99ca453d432b0a0d3ffe05635a02c685 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 25 Jan 2017 12:25:21 +0100 Subject: [PATCH 04/10] simplifying build on mac --- .travis/install_deps_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install_deps_macos.sh b/.travis/install_deps_macos.sh index ae11117f2d..07172373d2 100755 --- a/.travis/install_deps_macos.sh +++ b/.travis/install_deps_macos.sh @@ -5,7 +5,7 @@ # brew update #brew install qt5 doxygen homebrew/science/hdf5 graphviz graphicsmagick fftw eigen homebrew/boneyard/libqglviewer -brew install qt5 doxygen graphviz graphicsmagick fftw eigen homebrew/boneyard/libqglviewer +brew install qt5 graphicsmagick fftw eigen homebrew/boneyard/libqglviewer ## Temporary HDF5 build issue export BTYPE="$BTYPE -DWITH_HDF5=false" && echo "Disabling HDF5 on MacOS"; From 2260a678c11a8680cf2144bb8b643df63928824e Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Mon, 30 Jan 2017 13:51:46 +0100 Subject: [PATCH 05/10] Parallel make test --- .travis/main_build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis/main_build.sh b/.travis/main_build.sh index 2725e4e33b..db0e851bdb 100755 --- a/.travis/main_build.sh +++ b/.travis/main_build.sh @@ -7,22 +7,22 @@ cd build ### Cmake echo "Using C++ = $CXXCOMPILER" -cmake .. $BTYPE -DCMAKE_CXX_COMPILER=$CXXCOMPILER -DCMAKE_C_COMPILER=$CCOMPILER +cmake .. $BTYPE -DCMAKE_CXX_COMPILER=$CXXCOMPILER -DCMAKE_C_COMPILER=$CCOMPILER ### DGtal Core build if [ $NEEDCORE = "true" ]; then - make -j 3 DGtal + make -j 3 DGtal fi echo "NeedExample $NEEDEXAMPLESANDTESTS" ### DGtal Examples and Examples if [ $NEEDEXAMPLESANDTESTS = "true" ]; then - cd examples ; make -j 3 + cd examples ; make -j 3 cd ../tests ; make -j 3 - make test ARGS=--output-on-failure + ctest -j 3--output-on-failure fi ### DGtal doc From 70f1c7084d2c62aa1cd11561d355eeaf0c7d0101 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Thu, 2 Feb 2017 09:59:31 +0100 Subject: [PATCH 06/10] Warnings --- examples/dec/exampleDECSurface.cpp | 9 ++++----- examples/dec/exampleDiscreteExteriorCalculusSolve.cpp | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/dec/exampleDECSurface.cpp b/examples/dec/exampleDECSurface.cpp index 5c66c29676..b07aaceded 100644 --- a/examples/dec/exampleDECSurface.cpp +++ b/examples/dec/exampleDECSurface.cpp @@ -22,20 +22,20 @@ struct FalseOutsideDomain typedef typename Predicate::Point Point; - FalseOutsideDomain(DGtal::ConstAlias predicate, DGtal::ConstAlias domain) : - predicate(&predicate), domain(&domain) + FalseOutsideDomain(DGtal::ConstAlias predicate, DGtal::ConstAlias adomain) : + predicate(&predicate), myDomain(&adomain) { } bool operator()(const Point& point) const { - if (!domain->isInside(point)) return false; + if (!myDomain->isInside(point)) return false; return (*predicate)(point); } const Predicate* predicate; - const Domain* domain; + const Domain* myDomain; }; void @@ -301,4 +301,3 @@ int main(int argc, char* argv[]) return app.exec(); } - diff --git a/examples/dec/exampleDiscreteExteriorCalculusSolve.cpp b/examples/dec/exampleDiscreteExteriorCalculusSolve.cpp index 85ea9f02ae..3019ffc3a0 100644 --- a/examples/dec/exampleDiscreteExteriorCalculusSolve.cpp +++ b/examples/dec/exampleDiscreteExteriorCalculusSolve.cpp @@ -844,7 +844,7 @@ void solve3d_decomposition() { const int degree = laplace_diag[kk]; ASSERT( degree >= 0 ); - ASSERT( degree < degrees.size() ); + ASSERT( static_cast(degree) < degrees.size() ); degrees[degree] ++; } @@ -962,4 +962,3 @@ int main(int argc, char* argv[]) return app.exec(); } - From 30e5ab275f2f56d83fc6a4aff5ee2364e6e8d297 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 7 Feb 2017 10:37:39 +0100 Subject: [PATCH 07/10] Fixing tuto --- examples/tutorial-examples/shapeGridCurveEstimator.cpp | 6 +++--- src/DGtal/doc/tutorials/tutoShapeGridCurveEstimator.dox | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/tutorial-examples/shapeGridCurveEstimator.cpp b/examples/tutorial-examples/shapeGridCurveEstimator.cpp index 05f0219bbd..97f9d09d92 100644 --- a/examples/tutorial-examples/shapeGridCurveEstimator.cpp +++ b/examples/tutorial-examples/shapeGridCurveEstimator.cpp @@ -70,12 +70,12 @@ using namespace DGtal; int main() { //shape - typedef Flower2D Flower; - Flower2D flower(Z2i::Point(0,0), 20, 5, 5, 0); - //! [shapeGridCurveEstimator-dig] //implicit digitization of a shape of type Flower //into a digital space of type Space + typedef Flower2D Flower; + Flower2D flower(Z2i::Point(0,0), 20, 5, 5, 0); + double h = 1; GaussDigitizer dig; dig.attach( flower ); diff --git a/src/DGtal/doc/tutorials/tutoShapeGridCurveEstimator.dox b/src/DGtal/doc/tutorials/tutoShapeGridCurveEstimator.dox index 51b4721de9..0f328ce3c3 100644 --- a/src/DGtal/doc/tutorials/tutoShapeGridCurveEstimator.dox +++ b/src/DGtal/doc/tutorials/tutoShapeGridCurveEstimator.dox @@ -23,7 +23,9 @@ namespace DGtal { In this example, we show how to test a length estimator of the contour of a generated shape, which is digitized -at different resolutions. +at different resolutions. + +Please have a look to shapeGridCurveEstimator.cpp to get the complete source code of this tutorial. [TOC] From f0e32da7fe3689f39134e1066dbfe3b17b3258b6 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 8 Feb 2017 12:32:09 +0100 Subject: [PATCH 08/10] Fixing warnings --- examples/dec/exampleDECSurface.cpp | 6 +++--- examples/dec/examplePropagation.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/dec/exampleDECSurface.cpp b/examples/dec/exampleDECSurface.cpp index b07aaceded..da8cfc5497 100644 --- a/examples/dec/exampleDECSurface.cpp +++ b/examples/dec/exampleDECSurface.cpp @@ -23,7 +23,7 @@ struct FalseOutsideDomain typedef typename Predicate::Point Point; FalseOutsideDomain(DGtal::ConstAlias predicate, DGtal::ConstAlias adomain) : - predicate(&predicate), myDomain(&adomain) + myPredicate(&predicate), myDomain(&adomain) { } @@ -31,10 +31,10 @@ struct FalseOutsideDomain operator()(const Point& point) const { if (!myDomain->isInside(point)) return false; - return (*predicate)(point); + return (*myPredicate)(point); } - const Predicate* predicate; + const Predicate* myPredicate; const Domain* myDomain; }; diff --git a/examples/dec/examplePropagation.cpp b/examples/dec/examplePropagation.cpp index 830ccdf7a9..929c8da119 100644 --- a/examples/dec/examplePropagation.cpp +++ b/examples/dec/examplePropagation.cpp @@ -266,7 +266,7 @@ void propa_2d() trace.endBlock(); } -int main(int argc, char* argv[]) +int main() { propa_2d(); return 0; From 77cb81eb5e83ea505f5c86e1896034a93e9abf16 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sat, 11 Feb 2017 18:19:56 +0100 Subject: [PATCH 09/10] minor edit changelog --- ChangeLog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 64c481d11c..54450a4e37 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -66,7 +66,6 @@ - Viewer3D: fix bad rendering when changing the scale. (Bertrand Kerautret, [#1217](https://github.com/DGtal-team/DGtal/pull/1217)) - - *Documentation* - Fixing various bib references. (Bertrand Kerautret, [##1237](https://github.com/DGtal-team/DGtal/pull/1237)) From df68bd3e71a0adcc0e94c417108eb2797c86aedf Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sat, 11 Feb 2017 18:21:17 +0100 Subject: [PATCH 10/10] minor edit changelog --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 54450a4e37..6b0c4f18d2 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -67,7 +67,7 @@ (Bertrand Kerautret, [#1217](https://github.com/DGtal-team/DGtal/pull/1217)) - *Documentation* - - Fixing various bib references. + - Fixing various BibTeX references. (Bertrand Kerautret, [##1237](https://github.com/DGtal-team/DGtal/pull/1237)) # DGtal 0.9.2