Commit Graph

61 Commits

Author SHA1 Message Date
Mariette Yvinec 39758eb8ef fixed star_hole in Constrained_triangulation_2.h
added constraint and subcondtrained iteratours in
Constrained_triangulation_plus_2.h
2002-01-28 16:36:53 +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
Mariette Yvinec 2fbb50d2d9 overload of star_hole in Constrained_triangulation_2.h
to restore constraint status
2002-01-14 17:17:51 +00:00
Sylvain Pion 66b16684de - SunPro support. 2001-12-03 09:03:48 +00:00
Mariette Yvinec d3d66c3073 - replace "assert" by "CGAL_triangulation_assertion"
- in Regular_triangulation_euclidean_traits_2<R,W>
 changed the default for W from R::FT to R::FT
2001-10-30 16:24:12 +00:00
Mariette Yvinec e972063f06 merge with branch wi_branch
different versin of Constrained_triangulation_plus_2.h
are now provided for :
exact computations
exact predicates and approximate intersection construction
no support of constraint intersections
2001-08-14 14:49:31 +00:00
Mariette Yvinec 63dc3306ac *** empty log message *** 2001-06-21 20:41:32 +00:00
Mariette Yvinec 21b40ac195 added the default for the triangulation data structure template
parameter of Constrained, Delaunay_constrained and regular triangulations
2001-06-19 20:14:39 +00:00
Mariette Yvinec fa22505e22 modified constructor from list
to make it compile with bcc and Vcc++
2001-05-21 09:21:31 +00:00
Mariette Yvinec 238e60295f added following functions
is_constrained(Edge e)
are_there_incident_constraints(Vertex_handle v)
are_there_incident_constraints(Vertex_handle v, OutputIterator out)
remove_incident_constraints(Vertex_handle v)
in Constrained_triangulation_2.h
remove_incident_constraints(Vertex_handle v)
remove_constraint (Vertex_handle va,Vertex_handle vb) in
Constrained_Delaunay_triangulation_2.h

added corresponding tests in _test_cls_constrained_triangulation_2.C
2001-05-15 07:37:36 +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 1ff8f2ce62 remove List of new_vertices from
insertion in
Constrained_Delaunay_triangulation_2.h
Constrained_triangulation_2.h
2001-04-09 16:41:04 +00:00
Sylvain Pion b89930f9a3 - Remove warning. 2001-03-05 09:38:50 +00:00
Mariette Yvinec ee0c1e72e9 fixes small bugs for g++-2.97. 2000-12-01 16:10:55 +00:00
Mariette Yvinec 83aaf13c6d cleaning up typenames 2000-12-01 13:49:12 +00:00
Mariette Yvinec 5408e3c812 cleaning up 2000-12-01 11:04:50 +00:00
Mariette Yvinec 2518c97ba4 insertion and insertion of constraints work in
Constrained_Delaunay_triangulation_2.h
 	Constrained_triangulation_2.h
 	Constrained_triangulation_plus_2.h
2000-11-29 13:14:38 +00:00
Mariette Yvinec d99639ae03 split the insert(Point a, Point b)
into distinct function to avoid duplication of code

Adapt 	Constrained_triangulation_2 and Constrained_Delaunay_triangulation
to the design of
Constrained_triangulation_plus_2
where the template parameter can either Constrained_triangulation_2
or Constrained_Delaunay_triangulation
2000-11-28 17:51:32 +00:00
Mariette Yvinec 09c878e4cd Constrained_triangulation_plus_2.h added :
a class to store a constrained triangulation plus a hiearchy
2000-11-28 15:39:08 +00:00
Mariette Yvinec 5d42969a4c add function
Vertex_handle insert(const Point& p,
		       Locate_type lt,
		       Face_handle loc, int li );
to help derived class
2000-11-28 14:36:28 +00:00
Mariette Yvinec 1b71b2693d add :
Vertex_handle push_back(const Point& a);
  void          push_back(const Constraint& c);
2000-11-10 17:37:45 +00:00
Mariette Yvinec 34fcf63371 chnaged a few comments
delete an unused variable in
insert(const Vertex_handle & va,
       const Vertex_handle & vb,
       Face_handle & fr, int & i,
       List_edges & new_edges)
