Commit Graph

59 Commits

Author SHA1 Message Date
Mariette Yvinec 92f9eed65e merged midification for new design into main trunc 2003-04-17 08:11:05 +00:00
Sylvain Pion 2abaf86e24 - fixes for g++ 3.4. 2003-04-12 17:43:45 +00:00
Mariette Yvinec b94dd47260 split long lines 2002-10-25 14:16:05 +00:00
Mariette Yvinec ebae46f4f3 Replaced CGAL::Pointer by CGAL::Comparable_iterator
in the implemantatins of Face_handle and Vertex_handle
2002-08-19 14:57:04 +00:00
Mariette Yvinec 1a9f751722 changed deprecated Construct_direction_of_line_2 to
Construct_direction_2
2002-08-13 12:07:37 +00:00
Andreas Fabri 000b9b6caa Point -> const Point& 2002-07-08 08:48:18 +00:00
Mariette Yvinec 6c3a66a0ad Hack for MSVC to compile the templated insert
of Constrained_Delaunay_triangulation_2.h and
Constrained_triangulation_2.h
2002-04-10 06:46:23 +00:00
Mariette Yvinec a026cca8ce replaced Dummy_output_iterator by Emptyset_iterator 2002-03-08 14:43:57 +00:00
Mariette Yvinec 7db3b024a5 - adapted 2d triangulations to the DS_Container
- Iterators for finite elements implemented via a filtered iterator
2002-03-01 09:21:02 +00:00
Mariette Yvinec c8dddb9f03 major change in Triangulation package :
-suppression of Triangulation_face_2 and Triangulation_vertex_2 classes
   the TDS and Triangulation now have the same faces and vertices
   defined in TDS class
   as well as Face_handle and Vertex_handle
  -supression of Triangulation_default_data_structure_2
   and Triangulation_data_structure_using_list_2. There is now only
   one Triangulation_data_structure_2 (which for the moment is still
   using list).
2002-01-21 13:12:40 +00:00
Sylvain Pion 66b16684de - SunPro support. 2001-12-03 09:03:48 +00:00
Sylvain Pion 149cfe09fd - Use make_object(). 2001-10-08 14:20:12 +00:00
Mariette Yvinec 98f20dce1f changed the names of conflicts function in Delaunay and
constrained Delaunay triangulations
2001-06-22 09:35:33 +00:00
Mariette Yvinec 58609f6484 tried to fix examples
a priori no changes in Delaunay_triangulation_2.h  and
Triangulation_data_structure_using_list_2.h
2001-06-21 15:30:02 +00:00
Mariette Yvinec 491cd0e41a changed find_conflicts to get_conflicts
to avoid VCC and BCC confusion with the
deprecated (non templated version) of find_conflicts

changed
  void insert(const Point & a, const Point & b);
to
  void insert(const Point a, const Point b);
in Constrained_Delaunay_triangulation_2.h.
The first one is confused by VCC and BCC with the templated insert
2001-06-20 09:32:55 +00:00
Mariette Yvinec 10e7e0b039 fixed problems related to the change from Less_distance_to_point_2
to Compare_distance_2
added std:: in front of iterator_traits< >
2001-06-14 15:06:48 +00:00
Mariette Yvinec 749e2cef2c cleaning commented lines 2001-06-12 16:57:03 +00:00
Mariette Yvinec 85dc41202c replace Less_distance_to_Point_2 by Compare_distance_2 2001-06-12 11:52:35 +00:00
Mariette Yvinec 9485ed0706 modified find_conflicts in Delaunay_triangulation_2.h
to help resolution of overloaded fir bcc and VC++ compilers

add star_hole functions in Triangulation_data_structure_using_list_2.h
Triangulation_data_structure_using_list_2.h
Triangulation_2.h

add point iterators and corresponding test in Triangulation_2.h
_test_triangulation_iterators.C

cleaned up tests in test_triangulation_2.C
test_triangulation_2_bis.C


add test for star_hole in _test_cls_triangulation_2.C
_test_cls_triangulation_2.C _test_cls_triangulation_short_2.C
2001-05-21 08:51:35 +00:00
Mariette Yvinec 77b75548dc added std:: in front of back_inserter 2001-05-14 09:21:55 +00:00
Mariette Yvinec b72704d0f2 added default on Delaunay_triangulation_2.h
add Dummy_output_iterator.h
2001-05-07 17:20:10 +00:00
Mariette Yvinec ad6448d45a try to introduce Point iterators but drop it for now
Fixed the doc for new find_cinflicts and boundary_of_conflict zone
member function
2001-05-02 08:01:47 +00:00
Mariette Yvinec c2e6de4240 fixed a bug in cw_permute() of Constrained_triangulation_face_base_2.h
fixed the test of constrained triangulation
2001-04-30 12:56:11 +00:00
Mariette Yvinec 14d338ada0 changed the find_cinlicts member functions 2001-04-27 09:25:04 +00:00
Mariette Yvinec 1abac98e88 add dual functions to regular triangulation
reorganise circuncenter functions
2000-12-13 09:14:57 +00:00
Mariette Yvinec d0d1cd4cff fixed does_conflict 2000-09-01 11:43:30 +00:00
Mariette Yvinec 9787b385a1 add the following functions
public:
  bool does_conflict(const Point  &p, Face_handle fh) const;
  bool find_conflicts(const Point  &p,
		      std::list<Face_handle>& conflicts,
		      Face_handle start = Face_handle()) const;
