From 1fa16139a01141d3b39e7f25744e68f195b08cba Mon Sep 17 00:00:00 2001 From: Manuel Caroli Date: Thu, 6 May 2010 16:55:09 +0000 Subject: [PATCH] split the traits test into several tests to decrease the number of instantiations for VC++ --- .gitattributes | 1 - ... test_periodic_3_triangulation_traits_3.h} | 49 +++++-------------- ...st_periodic_3_triangulation_traits_C_3.cpp | 29 +++++++++++ ...st_periodic_3_triangulation_traits_H_3.cpp | 29 +++++++++++ ...t_periodic_3_triangulation_traits_SC_3.cpp | 29 +++++++++++ ...t_periodic_3_triangulation_traits_SH_3.cpp | 29 +++++++++++ 6 files changed, 128 insertions(+), 38 deletions(-) rename Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/{test_periodic_3_triangulation_traits_3.cpp => test_periodic_3_triangulation_traits_3.h} (64%) create mode 100644 Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_C_3.cpp create mode 100644 Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_H_3.cpp create mode 100644 Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_SC_3.cpp create mode 100644 Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_SH_3.cpp diff --git a/.gitattributes b/.gitattributes index 64687188118..adafedc646b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2667,7 +2667,6 @@ Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cl Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_periodic_3_static_filters.h -text Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_delaunay_hierarchy_3.cpp -text Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_offset_3.cpp -text -Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_3.cpp -text Point_set_2/doc_tex/Point_set_2/point_set.png -text Point_set_processing_3/doc_tex/Point_set_processing_3/Point_set_processing_images.ppt -text svneol=unset#application/vnd.ms-powerpoint Point_set_processing_3/doc_tex/Point_set_processing_3/analysis.tex -text diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_3.cpp b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_3.h similarity index 64% rename from Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_3.cpp rename to Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_3.h index 9684cf60a57..18cf6fee8d9 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_3.cpp +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_3.h @@ -11,9 +11,9 @@ // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. // -// $URL: svn+ssh://scm.gforge.inria.fr/svn/cgal/trunk/Triangulation_3/test/Triangulation_3/test_regular_traits_3.cpp $ -// $Id: test_regular_traits_3.cpp 42529 2008-03-19 13:45:36Z ameyer $ -// $Date: 2008-03-19 14:45:36 +0100 (Wed, 19 Mar 2008) $ +// $URL$ +// $Id$ +// $Date$ // // // Author(s) : Mariette Yvinec @@ -53,7 +53,7 @@ #include #include -int main() +int test_periodic_3_triangulation_traits_3() { std::cout<<"Statically filtered predicates:"< - test_traits >(); - test_traits >(); - test_traits >(); - test_traits >(); + test_traits(); #define LRT CGAL::Lazy_exact_nt< RT > #define LFT CGAL::Lazy_exact_nt< FT > - test_traits >(); - test_traits >(); - test_traits >(); - test_traits >(); + test_traits(); std::cout<<" done"< >(); - test_traits >(); - test_traits >(); - test_traits >(); + test_traits(); #define LRT CGAL::Lazy_exact_nt< RT > #define LFT CGAL::Lazy_exact_nt< FT > - test_traits >(); - test_traits >(); - test_traits >(); - test_traits >(); - std::cout<<" done"<(); #undef RT #undef FT #undef LRT @@ -112,16 +99,10 @@ int main() std::cout<<" LEDA...";std::cout.flush(); #define RT leda_integer #define FT leda_rational - test_traits >(); - test_traits >(); - test_traits >(); - test_traits >(); + test_traits(); #define LRT CGAL::Lazy_exact_nt< RT > #define LFT CGAL::Lazy_exact_nt< FT > - test_traits >(); - test_traits >(); - test_traits >(); - test_traits >(); + test_traits(); std::cout<<" done"< - test_traits >(); - test_traits >(); - test_traits >(); - test_traits >(); + test_traits(); #define LRT CGAL::Lazy_exact_nt< RT > #define LFT CGAL::Lazy_exact_nt< FT > - test_traits >(); - test_traits >(); - test_traits >(); - test_traits >(); + test_traits(); std::cout<<" done"< + +#define KERNEL CGAL::Cartesian< FT > +#define LAZY_KERNEL CGAL::Cartesian< LFT > + +#include "test_periodic_3_triangulation_traits_3.h" + +int main() +{ + test_periodic_3_triangulation_traits_3(); +} diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_H_3.cpp b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_H_3.cpp new file mode 100644 index 00000000000..c69a2e6fc2d --- /dev/null +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_H_3.cpp @@ -0,0 +1,29 @@ +// Copyright (c) 1998 INRIA Sophia-Antipolis (France). +// All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you may redistribute it under +// the terms of the Q Public License version 1.0. +// See the file LICENSE.QPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// $Date$ +// +// +// Author(s) : Manuel Caroli + +#define KERNEL CGAL::Homogeneous< FT > +#define LAZY_KERNEL CGAL::Homogeneous< LFT > + +#include "test_periodic_3_triangulation_traits_3.h" + +int main() +{ + test_periodic_3_triangulation_traits_3(); +} diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_SC_3.cpp b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_SC_3.cpp new file mode 100644 index 00000000000..aa12294382f --- /dev/null +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_SC_3.cpp @@ -0,0 +1,29 @@ +// Copyright (c) 1998 INRIA Sophia-Antipolis (France). +// All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you may redistribute it under +// the terms of the Q Public License version 1.0. +// See the file LICENSE.QPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// $Date$ +// +// +// Author(s) : Manuel Caroli + +#define KERNEL CGAL::Simple_cartesian< FT > +#define LAZY_KERNEL CGAL::Simple_cartesian< LFT > + +#include "test_periodic_3_triangulation_traits_3.h" + +int main() +{ + test_periodic_3_triangulation_traits_3(); +} diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_SH_3.cpp b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_SH_3.cpp new file mode 100644 index 00000000000..f5651d36ac6 --- /dev/null +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_traits_SH_3.cpp @@ -0,0 +1,29 @@ +// Copyright (c) 1998 INRIA Sophia-Antipolis (France). +// All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you may redistribute it under +// the terms of the Q Public License version 1.0. +// See the file LICENSE.QPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// $Date$ +// +// +// Author(s) : Manuel Caroli + +#define KERNEL CGAL::Simple_homogeneous< FT > +#define LAZY_KERNEL CGAL::Simple_homogeneous< LFT > + +#include "test_periodic_3_triangulation_traits_3.h" + +int main() +{ + test_periodic_3_triangulation_traits_3(); +}