introduced explicit instanciation of big classes in testsuite

so that each (non template) member function be instantiated
This commit is contained in:
Mariette Yvinec 2002-08-14 16:41:03 +00:00
parent 64eb1d863f
commit c2aa0d07dc
11 changed files with 50 additions and 20 deletions

View File

@ -2,7 +2,6 @@
constrained riangulation transfers the contrained marks.
- Something still tobe done for remove in Constrained
Delaunay_constrained and Constrained_triangulation_plus
- Mettre la doc a jour
- Harmoniser find_conflicts() avec le 3d
- tester entree vrml
- eclaircir ce qui arrive
@ -12,16 +11,12 @@
pour ne pas etre oblige d'inclure iostream obligatoirement
- ajouter dans la doc du line face circulator, la precondition p!= q
- get rid of Construct_direction_of_line_2
in Triangulation_euclidean_traits_2.h
- arranger ca :
Concernant la Constrained_triangulation_plus_2:
Ca devrait etre Vertices_in_constraint_iterator a la place de
Vertices_in_constraint
- constrained_triangulation_plus_2 plante sur Sun CC
- tenir compte remarque de sylvain a propos de design
- documenter Constrained_triangulation_plus_2
- tester Constrained_triangulation_plus_2 avec le Tag exact
- Constraint_hierarchy_3
to be done or redone : copy swap and delete

View File

@ -5,7 +5,9 @@ Package triangulation: provides triangulations Delaunay triangulations,
constrained and regular triangulations with tests and examples.
Ver 7.43 ()
Ver 7.43 (14/12/02)
- introduced explicit instanciation of big classes in testsuite
so that each (non template) member function be instantiated
- small doc fixes
Ver 7.42 (13/12/02)

View File

@ -549,7 +549,7 @@ typename Constrained_triangulation_plus_2<Tr>::Context_iterator
Constrained_triangulation_plus_2<Tr>::
contexts_end(Vertex_handle va, Vertex_handle vb)
{
return hierarchy.context_end(va,vb);
return hierarchy.contexts_end(va,vb);
}
template <class Tr>

View File

@ -35,6 +35,8 @@
#include <CGAL/_test_types.C>
#include <CGAL/_test_cls_triangulation_2.C>
// Explicit instantiation of the whole class :
template class CGAL::Triangulation_2<TestK>;
int main()
{

View File

@ -31,8 +31,16 @@
#include <CGAL/_test_types.C>
#include <CGAL/_test_cls_tds_2.C>
int
main()
typedef CGAL::Triangulation_vertex_base_2<TestK> Vb;
typedef CGAL::Triangulation_face_base_2<TestK> Fb;
// Explicit instantiation :
// does not work because of off_file_input
// template class CGAL::Triangulation_data_structure_2<Vb,Fb>;
int main()
{
std::cout << "Testing Triangulation_data_structure_2"
<< std::endl << std::endl;

View File

@ -39,20 +39,23 @@
#include <CGAL/_test_cls_delaunay_hierarchy_2.C>
typedef double Coord_type;
typedef CGAL::Cartesian<Coord_type> Gt;
typedef CGAL::Triangulation_vertex_base_2<Gt> Vbb;
typedef CGAL::Triangulation_hierarchy_vertex_base_2<Vbb> Vb;
typedef CGAL::Triangulation_face_base_2<Gt> Fb;
typedef CGAL::Triangulation_data_structure_2<Vb,Fb> Tds;
typedef CGAL::Delaunay_triangulation_2<Gt,Tds> Dt;
// Explicit instantiation of the whole class :
template class CGAL::Triangulation_hierarchy_2<Dt>;
int main()
{
std::cout << "Testing Delaunay_hierarchy_2 " << std::endl;
std::cout << " with Cartesian<double> points "<< std::endl;
typedef double Coord_type;
typedef CGAL::Cartesian<Coord_type> Gt;
typedef CGAL::Triangulation_vertex_base_2<Gt> Vbb;
typedef CGAL::Triangulation_hierarchy_vertex_base_2<Vbb> Vb;
typedef CGAL::Triangulation_face_base_2<Gt> Fb;
typedef CGAL::Triangulation_data_structure_2<Vb,Fb> Tds;
typedef CGAL::Delaunay_triangulation_2<Gt,Tds> Dt;
typedef CGAL::Triangulation_hierarchy_2<Dt> Dh;
_test_cls_delaunay_hierarchy_2( Dh() );
return 0;

View File

@ -21,7 +21,6 @@
// ============================================================================
#include <CGAL/basic.h>
#include <iostream>
//#include <vector>
#include <CGAL/_test_types.h>
#include <CGAL/Cartesian.h>
@ -33,6 +32,9 @@
#include <CGAL/_test_types.C>
#include <CGAL/_test_cls_delaunay_triangulation_2.C>
// Explicit instantiation of the whole class :
template class CGAL::Delaunay_triangulation_2<TestK>;
int main()
{
std::cout << "Testing Delaunay Triangulation_2 " << std::endl;

View File

@ -30,6 +30,11 @@
#include <CGAL/Regular_triangulation_2.h>
#include <CGAL/_test_cls_regular_triangulation_2.C>
// Explicit instantiation of the whole class :
typedef CGAL::Regular_triangulation_euclidean_traits_2
<Test_rep_cartesian, Ftype> RGt;
template class CGAL::Regular_triangulation_2<RGt>;
int main()
{
std::cout << "Testing Regular_triangulation_2" <<std::endl;
@ -37,8 +42,8 @@ int main()
<<std::endl;
std::cout << "using Cartesian points " << std::endl;
typedef CGAL::Regular_triangulation_euclidean_traits_2
<Test_rep_cartesian, Ftype> RGt;
//typedef CGAL::Regular_triangulation_euclidean_traits_2
// <Test_rep_cartesian, Ftype> RGt;
typedef CGAL::Regular_triangulation_2<RGt> RCls;
_test_cls_reg_triangulation_2( RCls() );

View File

@ -26,6 +26,9 @@
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/_test_cls_const_Del_triangulation_2.C>
// Explicit instantiation of the whole class :
template class CGAL::Constrained_Delaunay_triangulation_2<TestK>;
int main()
{

View File

@ -30,6 +30,10 @@
#include <CGAL/_test_cls_const_triang_plus_2.C>
typedef CGAL::Constrained_Delaunay_triangulation_2<TestK> CDt_ni;
// Explicit instantiation of the whole class :
template class CGAL::Constrained_triangulation_plus_2<CDt_ni>;
int main()
{
@ -44,6 +48,9 @@ int main()
typedef CGAL::Exact_predicates_tag Itag;
typedef CGAL::Constrained_Delaunay_triangulation_2<TestK,TDS,Itag> CDt;
typedef CGAL::Constrained_triangulation_plus_2<CDt> CDtplus;
_test_cls_const_triang_plus_2(CDtplus());
std::cout << "Testing constrained_triangulation_plus_2 "<< std::endl;

View File

@ -28,6 +28,9 @@
#include <CGAL/Constrained_triangulation_2.h>
#include <CGAL/_test_cls_constrained_triangulation_2.C>
// Explicit instantiation of the whole class :
template class CGAL::Constrained_triangulation_2<TestK>;
int main()
{
std::cout << "Testing constrained_triangulation "<< std::endl;