summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/example/CGAL_points_off_reader.cpp43
-rw-r--r--src/common/example/CMakeLists.txt12
-rw-r--r--src/common/example/Delaunay_triangulation_off_rw.cpp54
-rw-r--r--src/common/example/cgaloffreader_result.txt7
-rw-r--r--src/common/example/dtoffrw_alphashapedoc_result.off15
-rw-r--r--src/common/example/dtoffrw_alphashapedoc_result.txt2
-rw-r--r--src/common/include/gudhi/Delaunay_triangulation_off_io.h348
-rw-r--r--src/common/include/gudhi/Points_off_io.h178
-rw-r--r--src/common/test/CMakeLists.txt14
-rw-r--r--src/common/test/dtoffrw_alphashapedoc_result.off22
-rw-r--r--src/common/test/dtoffrw_unit_test.cpp90
-rw-r--r--src/common/test/points_off_reader_unit_test.cpp78
12 files changed, 320 insertions, 543 deletions
diff --git a/src/common/example/CGAL_points_off_reader.cpp b/src/common/example/CGAL_points_off_reader.cpp
new file mode 100644
index 00000000..076afd5b
--- /dev/null
+++ b/src/common/example/CGAL_points_off_reader.cpp
@@ -0,0 +1,43 @@
+#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>
+
+typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > Kernel;
+typedef typename Kernel::Point_d Point_d;
+
+void usage(int argc, char * const progName) {
+ std::cerr << "Error: Number of arguments (" << argc << ") is not correct" << std::endl;
+ std::cerr << "Usage: " << progName << " inputFile.off" << std::endl;
+ exit(-1);
+}
+
+int main(int argc, char **argv) {
+ if (argc != 2) usage(argc, (argv[0] - 1));
+
+ std::string offInputFile(argv[1]);
+ // Read the OFF file (input file name given as parameter) and triangulate points
+ Gudhi::Points_off_reader<Point_d> off_reader(offInputFile);
+ // Check the read operation was correct
+ if (!off_reader.is_valid()) {
+ std::cerr << "Unable to read file " << offInputFile << std::endl;
+ exit(-1);
+ }
+
+ // Retrieve the triangulation
+ std::vector<Point_d> point_cloud = off_reader.get_point_cloud();
+
+ int n = 0;
+ for (auto point : point_cloud) {
+ std::cout << "Point[" << n << "] = ";
+ for (int i = 0; i < point.dimension(); i++)
+ std::cout << point[i] << " ";
+ std::cout << "\n";
+ ++n;
+ }
+ return 0;
+}
diff --git a/src/common/example/CMakeLists.txt b/src/common/example/CMakeLists.txt
index 91e78ea2..2914756e 100644
--- a/src/common/example/CMakeLists.txt
+++ b/src/common/example/CMakeLists.txt
@@ -9,15 +9,9 @@ if(CGAL_FOUND)
message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
include( ${EIGEN3_USE_FILE} )
- add_executable ( dtoffrw Delaunay_triangulation_off_rw.cpp )
- target_link_libraries(dtoffrw ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
- add_test(dtoffrw ${CMAKE_CURRENT_BINARY_DIR}/dtoffrw ${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off ${CMAKE_CURRENT_BINARY_DIR}/result.off)
-
- if (DIFF_PATH)
- # Do not forget to copy test results files in current binary dir
- file(COPY "dtoffrw_alphashapedoc_result.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
- add_test(dtoffrw_result_off_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/dtoffrw_alphashapedoc_result.off ${CMAKE_CURRENT_BINARY_DIR}/result.off)
- endif()
+ add_executable ( cgaloffreader CGAL_points_off_reader.cpp )
+ target_link_libraries(cgaloffreader ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+ add_test(cgaloffreader ${CMAKE_CURRENT_BINARY_DIR}/cgaloffreader ${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off)
else()
message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
diff --git a/src/common/example/Delaunay_triangulation_off_rw.cpp b/src/common/example/Delaunay_triangulation_off_rw.cpp
deleted file mode 100644
index 4c7a9aaf..00000000
--- a/src/common/example/Delaunay_triangulation_off_rw.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// to construct a Delaunay_triangulation from a OFF file
-#include <gudhi/Delaunay_triangulation_off_io.h>
-
-#include <CGAL/Delaunay_triangulation.h>
-#include <CGAL/Epick_d.h>
-
-#include <iostream>
-#include <string>
-
-// Use dynamic_dimension_tag for the user to be able to set dimension
-typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > K;
-typedef CGAL::Delaunay_triangulation<K> T;
-// The triangulation uses the default instantiation of the
-// TriangulationDataStructure template parameter
-
-void usage(char * const progName) {
- std::cerr << "Usage: " << progName << " inputFile.off outputFile.off" << std::endl;
- exit(-1);
-}
-
-int main(int argc, char **argv) {
- if (argc != 3) {
- std::cerr << "Error: Number of arguments (" << argc << ") is not correct" << std::endl;
- usage(argv[0]);
- }
-
- std::string offInputFile(argv[1]);
- // Read the OFF file (input file name given as parameter) and triangulates points
- Gudhi::Delaunay_triangulation_off_reader<T> off_reader(offInputFile);
- // Check the read operation was correct
- if (!off_reader.is_valid()) {
- std::cerr << "Unable to read file " << offInputFile << std::endl;
- exit(-1);
- }
-
- // Retrieve the triangulation
- T* triangulation = off_reader.get_complex();
- // Operations on triangulation
- std::cout << "Number of vertices= " << triangulation->number_of_vertices() << std::endl;
- std::cout << "Number of finite full cells= " << triangulation->number_of_finite_full_cells() << std::endl;
-
- std::string outFileName(argv[2]);
- std::string offOutputFile(outFileName);
- // Write the OFF file (output file name given as parameter) with the points and triangulated cells as faces
- Gudhi::Delaunay_triangulation_off_writer<T> off_writer(offOutputFile, triangulation);
-
- // Check the write operation was correct
- if (!off_writer.is_valid()) {
- std::cerr << "Unable to write file " << offOutputFile << std::endl;
- exit(-1);
- }
-
- return 0;
-}
diff --git a/src/common/example/cgaloffreader_result.txt b/src/common/example/cgaloffreader_result.txt
new file mode 100644
index 00000000..1deb8dbd
--- /dev/null
+++ b/src/common/example/cgaloffreader_result.txt
@@ -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/example/dtoffrw_alphashapedoc_result.off b/src/common/example/dtoffrw_alphashapedoc_result.off
deleted file mode 100644
index d1839a43..00000000
--- a/src/common/example/dtoffrw_alphashapedoc_result.off
+++ /dev/null
@@ -1,15 +0,0 @@
-nOFF
-2 7 6 0
-9 17
-0 14
-1 1
-2 19
-4 6
-9 6
-7 0
-3 5 0 4
-3 0 1 4
-3 3 1 0
-3 4 1 2
-3 5 4 6
-3 6 4 2
diff --git a/src/common/example/dtoffrw_alphashapedoc_result.txt b/src/common/example/dtoffrw_alphashapedoc_result.txt
deleted file mode 100644
index 8e659740..00000000
--- a/src/common/example/dtoffrw_alphashapedoc_result.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Number of vertices= 7
-Number of finite full cells= 6
diff --git a/src/common/include/gudhi/Delaunay_triangulation_off_io.h b/src/common/include/gudhi/Delaunay_triangulation_off_io.h
deleted file mode 100644
index 50be9a59..00000000
--- a/src/common/include/gudhi/Delaunay_triangulation_off_io.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/* 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/>.
- */
-#ifndef DELAUNAY_TRIANGULATION_OFF_IO_H_
-#define DELAUNAY_TRIANGULATION_OFF_IO_H_
-
-#include <string>
-#include <vector>
-#include <fstream>
-#include <map>
-
-#include <CGAL/Spatial_sort_traits_adapter_d.h>
-
-#include <boost/iterator/counting_iterator.hpp>
-
-#include "gudhi/Off_reader.h"
-
-namespace Gudhi {
-
-/**
- * \class Delaunay_triangulation_off_visitor_reader Delaunay_triangulation_off_io.h gudhi/Delaunay_triangulation_off_io.h
- * \brief OFF file visitor implementation according to Off_reader in order to construct a CGAL Delaunay triangulation.
- *
- * For more informations on CGAL Delaunay triangulation, please refer to the corresponding chapter in page
- * http://doc.cgal.org/latest/Triangulation/
- */
-template<typename Complex>
-class Delaunay_triangulation_off_visitor_reader {
- private:
- Complex* complex_;
- typedef typename Complex::Point_d Point_d;
- typedef typename Complex::size_type size_type;
- std::vector<Point_d> point_cloud;
-
- public:
- // TODO(VR) : Pass a Complex as a parameter is required, even if not used. Otherwise, compilation is KO.
-
- /** \brief Delaunay_triangulation_off_visitor_reader constructor
- *
- * @param[in] complex_ptr_ pointer on a Delaunay triangulation.
- */
- Delaunay_triangulation_off_visitor_reader(Complex* complex_ptr_)
- : complex_(nullptr) { }
-
- /** \brief Off_reader visitor init implementation.
- *
- * The init parameters are set from OFF file header.
- * Dimension value is required in order to construct Delaunay triangulation.
- *
- * @param[in] dim space dimension of vertices.
- * @param[in] num_vertices number of vertices in the OFF file (not used).
- * @param[in] num_faces number of faces in the OFF file (not used).
- * @param[in] num_edges number of edges in the OFF file (not used).
- */
- void init(int dim, int num_vertices, int num_faces, int num_edges) {
-#ifdef DEBUG_TRACES
- std::cout << "Delaunay_triangulation_off_visitor_reader::init - dim=" << dim << " - num_vertices=" <<
- num_vertices << " - num_faces=" << num_faces << " - num_edges=" << num_edges << std::endl;
-#endif // DEBUG_TRACES
- if (num_faces > 0) {
- std::cerr << "Delaunay_triangulation_off_visitor_reader::init faces are not taken into account from OFF " <<
- "file for Delaunay triangulation - faces are computed.\n";
- }
- if (num_edges > 0) {
- std::cerr << "Delaunay_triangulation_off_visitor_reader::init edges are not taken into account from OFF " <<
- "file for Delaunay triangulation - edges are computed.\n";
- }
- // Complex construction with dimension from file
- complex_ = new Complex(dim);
- }
-
- /** \brief Off_reader visitor point implementation.
- *
- * The point function is called on each vertex line from OFF file.
- * This function inserts the vertex in the Delaunay triangulation.
- *
- * @param[in] point vector of vertex coordinates.
- */
- void point(const std::vector<double>& point) {
-#ifdef DEBUG_TRACES
- std::cout << "Delaunay_triangulation_off_visitor_reader::point ";
- for (auto coordinate : point) {
- std::cout << coordinate << " | ";
- }
- std::cout << std::endl;
-#endif // DEBUG_TRACES
- // Fill the point cloud
- point_cloud.push_back(Point_d(point.size(), point.begin(), point.end()));
- }
-
- // Off_reader visitor maximal_face implementation - not used
- void maximal_face(const std::vector<int>& face) {
- // For Delaunay Triangulation, only points are read
- }
-
- // Off_reader visitor done implementation
- void done() {
- // It is advised to insert all the points at a time in a Delaunay Triangulation because points are sorted at the
- // beginning of the insertion
- size_type inserted = complex_->insert(point_cloud.begin(), point_cloud.end());
- if (inserted != (point_cloud.end() -point_cloud.begin())) {
- std::cerr << "Delaunay_triangulation_off_visitor_reader::done - insertion failed " << inserted << " != " <<
- (point_cloud.end() -point_cloud.begin()) << "\n";
- }
- }
-
- /** \brief Returns the constructed Delaunay triangulation.
- *
- * @return A pointer on the Delaunay triangulation. Default value is <CODE>nullptr</CODE>.
- */
- Complex* get_complex() const {
- return complex_;
- }
-
- private:
- template<typename PointRangeIterator >
- size_type insert_with_index(const PointRangeIterator& first, const PointRangeIterator& last) {
- size_type vertices_before_insertion = complex_->number_of_vertices();
- std::vector<Point_d> points(first, last);
-
- std::vector<std::ptrdiff_t> indices;
- indices.reserve(points.size());
-
- // Creates a vector {0, 1, ..., N-1}
- std::copy(boost::counting_iterator<std::ptrdiff_t>(0), boost::counting_iterator<std::ptrdiff_t>(points.size()),
- std::back_inserter(indices));
-
- // Sort indices considering CGAL spatial sort
- typedef CGAL::Spatial_sort_traits_adapter_d<Kernel, Point_d*> Search_traits_d;
- spatial_sort(indices.begin(),indices.end(),Search_traits_d(&(points[0])));
-
- typename Delaunay_triangulation::Full_cell_handle hint;
- for (typename std::vector<std::ptrdiff_t>::const_iterator it = indices.begin(), end = indices.end();
- it != end; ++it) {
- typename Delaunay_triangulation::Vertex_handle pos = complex_->insert(points[*it], hint);
- // Save index value as data to retrieve it after insertion
- pos->data() = *it;
- hint = pos->full_cell();
- }
-
- return (complex_->number_of_vertices() - vertices_before_insertion);
- }
-
-};
-
-/**
- * \class Delaunay_triangulation_off_reader Delaunay_triangulation_off_io.h gudhi/Delaunay_triangulation_off_io.h
- * \brief OFF file reader implementation in order to construct a Delaunay triangulation.
- *
- * This class is using the Delaunay_triangulation_off_visitor_reader to visit the OFF file according to Off_reader.
- *
- * For more informations on CGAL Delaunay triangulation, please refer to the corresponding chapter in page
- * http://doc.cgal.org/latest/Triangulation/
- *
- * \section Example
- *
- * This example loads points from an OFF file and builds the Delaunay triangulation.
- * Then, it is asked to display the number of vertices and finites full cells from the Delaunay triangulation.
- *
- * \include Delaunay_triangulation_off_rw.cpp
- *
- * When launching:
- *
- * \code $> ./dtoffrw ../../data/points/alphacomplexdoc.off triangulated.off
- * \endcode
- *
- * the program output is:
- *
- * \include dtoffrw_alphashapedoc_result.txt
- */
-template<typename Complex>
-class Delaunay_triangulation_off_reader {
- public:
- /** \brief Reads the OFF file and constructs the Delaunay triangulation from the points
- * that are in the OFF file.
- *
- * @param[in] name_file OFF file to read.
- *
- * \post Check with is_valid() function to see if read operation was successful.
- */
- Delaunay_triangulation_off_reader(const std::string & name_file)
- : valid_(false) {
- std::ifstream stream(name_file);
- if (stream.is_open()) {
- Delaunay_triangulation_off_visitor_reader<Complex> off_visitor(complex_);
- Off_reader off_reader(stream);
- valid_ = off_reader.read(off_visitor);
- if (valid_) {
- complex_ = off_visitor.get_complex();
- if (complex_ == nullptr) {
- std::cerr << "Delaunay_triangulation_off_reader::Delaunay_triangulation_off_reader off_visitor returns " <<
- "an empty pointer\n";
- valid_ = false;
- }
- }
- } else {
- std::cerr << "Delaunay_triangulation_off_reader::Delaunay_triangulation_off_reader could not open file " <<
- name_file << "\n";
- }
- }
-
- /** \brief Returns if the OFF file read operation was successful or not.
- *
- * @return OFF file read status.
- */
- bool is_valid() const {
- return valid_;
- }
-
- /** \brief Returns the constructed Delaunay triangulation.
- *
- * @return A pointer on the Delaunay triangulation. Default value is <CODE>nullptr</CODE>.
- */
- Complex* get_complex() const {
- if (valid_)
- return complex_;
- return nullptr;
- }
-
- private:
- /** \brief OFF file read status.*/
- bool valid_;
- /** \brief A pointer on the Delaunay triangulation.*/
- Complex* complex_;
-};
-
-/**
- * \class Delaunay_triangulation_off_writer Delaunay_triangulation_off_io.h gudhi/Delaunay_triangulation_off_io.h
- * \brief OFF file writer from a Delaunay triangulation.
- *
- * This class constructs the OFF file header according to http://www.geomview.org/docs/html/OFF.html
- *
- * The header is followed by the list of points coordinates (Delaunay triangulation vertices)
- *
- * And finally is followed by the list of faces (Delaunay triangulation finite full cells)
- *
- * For more informations on CGAL Delaunay triangulation, please refer to the corresponding chapter in page
- * http://doc.cgal.org/latest/Triangulation/
- *
- * \section Example
- *
- * This example loads points from an OFF file and builds the Delaunay triangulation.
- * Then, the Delaunay triangulation is saved in a new file including the triangulation as a list of faces.
- *
- * \include Delaunay_triangulation_off_rw.cpp
- *
- * When launching:
- *
- * \code $> ./dtoffrw ../../data/points/alphashapedoc.off triangulated.off
- * \endcode
- *
- * The result will be an OFF file of dimension 2 with the 7 points from alphashapedoc.off followed by the 6
- * triangulations of dimension 3 (the first value on each faces):
- * \include dtoffrw_alphashapedoc_result.off
- */
-template<typename Complex>
-class Delaunay_triangulation_off_writer {
- public:
- typedef typename Complex::Point Point;
-
- /** \brief Writes the OFF file from the Delaunay triangulation.
- *
- * @param[in] name_file OFF file to write.
- * @param[in] complex_ptr pointer on a Delaunay triangulation.
- *
- * \post Check with is_valid() function to see if write operation was successful.
- */
- Delaunay_triangulation_off_writer(const std::string & name_file, Complex* complex_ptr)
- : valid_(false) {
- std::ofstream stream(name_file);
- if (stream.is_open()) {
- if (complex_ptr->current_dimension() == 3) {
- // OFF header
- stream << "OFF" << std::endl;
- // no endl on next line - don't know why...
- stream << complex_ptr->number_of_vertices() << " " << complex_ptr->number_of_finite_full_cells() << " 0";
- } else {
- // nOFF header
- stream << "nOFF" << std::endl;
- // no endl on next line - don't know why...
- stream << complex_ptr->current_dimension() << " " << complex_ptr->number_of_vertices() << " " <<
- complex_ptr->number_of_finite_full_cells() << " 0";
- }
-
- // bimap to retrieve vertex handles from points and vice versa
- std::map< Point, int > points_to_vh;
- // Start to insert at default handle value
- int vertex_handle = int();
-
- // Points list
- for (auto vit = complex_ptr->vertices_begin(); vit != complex_ptr->vertices_end(); ++vit) {
- for (auto Coord = vit->point().cartesian_begin(); Coord != vit->point().cartesian_end(); ++Coord) {
- stream << *Coord << " ";
- }
- stream << std::endl;
- points_to_vh[vit->point()] = vertex_handle;
- vertex_handle++;
- }
-
- for (auto cit = complex_ptr->finite_full_cells_begin(); cit != complex_ptr->finite_full_cells_end(); ++cit) {
- stream << std::distance(cit->vertices_begin(), cit->vertices_end()) << " ";
- for (auto vit = cit->vertices_begin(); vit != cit->vertices_end(); ++vit) {
- stream << points_to_vh[(*vit)->point()] - 1 << " ";
- }
- stream << std::endl;
- }
- stream.close();
- valid_ = true;
- } else {
- std::cerr << "Delaunay_triangulation_off_writer::Delaunay_triangulation_off_writer could not open file " <<
- name_file << "\n";
- }
- }
-
- /** \brief Returns if the OFF write operation was successful or not.
- *
- * @return OFF file write status.
- */
- bool is_valid() const {
- return valid_;
- }
-
- private:
- /* \brief OFF file write status. */
- bool valid_;
-};
-
-} // namespace Gudhi
-
-#endif // DELAUNAY_TRIANGULATION_OFF_IO_H_
diff --git a/src/common/include/gudhi/Points_off_io.h b/src/common/include/gudhi/Points_off_io.h
new file mode 100644
index 00000000..d9f9a74b
--- /dev/null
+++ b/src/common/include/gudhi/Points_off_io.h
@@ -0,0 +1,178 @@
+/* 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/>.
+ */
+#ifndef POINTS_OFF_IO_H_
+#define POINTS_OFF_IO_H_
+
+#include <string>
+#include <vector>
+#include <fstream>
+#include <map>
+
+#include <gudhi/Off_reader.h>
+
+namespace Gudhi {
+
+/**
+ * \brief OFF file visitor implementation according to Off_reader in order to read points from an OFF file.
+ */
+template<typename Point_d>
+class Points_off_visitor_reader {
+ private:
+ std::vector<Point_d> point_cloud;
+
+ public:
+ /** \brief Off_reader visitor init implementation.
+ *
+ * The init parameters are set from OFF file header.
+ * Dimension value is required in order to construct Alpha complex.
+ *
+ * @param[in] dim space dimension of vertices.
+ * @param[in] num_vertices number of vertices in the OFF file (not used).
+ * @param[in] num_faces number of faces in the OFF file (not used).
+ * @param[in] num_edges number of edges in the OFF file (not used).
+ */
+ void init(int dim, int num_vertices, int num_faces, int num_edges) {
+#ifdef DEBUG_TRACES
+ std::cout << "Points_off_visitor_reader::init - dim=" << dim << " - num_vertices=" <<
+ num_vertices << " - num_faces=" << num_faces << " - num_edges=" << num_edges << std::endl;
+#endif // DEBUG_TRACES
+ if (num_faces > 0) {
+ std::cerr << "Points_off_visitor_reader::init faces are not taken into account from OFF file for Points.\n";
+ }
+ if (num_edges > 0) {
+ std::cerr << "Points_off_visitor_reader::init edges are not taken into account from OFF file for Points.\n";
+ }
+ }
+
+ /** \brief Off_reader visitor point implementation.
+ *
+ * The point function is called on each vertex line from OFF file.
+ * This function inserts the vertex in the Alpha complex.
+ *
+ * @param[in] point vector of vertex coordinates.
+ */
+ void point(const std::vector<double>& point) {
+#ifdef DEBUG_TRACES
+ std::cout << "Points_off_visitor_reader::point ";
+ for (auto coordinate : point) {
+ std::cout << coordinate << " | ";
+ }
+ std::cout << std::endl;
+#endif // DEBUG_TRACES
+ // Fill the point cloud
+ point_cloud.push_back(Point_d(point.size(), point.begin(), point.end()));
+ }
+
+ // Off_reader visitor maximal_face implementation - Only points are read
+ void maximal_face(const std::vector<int>& face) { }
+
+ // Off_reader visitor done implementation - Only points are read
+ void done() { }
+
+ /** \brief Point cloud getter.
+ *
+ * @return point_cloud.
+ */
+ const std::vector<Point_d>& get_point_cloud() {
+ return point_cloud;
+ }
+
+};
+
+/**
+ * \brief OFF file reader implementation in order to read points from an OFF file.
+ *
+ * This class is using the Points_off_visitor_reader to visit the OFF file according to Off_reader.
+ *
+ * Point_d must have a constructor with the following form:
+ *
+ * \code template<class InputIterator > Point_d::Point_d(int d, InputIterator first, InputIterator last) \endcode
+ *
+ * where d is the point dimension.
+ *
+ * \section Example
+ *
+ * This example loads points from an OFF file and builds a vector of CGAL points in dimension d.
+ * Then, it is asked to display the points.
+ *
+ * \include CGAL_points_off_reader.cpp
+ *
+ * When launching:
+ *
+ * \code $> ./cgaloffreader ../../data/points/alphacomplexdoc.off
+ * \endcode
+ *
+ * the program output is:
+ *
+ * \include cgaloffreader_result.txt
+ */
+template<typename Point_d>
+class Points_off_reader {
+ public:
+ /** \brief Reads the OFF file and constructs the Alpha complex from the points
+ * that are in the OFF file.
+ *
+ * @param[in] name_file OFF file to read.
+ *
+ * \post Check with is_valid() function to see if read operation was successful.
+ */
+ Points_off_reader(const std::string& name_file)
+ : valid_(false) {
+ std::ifstream stream(name_file);
+ if (stream.is_open()) {
+ Off_reader off_reader(stream);
+ Points_off_visitor_reader<Point_d> off_visitor;
+ valid_ = off_reader.read(off_visitor);
+ if (valid_) {
+ point_cloud = off_visitor.get_point_cloud();
+ }
+ } else {
+ std::cerr << "Points_off_reader::Points_off_reader could not open file " << name_file << "\n";
+ }
+ }
+
+ /** \brief Returns if the OFF file read operation was successful or not.
+ *
+ * @return OFF file read status.
+ */
+ bool is_valid() const {
+ return valid_;
+ }
+
+ /** \brief Point cloud getter.
+ *
+ * @return point_cloud.
+ */
+ const std::vector<Point_d>& get_point_cloud() {
+ return point_cloud;
+ }
+
+ private:
+ /** \brief point_cloud.*/
+ std::vector<Point_d> point_cloud;
+ /** \brief OFF file read status.*/
+ bool valid_;
+};
+
+} // namespace Gudhi
+
+#endif // POINTS_OFF_IO_H_
diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
index 12eecda8..6205f0e4 100644
--- a/src/common/test/CMakeLists.txt
+++ b/src/common/test/CMakeLists.txt
@@ -18,22 +18,16 @@ if(CGAL_FOUND)
message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
include( ${EIGEN3_USE_FILE} )
- add_executable ( dtoffrw_UT dtoffrw_unit_test.cpp )
- target_link_libraries(dtoffrw_UT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+ 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(dtoffrw_UT ${CMAKE_CURRENT_BINARY_DIR}/dtoffrw_UT
+ add_test(poffreader_UT ${CMAKE_CURRENT_BINARY_DIR}/poffreader_UT
# XML format for Jenkins xUnit plugin
- --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/dtoffrw_UT.xml --log_level=test_suite --report_level=no)
-
- if (DIFF_PATH)
- # Do not forget to copy test result files in current binary dir
- file(COPY "dtoffrw_alphashapedoc_result.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
- add_test(dtoffrw_diff_files_UT ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/UT.off ${CMAKE_CURRENT_BINARY_DIR}/dtoffrw_alphashapedoc_result.off)
- endif()
+ --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.")
diff --git a/src/common/test/dtoffrw_alphashapedoc_result.off b/src/common/test/dtoffrw_alphashapedoc_result.off
index d1839a43..1deb8dbd 100644
--- a/src/common/test/dtoffrw_alphashapedoc_result.off
+++ b/src/common/test/dtoffrw_alphashapedoc_result.off
@@ -1,15 +1,7 @@
-nOFF
-2 7 6 0
-9 17
-0 14
-1 1
-2 19
-4 6
-9 6
-7 0
-3 5 0 4
-3 0 1 4
-3 3 1 0
-3 4 1 2
-3 5 4 6
-3 6 4 2
+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/dtoffrw_unit_test.cpp b/src/common/test/dtoffrw_unit_test.cpp
deleted file mode 100644
index f682df1a..00000000
--- a/src/common/test/dtoffrw_unit_test.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/* 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/>.
- */
-
-// to construct a Delaunay_triangulation from a OFF file
-#include "gudhi/Delaunay_triangulation_off_io.h"
-
-#include <CGAL/Delaunay_triangulation.h>
-#include <CGAL/Epick_d.h>
-
-#include <stdlib.h>
-
-#include <iostream>
-#include <string>
-
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE "delaunay_triangulation_off_read_write"
-#include <boost/test/unit_test.hpp>
-
-// Use dynamic_dimension_tag for the user to be able to set dimension
-typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > K;
-typedef CGAL::Delaunay_triangulation<K> T;
-
-BOOST_AUTO_TEST_CASE( Delaunay_triangulation_doc_test )
-{
- // Read the OFF file (input file name given as parameter) and triangulates points
- Gudhi::Delaunay_triangulation_off_reader<T> off_reader("alphacomplexdoc.off");
- // Check the read operation was correct
- BOOST_CHECK(off_reader.is_valid());
-
- // Retrieve the triangulation
- T* triangulation = off_reader.get_complex();
- BOOST_CHECK(triangulation != nullptr);
- // Operations on triangulation
- BOOST_CHECK(triangulation->number_of_vertices() == 7);
- BOOST_CHECK(triangulation->number_of_finite_full_cells() == 6);
-
- // Write the OFF file (output file name given as parameter) with the points and triangulated cells as faces
- Gudhi::Delaunay_triangulation_off_writer<T> off_writer("UT.off", triangulation);
-
- // Check the write operation was correct
- BOOST_CHECK(off_writer.is_valid());
-
- delete triangulation;
-}
-
-BOOST_AUTO_TEST_CASE( Delaunay_triangulation_unexisting_file_read_test )
-{
- Gudhi::Delaunay_triangulation_off_reader<T> off_reader("some_impossible_weird_file_name.off");
- // Check the read operation was correct
- BOOST_CHECK(!off_reader.is_valid());
- T* triangulation = off_reader.get_complex();
- BOOST_CHECK(triangulation == nullptr);
-}
-
-BOOST_AUTO_TEST_CASE( Delaunay_triangulation_unexisting_file_write_test )
-{
- // Read the OFF file (input file name given as parameter) and triangulates points
- Gudhi::Delaunay_triangulation_off_reader<T> off_reader("alphacomplexdoc.off");
-
- // Retrieve the triangulation
- T* triangulation = off_reader.get_complex();
-
- // Write the OFF file (output file name given as parameter) with the points and triangulated cells as faces
- Gudhi::Delaunay_triangulation_off_writer<T> off_writer("/some_impossible_weird_directory_name/another_weird_directory_name/some_impossible_weird_file_name.off", triangulation);
-
- // Check the write operation was correct
- BOOST_CHECK(!off_writer.is_valid());
-
- delete triangulation;
-}
-
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);
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 06:12:50 +0000