From 31714289b53bc0f2d67c4c6240717ff2e1357515 Mon Sep 17 00:00:00 2001 From: Laurent Caraffa Date: Fri, 30 Sep 2022 14:02:19 +0200 Subject: [PATCH 1/4] testing validity shows that td i/o is not valid --- Triangulation/test/Triangulation/test_tds.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Triangulation/test/Triangulation/test_tds.cpp b/Triangulation/test/Triangulation/test_tds.cpp index e1d4ceeb54b..a9e0154b16c 100644 --- a/Triangulation/test/Triangulation/test_tds.cpp +++ b/Triangulation/test/Triangulation/test_tds.cpp @@ -104,6 +104,7 @@ void test(const int d, const string & type) CGAL::IO::set_binary_mode(fi); TDS input_tds(d); fi >> input_tds; + assert( input_tds.is_valid(true) ); fi.close(); // TEST Copy Constructor From 18ed302d84ab7e5e10b554c63c48e0d6d418f51e Mon Sep 17 00:00:00 2001 From: Laurent Caraffa Date: Fri, 30 Sep 2022 14:05:27 +0200 Subject: [PATCH 2/4] set full_cell of a vertex in I/O --- Triangulation/include/CGAL/Triangulation_data_structure.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Triangulation/include/CGAL/Triangulation_data_structure.h b/Triangulation/include/CGAL/Triangulation_data_structure.h index 89200e09dae..54147d52a67 100644 --- a/Triangulation/include/CGAL/Triangulation_data_structure.h +++ b/Triangulation/include/CGAL/Triangulation_data_structure.h @@ -1364,6 +1364,7 @@ Triangulation_data_structure else read(is, index); s->set_vertex(j, vertices[index]); + s->vertex(j)->set_full_cell(s); } // read other non-combinatorial information for the full_cells is >> (*s); From 96b205d9b0e437bbb39e84c19a80c1ded8983536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 3 Oct 2022 18:55:44 +0200 Subject: [PATCH 3/4] add test from issue #5275 --- .../test/Triangulation/CMakeLists.txt | 3 ++- .../test/Triangulation/simple_io_test.cpp | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 Triangulation/test/Triangulation/simple_io_test.cpp diff --git a/Triangulation/test/Triangulation/CMakeLists.txt b/Triangulation/test/Triangulation/CMakeLists.txt index 4e7712753e1..fc4b63809d7 100644 --- a/Triangulation/test/Triangulation/CMakeLists.txt +++ b/Triangulation/test/Triangulation/CMakeLists.txt @@ -25,8 +25,9 @@ if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("test_tds.cpp") create_single_source_cgal_program("test_torture.cpp") create_single_source_cgal_program("test_insert_if_in_star.cpp") + create_single_source_cgal_program("simple_io_test.cpp") foreach(target test_triangulation test_delaunay test_regular test_tds - test_torture test_insert_if_in_star) + test_torture test_insert_if_in_star simple_io_test) target_link_libraries(${target} PUBLIC CGAL::Eigen3_support) endforeach() diff --git a/Triangulation/test/Triangulation/simple_io_test.cpp b/Triangulation/test/Triangulation/simple_io_test.cpp new file mode 100644 index 00000000000..2db4b5f8345 --- /dev/null +++ b/Triangulation/test/Triangulation/simple_io_test.cpp @@ -0,0 +1,21 @@ +#include +#include +#include + +int main() +{ + typedef CGAL::Delaunay_triangulation>> T; + T dt1(2), dt2(2); + + std::vector points; + points.emplace_back(1,0); + points.emplace_back(0,1); + points.emplace_back(2,2); + dt1.insert(points.begin(), points.end()); + + std::stringstream f; + f << dt1 << std::endl; + std::cout << f.str(); + f >> dt2; + assert(dt2.is_valid(true)); +} From 29d543c9f447f195f62cbabf8af2ef6799fcd8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 4 Oct 2022 09:16:32 +0200 Subject: [PATCH 4/4] remove tabs --- Triangulation/include/CGAL/Triangulation_data_structure.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Triangulation/include/CGAL/Triangulation_data_structure.h b/Triangulation/include/CGAL/Triangulation_data_structure.h index 54147d52a67..2b8ca29f8fc 100644 --- a/Triangulation/include/CGAL/Triangulation_data_structure.h +++ b/Triangulation/include/CGAL/Triangulation_data_structure.h @@ -1364,7 +1364,7 @@ Triangulation_data_structure else read(is, index); s->set_vertex(j, vertices[index]); - s->vertex(j)->set_full_cell(s); + s->vertex(j)->set_full_cell(s); } // read other non-combinatorial information for the full_cells is >> (*s);