From c524232f734de875d69e2f190f01a6c976024368 Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Thu, 14 Jun 2018 20:39:01 +0200 Subject: GUDHI 2.2.0 as released by upstream in a tarball. --- .../CGAL/internal/Triangulation/Dummy_TDS.h | 49 ------- .../Triangulation/Triangulation_ds_iterators.h | 154 --------------------- .../CGAL/internal/Triangulation/utilities.h | 154 --------------------- 3 files changed, 357 deletions(-) delete mode 100644 include/gudhi_patches/CGAL/internal/Triangulation/Dummy_TDS.h delete mode 100644 include/gudhi_patches/CGAL/internal/Triangulation/Triangulation_ds_iterators.h delete mode 100644 include/gudhi_patches/CGAL/internal/Triangulation/utilities.h (limited to 'include/gudhi_patches/CGAL/internal/Triangulation') diff --git a/include/gudhi_patches/CGAL/internal/Triangulation/Dummy_TDS.h b/include/gudhi_patches/CGAL/internal/Triangulation/Dummy_TDS.h deleted file mode 100644 index b3a0ec98..00000000 --- a/include/gudhi_patches/CGAL/internal/Triangulation/Dummy_TDS.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2009-2014 INRIA Sophia-Antipolis (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// 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. -// -// 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$ -// -// Author(s) : Samuel Hornus - -#ifndef CGAL_INTERNAL_TRIANGULATION_DUMMY_TDS_H -#define CGAL_INTERNAL_TRIANGULATION_DUMMY_TDS_H - -namespace CGAL { - -namespace internal { -namespace Triangulation { - -struct Dummy_TDS -{ - struct Vertex {}; - struct Vertex_handle {}; - struct Vertex_iterator {}; - struct Vertex_const_handle {}; - struct Vertex_const_iterator {}; - struct Full_cell {}; - struct Full_cell_handle {}; - struct Full_cell_iterator {}; - struct Full_cell_const_handle {}; - struct Full_cell_const_iterator {}; - struct Vertex_handle_const_iterator {}; - struct Full_cell_data {}; -}; - -} // namespace Triangulation -} // namespace internal - -} //namespace CGAL - -#endif // CGAL_INTERNAL_TRIANGULATION_DUMMY_TDS_H diff --git a/include/gudhi_patches/CGAL/internal/Triangulation/Triangulation_ds_iterators.h b/include/gudhi_patches/CGAL/internal/Triangulation/Triangulation_ds_iterators.h deleted file mode 100644 index 7e360026..00000000 --- a/include/gudhi_patches/CGAL/internal/Triangulation/Triangulation_ds_iterators.h +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright (c) 2009-2014 INRIA Sophia-Antipolis (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// 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. -// -// 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$ -// -// Author(s) : Samuel Hornus (Well... `copy, paste and hack' of Monique Teillaud's work) - -#ifndef CGAL_INTERNAL_TRIANGULATION_TRIANGULATION_DS_ITERATORS_H -#define CGAL_INTERNAL_TRIANGULATION_TRIANGULATION_DS_ITERATORS_H - -namespace CGAL { - -namespace internal { -namespace Triangulation { - -template< typename TDS > -class Triangulation_ds_facet_iterator -{ - typedef typename TDS::Full_cell_handle Full_cell_handle; - typedef typename TDS::Facet Facet; - - typedef Facet value_type; - typedef const Facet * pointer; - typedef const Facet & reference; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; - typedef std::bidirectional_iterator_tag iterator_category; - - typedef Triangulation_ds_facet_iterator Facet_iterator; - - TDS & tds_; - Facet ft_; - const int cur_dim_; - -public: - Triangulation_ds_facet_iterator(TDS & tds) - : tds_(tds), ft_(tds.full_cells_begin(), 0), cur_dim_(tds.current_dimension()) - { - CGAL_assertion( cur_dim_ > 0 ); - while( ! canonical() ) - raw_increment(); - } - - Triangulation_ds_facet_iterator(TDS & tds, int) - : tds_(tds), ft_(tds.full_cells_end(), 0), cur_dim_(tds.current_dimension()) - { - CGAL_assertion( cur_dim_ > 0 ); - CGAL_assertion( canonical() ); - } - - Facet_iterator & operator++() - { - increment(); - return (*this); - } - - Facet_iterator operator++(int) - { - Facet_iterator tmp(*this); - increment(); - return tmp; - } - - Facet_iterator & operator--() - { - decrement(); - return (*this); - } - - Facet_iterator operator--(int) - { - Facet_iterator tmp(*this); - decrement(); - return tmp; - } - - bool operator==(const Facet_iterator & fi) const - { - return (&tds_ == &fi.tds_) && - (tds_.index_of_covertex(ft_) == fi.tds_.index_of_covertex(fi.ft_)) && - (tds_.full_cell(ft_) == fi.tds_.full_cell(fi.ft_)); - } - - bool operator!=(const Facet_iterator & fi) const - { - return !(*this == fi); - } - - reference operator*() const - { - return ft_; - } - - pointer operator->() const - { - return &ft_; - } - -private: - bool canonical() - { - if( tds_.full_cells_end() == tds_.full_cell(ft_) ) - return ( 0 == tds_.index_of_covertex(ft_) ); - return ( tds_.full_cell(ft_) < - tds_.full_cell(ft_)->neighbor(tds_.index_of_covertex(ft_)) ); - } - - void raw_decrement() - { - int i = tds_.index_of_covertex(ft_); - if( i == 0 ) - ft_ = Facet(--tds_.full_cell(ft_), cur_dim_); - else - ft_ = Facet(tds_.full_cell(ft_), i - 1); - } - - void raw_increment() - { - int i = tds_.index_of_covertex(ft_); - if( i == cur_dim_ ) - ft_ = Facet(++tds_.full_cell(ft_), 0); - else - ft_ = Facet(tds_.full_cell(ft_), i + 1); - } - - void decrement() - { - do { raw_decrement(); } while( ! canonical() ); - } - - void increment() - { - do { raw_increment(); } while( ! canonical() ); - } -}; - -} // namespace Triangulation -} // namespace internal - -} //namespace CGAL - -#endif // CGAL_INTERNAL_TRIANGULATION_TRIANGULATION_DS_ITERATORS_H diff --git a/include/gudhi_patches/CGAL/internal/Triangulation/utilities.h b/include/gudhi_patches/CGAL/internal/Triangulation/utilities.h deleted file mode 100644 index a1ffc775..00000000 --- a/include/gudhi_patches/CGAL/internal/Triangulation/utilities.h +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright (c) 2009-2014 INRIA Sophia-Antipolis (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// 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. -// -// 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$ -// -// Author(s) : Samuel Hornus - -#ifndef CGAL_INTERNAL_TRIANGULATION_UTILITIES_H -#define CGAL_INTERNAL_TRIANGULATION_UTILITIES_H - -#include - -namespace CGAL { - -namespace internal { -namespace Triangulation { - -template< class TDS > -struct Dark_full_cell_data -{ - typedef typename TDS::Full_cell_handle Full_cell_handle; - Full_cell_handle light_copy_; - int count_; - Dark_full_cell_data() : light_copy_(), count_(0) {} -}; - -template< class TDS > -struct Compare_faces_with_common_first_vertex -{ - typedef typename TDS::Face Face; - - const int d_; - -public: - - Compare_faces_with_common_first_vertex(const int d) - : d_(d) - { - CGAL_assertion( 0 < d ); - } - - explicit Compare_faces_with_common_first_vertex(); - - bool operator()(const Face & left, const Face & right) const - { - CGAL_assertion( d_ == left.face_dimension() ); - CGAL_assertion( d_ == right.face_dimension() ); - for( int i = 1; i <= d_; ++i ) - { - if( left.vertex(i) < right.vertex(i) ) - return true; - if( right.vertex(i) < left.vertex(i) ) - return false; - } - return false; - } -}; - -template< class T > -struct Compare_vertices_for_upper_face -{ - typedef typename T::Vertex_const_handle VCH; - - const T & t_; - -public: - - Compare_vertices_for_upper_face(const T & t) - : t_(t) - {} - - explicit Compare_vertices_for_upper_face(); - - bool operator()(const VCH & left, const VCH & right) const - { - if( left == right ) - return false; - if( t_.is_infinite(left) ) - return true; - if( t_.is_infinite(right) ) - return false; - return left < right; - } -}; - -template< class T > -struct Compare_points_for_perturbation -{ - typedef typename T::Geom_traits::Point_d Point; - - const T & t_; - -public: - - Compare_points_for_perturbation(const T & t) - : t_(t) - {} - - explicit Compare_points_for_perturbation(); - - bool operator()(const Point * left, const Point * right) const - { - return (SMALLER == t_.geom_traits().compare_lexicographically_d_object()(*left, *right)); - } -}; - -template< class T > -struct Point_from_pointer -{ - typedef const typename T::Geom_traits::Point_d * argument_type; - typedef const typename T::Geom_traits::Point_d result_type; - result_type & operator()(argument_type & x) const - { - return (*x); - } - const result_type & operator()(const argument_type & x) const - { - return (*x); - } -}; - -template< typename Vertex_handle, typename Point > -struct Point_from_vertex_handle -{ - typedef Vertex_handle argument_type; - typedef Point result_type; - result_type & operator()(argument_type & x) const - { - return x->point(); - } - const result_type & operator()(const argument_type & x) const - { - return x->point(); - } -}; - -} // namespace Triangulation -} // namespace internal - -} //namespace CGAL - -#endif // CGAL_INTERNAL_TRIANGULATION_UTILITIES_H -- cgit v1.2.3