of Constrained_triangulation_2.h
2000-11-10 10:37:58 +00:00
Mariette Yvinec dc573c7622 fixed include statement (e.g. supressed include of pair.h) 2000-07-06 13:27:27 +00:00
Mariette Yvinec 23ca11ef82 fixed bugs in remove_constraint() and
is_edge()
2000-06-30 15:46:22 +00:00
Mariette Yvinec 7d61330c3c fixed long lines 2000-06-30 07:17:30 +00:00
Mariette Yvinec aadabf53b6 cleaned up the separation between Constrained and Constrained_Delaunay
triangulation with and without intersections.
As a result Constrained_Delaunay_triangulation_2 and
Constrained_Delaunay_triangulation_wi_2 are nor
templated by a constrained triangulation (wi or not wi) instead of
Gt and Tds
2000-06-27 17:12:04 +00:00
Mariette Yvinec 83c76dd7cd cleaned up Constrained_triangulation_2.h
cleaning from intersectin stuff is not yet over
fixes the bug in  Constrained_triangulation_wi_2.h (not yet tested)
2000-06-21 07:26:44 +00:00
Mariette Yvinec 86d137f408 fixed oriented_side() and bounded_side() in Triangulation_2.h
fixed two bugs in Constrained_triangulation_2.h
no changes in Constrained_Delaunay_triangulation_2.h and
Triangulation_line_face_circulator_2.h
2000-06-20 16:51:49 +00:00
Mariette Yvinec 250d59bf38 Separate Constrained triangulation with intersections
from constrained triangulation without intersection
so that the intersction function is not required if not needed
2000-06-08 15:47:58 +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 78d46bb174 fixed a bug in Triangulation_2.h includes_edge member function
changes the creator of Constrained_triangulation_2.h from a list
because sweep is momemntaneously HS
2000-02-18 16:20:50 +00:00
Mariette Yvinec 4ec7525ae0 Fixed a bug in insertion of Constraint :
add a new vertex list in the argument of
void insert(const Vertex_handle & va, const Vertex_handle & vb,
	      Face_handle & fr, int & i,
	      List_edges & new_edges,
	      List_vertices & new_vertices);
and
Vertex_handle find_conflicts(Vertex_handle va,
			       Vertex_handle vb,
			       Vertex_handle vaa,
			       List_edges & list_ab,
			       List_edges & list_ba,
			       List_edges & new_edges,
			       List_vertices & new_vertices);
in order to be able to retore Delaunay prpoperty in case of
Constrained Delaunay triangulation...
2000-02-17 16:27:58 +00:00
Mariette Yvinec 5ab60506bb change new Face to create_face
and delete to delete_face
to make everything work with a Tdsul
Triangulation_data_structure_using_list_2
2000-02-16 10:46:42 +00:00
Mariette Yvinec 8dd786a787 Constrained_triangulation_2 and
Constrained_Delaunay_triangulation_2
modified to deal with intersecting constraints

in Triangulation_2
member function includes_edge has been modified
2000-01-24 08:37:14 +00:00
Mariette Yvinec 21ff6b725a cut a lon line 1999-12-02 09:23:35 +00:00
Mariette Yvinec b3722a1aa5 fixed a bug in insert function of Constrained_triangulation_2.h
introduced the fonction special_insert_in_edge in
Constrained_Delaunay_triangulation_2.h
there is still a bug in refine : it never ends
1999-11-07 17:35:41 +00:00
Mariette Yvinec 10d0fe2a82 cleaned up
unused integer parameters in Triangulation_iterators_2.h
CGAL_CFG_NO_MEMBER_TEMPLATE
1999-10-25 12:55:09 +00:00
Mariette Yvinec 9dbd5aeb09 Changed the returned face of locate
in case of OUTSIDE_AFFINE_HULL
1999-10-14 16:58:55 +00:00
Mariette Yvinec 2fc7c165a9 fixed a bug in output << operator
(clash between the varaiable name and a short name Ct for Cartesian)
1999-10-13 09:21:06 +00:00
Mariette Yvinec 06f4583cf6 added a header to Constrained_Delaunay_triangulation_2.h
Cut long lines in Constrained_triangulation_2.h
1999-10-12 07:12:22 +00:00
Mariette Yvinec 646ca3c4ef finish the insertion of jd stuff
things compile but there is a bug in is-valid() test
Delaunay constraines triangulation test crashes on damier
1999-10-11 13:33:30 +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 da97796584 added std:: 1999-10-06 09:26:50 +00:00
Mariette Yvinec 4467ce0bf0 added a few std::
add typenames to please MIPS_PRO 7.3
1999-10-04 09:58:27 +00:00
Mariette Yvinec 3e0b8c0097 modify the function
insert(const Vertex_handle & va, const Vertex_handle & vb,
	    Face_handle & fr, int & i, List_edges & new_edges)
to delete the faces to be deleted
1999-09-30 17:13:09 +00:00
Mariette Yvinec 68bdbe9249 modidy function insert(Point)
of Constrained_triangulation_2.h

corrected is_edge(Vertex_handle va, Vertex_handle vb, Face_handle &fr, int i)
in Triangulation_2.h
1999-09-30 15:21:13 +00:00
Mariette Yvinec c98954512c adapt to the changes made in insert signature functions 1999-09-30 12:35:06 +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 a4e6bef758 added Jean Daniel stuff to Constrained_triangulation_2.h :
insertion and removal of a constraint
1999-09-30 09:41:36 +00:00