Merge last trunk modifications (version 1.3.0)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1113 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 608c3cb733a7723c865f82a4de9408c984227f1a

4 files changed, 138 insertions, 0 deletions

diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
new file mode 100644
index 00000000..789546ae
--- /dev/null
+++ b/src/common/test/CMakeLists.txt
@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 2.6)
+project(GUDHIDelaunayTriangulationOffFileReadWriteUT)
+
+if (GCOVR_PATH)
+  # for gcovr to make coverage reports - Corbera Jenkins plugin
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+endif()
+if (GPROF_PATH)
+  # for gprof to make coverage reports - Jenkins
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
+endif()
+
+# need CGAL 4.7
+if(CGAL_FOUND)
+  if (NOT CGAL_VERSION VERSION_LESS 4.7.0)
+    find_package(Eigen3 3.1.0)
+    if (EIGEN3_FOUND)
+      message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
+      include( ${EIGEN3_USE_FILE} )
+      
+      add_executable ( poffreader_UT points_off_reader_unit_test.cpp )
+      target_link_libraries(poffreader_UT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+
+      # Do not forget to copy test files in current binary dir
+      file(COPY "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+
+      # Unitary tests
+      add_test(poffreader_UT ${CMAKE_CURRENT_BINARY_DIR}/poffreader_UT
+      # XML format for Jenkins xUnit plugin 
+      --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/poffreader_UT.xml --log_level=test_suite --report_level=no)
+
+    else()
+      message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
+    endif()
+  else()
+    message(WARNING "CGAL version: ${CGAL_VERSION} is too old to compile Alpha shapes feature. Version 4.6.0 is required.")
+  endif ()
+endif()
+
diff --git a/src/common/test/README b/src/common/test/README
new file mode 100644
index 00000000..f2a7eb5a
--- /dev/null
+++ b/src/common/test/README
@@ -0,0 +1,14 @@
+To compile:
+***********
+
+cmake .
+make
+
+To launch with details:
+***********************
+
+./dtoffrw_UT --report_level=detailed --log_level=all 
+
+   ==> echo $? returns 0 in case of success (non-zero otherwise)
+
+
diff --git a/src/common/test/dtoffrw_alphashapedoc_result.off b/src/common/test/dtoffrw_alphashapedoc_result.off
new file mode 100644
index 00000000..1deb8dbd
--- /dev/null
+++ b/src/common/test/dtoffrw_alphashapedoc_result.off
@@ -0,0 +1,7 @@
+Point[0] = 1 1 
+Point[1] = 7 0 
+Point[2] = 4 6 
+Point[3] = 9 6 
+Point[4] = 0 14 
+Point[5] = 2 19 
+Point[6] = 9 17 
diff --git a/src/common/test/points_off_reader_unit_test.cpp b/src/common/test/points_off_reader_unit_test.cpp
new file mode 100644
index 00000000..73e19cbc
--- /dev/null
+++ b/src/common/test/points_off_reader_unit_test.cpp
@@ -0,0 +1,78 @@
+/*    This file is part of the Gudhi Library. The Gudhi library
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++
+ *    library for computational topology.
+ *
+ *    Author(s):       Vincent Rouvreau
+ *
+ *    Copyright (C) 2015  INRIA Saclay (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gudhi/Points_off_io.h>
+
+// For CGAL points type in dimension d
+// cf. http://doc.cgal.org/latest/Kernel_d/classCGAL_1_1Point__d.html
+#include <CGAL/Epick_d.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE "points_off_read_write"
+#include <boost/test/unit_test.hpp>
+
+typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > Kernel;
+typedef typename Kernel::Point_d Point_d;
+
+BOOST_AUTO_TEST_CASE( points_doc_test )
+{
+  // Read the OFF file (input file name given as parameter) and triangulates points
+  Gudhi::Points_off_reader<Point_d> off_reader("alphacomplexdoc.off");
+  // Check the read operation was correct
+  BOOST_CHECK(off_reader.is_valid());
+  
+  // Retrieve the triangulation
+  std::vector<Point_d> point_cloud = off_reader.get_point_cloud();
+  BOOST_CHECK(point_cloud.size() == 7);
+
+  std::vector<Point_d> expected_points;
+  std::vector<double> point = {1.0, 1.0};
+  expected_points.push_back(Point_d(2, point.begin(), point.end()));
+  point = {7.0, 0.0};
+  expected_points.push_back(Point_d(2, point.begin(), point.end()));
+  point = {4.0, 6.0};
+  expected_points.push_back(Point_d(2, point.begin(), point.end()));
+  point = {9.0, 6.0};
+  expected_points.push_back(Point_d(2, point.begin(), point.end()));
+  point = {0.0, 14.0};
+  expected_points.push_back(Point_d(2, point.begin(), point.end()));
+  point = {2.0, 19.0};
+  expected_points.push_back(Point_d(2, point.begin(), point.end()));
+  point = {9.0, 17.0};
+  expected_points.push_back(Point_d(2, point.begin(), point.end()));
+
+  BOOST_CHECK(point_cloud == expected_points);
+}
+
+BOOST_AUTO_TEST_CASE( Delaunay_triangulation_unexisting_file_read_test )
+{
+  Gudhi::Points_off_reader<Point_d> off_reader("some_impossible_weird_file_name.off");
+  // Check the read operation was correct
+  BOOST_CHECK(!off_reader.is_valid());
+  
+  std::vector<Point_d> point_cloud = off_reader.get_point_cloud();
+  BOOST_CHECK(point_cloud.size() == 0);
+}