private:
 void propagate_conflicts(const Point &p,
			   Face_handle fh,
			   int i,
			   std::list<Face_handle>& conflicts) const;
no test added for them in testsuite
2000-08-31 16:39:39 +00:00
Mariette Yvinec 75af27fa43 fix the copy of vertices in copy_tds() 2000-08-01 06:52:50 +00:00
Mariette Yvinec 03e27c08e9 A few modif related to the traits (end of kernel traits compatibility). 2000-07-28 15:04:56 +00:00
Mariette Yvinec 0d5108b4ef undo an erroneous fixing in header 2000-06-30 09:22:06 +00:00
Mariette Yvinec 7d61330c3c fixed long lines 2000-06-30 07:17:30 +00:00
Mariette Yvinec 0ae162a130 fixed the fonction dual() of an edge 2000-06-22 16:57:28 +00:00
Mariette Yvinec df25855687 Changed the triangulation traits classes
and the requirements for those classes
to agree with the concept of Kernel traits
2000-06-08 15:11:17 +00:00
Mariette Yvinec 15a406eef4 add typename and typedefs
here and there to compile with -pedantic
2000-02-18 17:48:49 +00:00
Mariette Yvinec 642d7e1c8b add typedefs for Segment and Triangle 2000-01-24 08:17:51 +00:00
Mariette Yvinec 47aa2c8220 rename fill_hole in regular triangulation to
fill_hole_regular

suppress argument face_around in stack_flip_dim1
in Regular_triangulation_2.h
1999-10-25 12:30:28 +00:00
Mariette Yvinec 5de618854f suppress the argument Vertex_handle in
fill_hole of regular triangulations
fill_hole_delaunay
1999-10-25 12:12:58 +00:00
Mariette Yvinec 668e209579 To avoid duplicating code for remove operation
in constrained_Delaunay_triangulation :
remove overloading of fill_hole() in Delaunay_triangulation_2
and put fill_hole_delaunay() in Triangulation_2

rewrite of remove in Constrained_triangulation_2.h
1999-10-11 08:40:49 +00:00
Mariette Yvinec 61bffb46fb changed the return type in the definition of
dual(FAce_handle)
1999-10-07 10:04:26 +00:00
Mariette Yvinec b969c869ee fixed is_valid() default arguments
Face::Face_handle(ff) to Face_handle(ff) in one of the constructor
1999-10-05 07:12:45 +00:00
Mariette Yvinec cebc2c51c9 changed insert function to the following :
Vertex_handle insert(const Point &p, Face_handle start = Face_handle() );
// if location is unknown

  Vertex_handle insert(const Point& p,
		       Locate_type lt,
		       Face_handle loc, int li );
 // if location is known
1999-09-30 11:54:09 +00:00
Mariette Yvinec 17c47fb509 idem 1999-09-17 07:02:01 +00:00
Mariette Yvinec b7e1795876 fixed a bug in draw_dual(Stream & ps) 1999-09-17 06:48:02 +00:00
Mariette Yvinec dfddeb8b15 Change f->opposite_index(int i ), f->opposite_vertexint (int i)
to     f->mirror_index(int i), f->mirror_vertex(int i)

add new functionalities to Tds and Triangulation :
Face_handle add_face(Face_handle f1, int i1,
		       Face_handle f2, int i2,
		       Face_handle f3, int i3);
  Face_handle add_face(Face_handle f1, int i1,
		       Face_handle f2, int i2);
  Face_handle add_face(Face_handle f, int i, Vertex_handle v);
And change the code of remove_2D() in Triangulation_2.h
and Delaunay_triangulation_2.h

Incoporate some of the changes made in Dagsthul
to compile with VC++
1999-09-06 14:17:03 +00:00
Mariette Yvinec 07ce07355c OK 1999-08-17 17:21:22 +00:00
Mariette Yvinec 119e8415f9 make Delaunay triangulation compiles with
the new typedef required by MIPSPro
1999-08-16 09:23:41 +00:00
Mariette Yvinec 6be7b081fc Constrained triangulation have been adapted to new design of Tds
typedef included in derived triangulation for the requirement of
MIPSPRO 7.3
output and input poperators suppressed for delaunay and constrained triangulation : after all, inheritance works well
dimension() retrieved from Triangulation_ds_face_2
and included in Triangulation_face_base_2

compiles and runs (at least with gcc 2.95)
the additionnal typedef in derived classes causes compiler internal error
with egcs (at lest with the function insert* returning a vertex_handle,
when defined outside the class
1999-08-06 16:15:03 +00:00
Mariette Yvinec dd21ca6282 Put the template member functins at the end of class definition
add the function
template < class Stream>
Stream& draw_triangulation()
1999-08-04 08:54:22 +00:00
Mariette Yvinec 8bc877e26d Delaunay has been converted to new Tds
Testsuite compiles and runs except the test of duality
1999-08-03 17:35:38 +00:00
Mariette Yvinec e33d3b5e32 resolved conflict from merge4 1999-07-05 14:58:20 +00:00