Commit Graph

111 Commits

Author SHA1 Message Date
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 c08e6771b0 patches suggested by Dima for bcc 1999-11-26 16:21:56 +00:00
Mariette Yvinec cacc63f292 added a value of 4 to li when locate return OUTSIDE_CONVEX_HULL 1999-10-25 16:34:01 +00:00
Mariette Yvinec e8be47ed83 added a value li=4 when point is located within a face
(in that case li has no meaning and should not be used)
1999-10-25 16:23:36 +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 7ddfa787f3 cosmetic move of declaration of circumcenter() 1999-10-18 13:59:42 +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 f91e3132aa fixed some inline which where after thr return type 1999-10-11 16:43:36 +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 f9222a559d fixed show_face(Face_handle fh)
and show_all()
1999-10-07 09:51:02 +00:00
Mariette Yvinec 029d001cb3 cleaned up
insert(const Point& p, Locate_type lt, Face_handle loc, int li)
1999-10-06 09:10:19 +00:00
Mariette Yvinec 4593023674 fixed a bug in insert(p, lt, li, i) 1999-10-06 09:03:50 +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 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 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
Mariette Yvinec 4827c742a3 fixed a small bug in creator
of Triangulation_default_data_structure_2
1999-09-28 14:04:40 +00:00
Mariette Yvinec cddd8c2450 added functions is_edge(...) includes_edge()
to Triangulation_2 and Triangulation_default_data_structure_2
1999-09-27 17:31:31 +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 f695d3baf9 changed preconditions of insert_outside_convex_hull_1
such that there is no more warnings for unused variables
when compiling without preconditions..
1999-08-27 06:56:50 +00:00
Mariette Yvinec aec5359203 corrected file_input and file_ouput of Triangulation_2
and Triangulation_default_data_structure_2
to make them skip the ouput of the dummy point
associated with the infinite vertex
1999-08-19 07:04:59 +00:00
Mariette Yvinec 6bd5047011 add a comment in Triangulation_2.h for collinear_between(p,q,r)
add a precondition in f->opposite_index(int i)
                   and f->opposite_vertex(int i)
1999-08-18 12:44:35 +00:00
Mariette Yvinec 07ce07355c OK 1999-08-17 17:21:22 +00:00
Mariette Yvinec bbd886ac3d new triangulation working
examples compile and run
1999-08-17 13:55:44 +00:00
Mariette Yvinec dc6dd31582 fold too long lines
add old iterator types and functions to Triangulation_2.h
for backward compatibility
1999-08-17 12:27:13 +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 67718b35a7 change cerr and endl to std::cerr and std::endl
in functions
show_all and show_face
1999-08-04 10:36:31 +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 690fec47cf remove const & from handles argument
put a default face_handle argument to circulators
which alloewd to get rid of one over two functions ...

testsuite compiles and runs
1999-08-02 17:18:18 +00:00
Mariette Yvinec 028034e822 cleaning up, testsuite compiles and runs 1999-07-30 07:35:44 +00:00
Mariette Yvinec eee8dc527a added std:: or CGAL_STD before ptrdiff 1999-07-29 15:58:25 +00:00
Mariette Yvinec fb004121b4 At this point New Triangulation compiles and testsuite runs 1999-07-26 17:15:49 +00:00
Mariette Yvinec 461f4e4dee Triangulation_2 new scheme - first trial 1999-07-21 14:21:55 +00:00
Mariette Yvinec e33d3b5e32 resolved conflict from merge4 1999-07-05 14:58:20 +00:00
Mariette Yvinec 40f91b1e24 resolved conflicts after merge3 1999-07-05 13:32:35 +00:00
Mariette Yvinec 2f94c6588d resolve conflicts after merge2 1999-07-02 16:46:27 +00:00
Mariette Yvinec eb753dc22d resolved conflicts from merge2 1999-07-01 07:57:12 +00:00
Mariette Yvinec 27b3b9da64 added a fonction init() to be used in the creators 1998-12-01 10:36:29 +00:00
Mariette Yvinec df941925a1 added a fonction init, used in clear() 1998-12-01 09:35:04 +00:00
Mariette Yvinec 946f28262b add clear() in copy_triangulation 1998-11-30 18:00:59 +00:00
Mariette Yvinec cde99ebcff fixed a bug in copy constructor and copy_triangulation 1998-11-30 17:19:08 +00:00
Mariette Yvinec 17f766209b changed :
Delaunay_triangulation_2.h remove
Triangulation_2.h  copy, os ,is
Triangulation_default_data_structure_2.h  copy os is
etc...
1998-11-17 15:05:50 +00:00
Mariette Yvinec cb7b2513dd fixed the member function Tds::is_valid()
to account for the 0 and !-dimensional triangulations

fixed march_locate_1D( ...) in Triangulation_2.h
(The value of li was erroneously set to 3 in some cases)

add a precondition on the dimension to the member function
CGAL_Oriented_side
    oriented_side(const Face_handle& f, const Point &p) const
1998-11-16 15:43:29 +00:00
Mariette Yvinec 4c9ab0570b fixed a bug in Triangulation_2.h make_hole()
fixed a bug in Triangulation_default_data_structure_2.h remove_down(Vertex* v)
1998-11-13 16:30:03 +00:00
Mariette Yvinec 3b3a196b11 fixed a bug in Triangulation_ds_iterators_2.h (associated_edges)
a bug in 	Triangulation_2.h  : make_hole for Delete_2D
two  bugs in Triangulation_default_data_structure_2.h : is_valid()
and number_of_faces()
fixed the creators in Triangulation_circulators_2.h
1998-11-10 17:59:47 +00:00
Mariette Yvinec 51ad63460a merged with the branvh b6aout tag merge1 1998-11-10 08:05:58 +00:00
Mariette Yvinec b61572171c changed representation of One dimensional triangulations 1998-08-14 15:55:01 +00:00
Mariette Yvinec 4650ac7da4 changing the one dimensional degenerate case 1998-08-10 09:27:40 +00:00
Mariette Yvinec 0f7af869a3 removed a CGAL_precondition on finite_vertex()
which made swap() plant
1998-08-05 12:54:40 +00:00
Mariette Yvinec c1f50c5174 changed const Face_handle & arguments to Face_handle
idem for Vertex-handle
1998-08-04 09:38:26 +00:00
Mariette Yvinec c93fffc7df introduced the following functions
for geometric safe operations
insert_first
insert_second
insert_in_fsce
insert_in_edge
insert_collinear_outside
1998-07-30 13:22:00 +00:00
Mariette Yvinec be731e0108 change insert_colinear_outside
to insert_collinear_outside
1998-07-23 07:18:23 +00:00
Mariette Yvinec 911dec5ec8 change the test == in insert to Geom_traits.compare( ) 1998-07-22 15:01:43 +00:00
Mariette Yvinec 2c7a8f68bb fixed one more bug in Line_face_circulator(Vertex_handle v,.... 1998-07-02 10:17:53 +00:00
Mariette Yvinec 516de53e6e fixed a bug in march_locate_2D
in the case where lfc.collinear_outside is true
lt==EDGE was not correctly dectected
1998-07-02 07:37:07 +00:00
Mariette Yvinec a6388895e0 suppress _gt() from the default constructor
to compile
with traits class without explicit constructor without arguments
1998-06-30 08:42:22 +00:00
Mariette Yvinec 4036554d21 change the template parameter of Triangulation class
from <Tds>
to <Gt,Tds>
1998-06-29 15:28:22 +00:00
Mariette Yvinec 968768665e Initial revision 1998-06-26 08:18:10 +00:00