- Move the internal header

include/CGAL/Mesh_3/Triangulation_mesher_level_traits_3.h to Mesh_2.
- change its use to std::list to use of std::vector (and call reserve).
This commit is contained in:
Laurent Rineau 2006-02-27 17:23:10 +00:00
parent bf18b7b7ce
commit 114d740b35
2 changed files with 23 additions and 12 deletions

View File

@ -1,3 +1,8 @@
26 Febraury 2006 Laurent Rineau
- Move the internal header
include/CGAL/Mesh_3/Triangulation_mesher_level_traits_3.h to Mesh_2.
16 November 2005 Laurent Rineau
- added copy constructor and operator= in CGAL::Double_map
- check them in test/Mesh_2/test_double_map.C

View File

@ -1,4 +1,4 @@
// Copyright (c) 2004, 2005 INRIA Sophia-Antipolis (France).
// Copyright (c) 2004-2006 INRIA Sophia-Antipolis (France).
// All rights reserved.
//
// This file is part of CGAL (www.cgal.org); you may redistribute it under
@ -12,21 +12,21 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
//
// $URL$
// $Id$
// $Id$ $Date$
//
//
// Author(s) : Laurent RINEAU
#ifndef CGAL_MESH_3_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
#define CGAL_MESH_3_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
#ifndef CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
#define CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
#include <list>
#include <vector>
#include <CGAL/Mesher_level.h>
#include <CGAL/Mesher_level_default_implementations.h>
namespace CGAL {
namespace Mesh_3 {
namespace Mesh_2 {
namespace details {
template <typename Tag, typename Tr>
@ -41,8 +41,8 @@ namespace CGAL {
typedef typename Tr::Weighted_point Point;
};
} // end namespace Mesh_3::details
} // end namespace Mesh_3
} // end namespace Mesh_2::details
} // end namespace Mesh_2
template <typename Tr>
struct Triangulation_mesher_level_traits_3 :
@ -50,7 +50,7 @@ struct Triangulation_mesher_level_traits_3 :
{
typedef Tr Triangulation;
typedef typename Mesh_3::details::Type_of_points<typename Tr::Weighted_tag,
typedef typename Mesh_2::details::Type_of_points<typename Tr::Weighted_tag,
Tr>::Point Point;
typedef typename Tr::Vertex_handle Vertex_handle;
@ -65,8 +65,8 @@ struct Triangulation_mesher_level_traits_3 :
}
class Zone {
typedef std::list<Cell_handle> Cells;
typedef std::list<Facet> Facets;
typedef std::vector<Cell_handle> Cells;
typedef std::vector<Facet> Facets;
public:
typedef typename Cells::iterator Cells_iterator;
typedef typename Facets::iterator Facets_iterator;
@ -75,6 +75,12 @@ struct Triangulation_mesher_level_traits_3 :
typedef typename Tr::Locate_type Locate_type;
Zone() {
cells.reserve(64);
boundary_facets.reserve(32);
internal_facets.reserve(64);
}
Locate_type locate_type;
Cell_handle cell;
int i, j;
@ -100,4 +106,4 @@ struct Triangulation_mesher_level_traits_3 :
}; // end namespace CGAL
#endif // CGAL_MESH_3_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
#endif // CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H