From bb7acdc28cb53a3612ef62e7faaaabaad054857c Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 29 Jan 2010 14:35:38 +0000 Subject: [PATCH] Merged revisions 53882,53891-53892,53900,53902-53905 via svnmerge from svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch ........ r53882 | penarand | 2010-01-28 18:31:05 +0100 (Thu, 28 Jan 2010) | 5 lines corrected typo in preprocessing directive ( and -> && ), avoided some vc warnings by making some casts explicit and eliminated a spurious #include that made the compilation fail in some configurations without gmpxx ........ r53891 | lrineau | 2010-01-29 10:03:49 +0100 (Fri, 29 Jan 2010) | 10 lines Merge from trunk: | ------------------------------------------------------------------------ | r53889 | stayeb | 2010-01-29 09:47:00 +0100 (Fri, 29 Jan 2010) | 1 line | Changed paths: | M /trunk/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h | | Fix: replace Vector_3() by CGAL::NULL_VECTOR. | ------------------------------------------------------------------------ ........ r53892 | lrineau | 2010-01-29 10:23:09 +0100 (Fri, 29 Jan 2010) | 3 lines We do not want PDB demos or examples: officially that library is only an internal tool. ........ r53900 | lrineau | 2010-01-29 12:23:44 +0100 (Fri, 29 Jan 2010) | 2 lines Remove the GraphicsView demo of Bool_op_2 from the release. ........ r53902 | lrineau | 2010-01-29 14:52:13 +0100 (Fri, 29 Jan 2010) | 3 lines Add a paragraph about the "determinitication" of 2D/3D triangulations, segment Voronoi, and Apollonius Graph. ........ r53903 | lrineau | 2010-01-29 15:03:15 +0100 (Fri, 29 Jan 2010) | 2 lines typos ........ r53904 | lrineau | 2010-01-29 15:23:34 +0100 (Fri, 29 Jan 2010) | 15 lines Merge from trunk: | ------------------------------------------------------------------------ | r53887 | afabri | 2010-01-29 09:22:03 +0100 (Fri, 29 Jan 2010) | 1 line | Changed paths: | M /trunk/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_hierarchy_2_impl.h | | Default constructed boost::rand48 is good enough | ------------------------------------------------------------------------ | r53888 | afabri | 2010-01-29 09:24:22 +0100 (Fri, 29 Jan 2010) | 1 line | Changed paths: | M /trunk/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h | | Default constructed boost::rand48 is good enough | ------------------------------------------------------------------------ ........ r53905 | lrineau | 2010-01-29 15:27:21 +0100 (Fri, 29 Jan 2010) | 38 lines Merge from trunk: | ------------------------------------------------------------------------ | r53896 | lrineau | 2010-01-29 12:06:00 +0100 (Fri, 29 Jan 2010) | 2 lines | Changed paths: | M /trunk/Polyhedron/demo/Polyhedron/MainWindow.ui | M /trunk/Polyhedron/demo/Polyhedron/Nef_type.h | M /trunk/Polyhedron/demo/Polyhedron/Nef_type_fwd.h | M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_nef_plugin.cpp | M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_triangulate_facets_plugin.cpp | M /trunk/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp | M /trunk/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h | | Add 3D Minkowski sum to the (Nef) Polyhedron demo. | | ------------------------------------------------------------------------ | r53897 | lrineau | 2010-01-29 12:10:38 +0100 (Fri, 29 Jan 2010) | 2 lines | Changed paths: | M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_nef_plugin.cpp | | Add a missing break; | | ------------------------------------------------------------------------ | r53898 | lrineau | 2010-01-29 12:12:27 +0100 (Fri, 29 Jan 2010) | 2 lines | Changed paths: | D /trunk/Minkowski_sum_3/demo | | Remove demo/ from Minkowski_sum_3, as the polyhedron demo has the feature. | | ------------------------------------------------------------------------ | r53899 | lrineau | 2010-01-29 12:15:43 +0100 (Fri, 29 Jan 2010) | 2 lines | Changed paths: | D /trunk/Nef_3/demo/Nef_3/makefile | | Remove that old makefile | | ------------------------------------------------------------------------ ........ --- Algebraic_kernel_d/include/CGAL/RS/basic.h | 2 +- Algebraic_kernel_d/include/CGAL/RS/dyadic.h | 9 ++++----- Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h | 4 ++-- Boolean_set_operations_2/dont_submit | 2 +- Installation/CHANGES | 6 ++++++ PDB/dont_submit | 2 ++ 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Algebraic_kernel_d/include/CGAL/RS/basic.h b/Algebraic_kernel_d/include/CGAL/RS/basic.h index a5b43a50896..81938e4a329 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/basic.h +++ b/Algebraic_kernel_d/include/CGAL/RS/basic.h @@ -40,7 +40,7 @@ #define CGAL_RS_MIN_PREC 0 #endif -#if ( defined CGAL_HAS_THREADS and !defined CGAL_RS_NO_TLS ) +#if ( defined CGAL_HAS_THREADS && !defined CGAL_RS_NO_TLS ) # ifdef _MSC_VER # ifdef _WINDLL # error "Can't build CGAL_RS as thread safe." diff --git a/Algebraic_kernel_d/include/CGAL/RS/dyadic.h b/Algebraic_kernel_d/include/CGAL/RS/dyadic.h index 41837e91d06..e0b9b368ba0 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/dyadic.h +++ b/Algebraic_kernel_d/include/CGAL/RS/dyadic.h @@ -27,7 +27,6 @@ // for c++, compile with -lgmpxx #ifdef __cplusplus -#include #include #endif @@ -58,7 +57,7 @@ inline void dyadic_set(dyadic_ptr rop,dyadic_srcptr op){ dyadic_set_prec(rop,mpfr_get_prec(op)); mpfr_set(rop,op,GMP_RNDN); } - CGAL_assertion(mpfr_equal_p(rop,op)); + CGAL_assertion(mpfr_equal_p(rop,op)!=0); } inline void dyadic_set_z(dyadic_ptr rop,mpz_srcptr z){ @@ -85,7 +84,7 @@ inline void dyadic_set_fr(dyadic_ptr rop,mpfr_srcptr op){ if(rop!=op){ dyadic_set_prec(rop,mpfr_get_prec(op)); mpfr_set(rop,op,GMP_RNDN); - CGAL_assertion(mpfr_equal_p(rop,op)); + CGAL_assertion(mpfr_equal_p(rop,op)!=0); } } @@ -106,7 +105,7 @@ inline void dyadic_get_exactfr(mpfr_ptr rop,dyadic_srcptr op){ if(rop!=op){ dyadic_set_prec(rop,mpfr_get_prec(op)); mpfr_set(rop,op,GMP_RNDN); - CGAL_assertion(mpfr_equal_p(rop,op)); + CGAL_assertion(mpfr_equal_p(rop,op)!=0); } } @@ -301,7 +300,7 @@ inline void dyadic_pow_ui(dyadic_ptr rop,dyadic_srcptr op1,unsigned long u){ return; } if(mpfr_zero_p(op1)){ - CGAL_assertion_msg(u,"0^0"); + CGAL_assertion_msg(u!=0,"0^0"); dyadic_set_ui(rop,0); return; } diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h index 41d68feb702..3f6a3320431 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h @@ -130,7 +130,7 @@ int RS_polynomial_1::get_degree_static()const{ inline bool RS_polynomial_1::has_sfpart()const{ - return (_is_sf?true:(bool)_sfpart.get()); + return (_is_sf?true:(bool)(_sfpart.get())); } inline @@ -160,7 +160,7 @@ void RS_polynomial_1::set_sf()const{ inline bool RS_polynomial_1::has_sqfr()const{ - return _sqfr.get(); + return (bool)(_sqfr.get()); } inline diff --git a/Boolean_set_operations_2/dont_submit b/Boolean_set_operations_2/dont_submit index ca72b6b7bd7..ba2b5c489a6 100644 --- a/Boolean_set_operations_2/dont_submit +++ b/Boolean_set_operations_2/dont_submit @@ -1,3 +1,3 @@ bench demo/Boolean_set_operations_2/data/vlsi_2.dxf - +demo/Boolean_set_operations_2_GraphicsView diff --git a/Installation/CHANGES b/Installation/CHANGES index 47780c24f5f..e0932edbae7 100644 --- a/Installation/CHANGES +++ b/Installation/CHANGES @@ -102,6 +102,12 @@ CGAL 3.6 offers the following improvements and new functionality : - The package can now be used together with the 3D Periodic Triangulation package to compute periodic alpha shapes. +6.5 2D/3D Triangulations, 2D Segment Delaunay Graph, 2D Apollonius Graph + + - The constructor and insert function taking ranges now produce + structures whose iterator orders is now deterministic (same at each + run). + 7 Mesh Generation diff --git a/PDB/dont_submit b/PDB/dont_submit index 1052f225904..843f3469e0f 100644 --- a/PDB/dont_submit +++ b/PDB/dont_submit @@ -1,2 +1,4 @@ test/PDB/check_refine_alignment.cpp doc_doxygen +demo +examples