Sylvain Pion
bbe6d95287
- fix protect macro.
2001-02-13 16:35:39 +00:00
Sylvain Pion
7734657c8f
- Regenerate triangulation_assertions.h to avoid old style casts.
2001-02-13 16:27:36 +00:00
Mariette Yvinec
d3930979a6
fixed include lines
2001-02-08 12:22:27 +00:00
Mariette Yvinec
73fe217ae0
add a default for the TDS of Triangulation_2
2001-01-09 15:47:47 +00:00
Mariette Yvinec
44da2ab684
add a typename for Segment in draw_dual
2000-12-27 08:08:17 +00:00
Mariette Yvinec
9b3ca76f23
fixed file name in header
2000-12-26 09:18:52 +00:00
Mariette Yvinec
06d74c46bf
-#endif CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_HOMOGENEOUS_2_H
...
+#endif //CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_HOMOGENEOUS_2_H
2000-12-26 08:57:52 +00:00
Mariette Yvinec
536cfc45ab
add a few typedef
2000-12-26 08:54:34 +00:00
Mariette Yvinec
c91c37300c
add header to files
2000-12-22 08:00:21 +00:00
Mariette Yvinec
5b1e33d68f
fixed the signature of flip
2000-12-21 15:20:54 +00:00
Sylvain Pion
dbfca4bd56
- Cut too long lines.
2000-12-14 13:26:57 +00:00
Mariette Yvinec
f1fbbfa29d
supressed a debug cout in Triangulation_hierarchy_2.h
...
added a typename for List_edges::const_iterator in
Triangulation_data_structure_using_list_2.h
Triangulation_default_data_structure_2.h
2000-12-14 09:02:02 +00:00
Mariette Yvinec
f7df2914b9
fixed precondition in dual
2000-12-13 10:19:47 +00:00
Mariette Yvinec
3c13087d0e
added constructions for dual functions
2000-12-13 09:17:11 +00:00
Mariette Yvinec
62b0856511
fixed input-output of weighted points
2000-12-13 09:15:24 +00:00
Mariette Yvinec
1abac98e88
add dual functions to regular triangulation
...
reorganise circuncenter functions
2000-12-13 09:14:57 +00:00
Mariette Yvinec
d93491600e
change
...
typedef Constrained_triangulation_2<Gt, Tds> Ct;
to
typedef Constrained_triangulation_2<Gt, Tds> Ctr;
to avoid a clash with VC++ compilers
2000-12-11 10:28:41 +00:00
Mariette Yvinec
60235b172a
added a typedef for Locate_type
2000-12-11 10:08:38 +00:00
Mariette Yvinec
605cd0a098
cleaned up
2000-12-08 16:49:14 +00:00
Mariette Yvinec
c049ad08f0
cleaned up
2000-12-08 16:45:45 +00:00
Mariette Yvinec
9680ae47a6
added
...
make_hole
star_hole
create_vertex()
delete_vertex()
2000-12-08 16:29:50 +00:00
Mariette Yvinec
5f0f22f6b7
added create_vertex()
...
delete_vertex()
and cleaned up
2000-12-08 15:11:19 +00:00
Mariette Yvinec
cdf4417f7d
add make_hole
...
star_hole
2000-12-08 15:05:59 +00:00
Sylvain Pion
54192706b9
- Use get_new_id().
2000-12-07 15:33:42 +00:00
Sylvain Pion
5b6df147bc
- Regenerate triangulation_assertions.h.
2000-12-05 21:49:25 +00:00
Sylvain Pion
bbed6ef62a
- New file.
2000-12-05 14:00:45 +00:00
Sylvain Pion
9dad7d7f0b
- Regular triangulation support for simple cartesian kernels.
2000-12-04 18:30:53 +00:00
Mariette Yvinec
2d85066bfe
cut long lines
2000-12-04 08:28:31 +00:00
Mariette Yvinec
ee0c1e72e9
fixes small bugs for g++-2.97.
2000-12-01 16:10:55 +00:00
Mariette Yvinec
e975b7fc22
cleaning up typedefs
2000-12-01 14:45:19 +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
770fda7634
a few cleaning
2000-11-28 10:28:56 +00:00
Mariette Yvinec
8f1364a78b
added a Constraint_hirearchy to
...
Constrained_triangulation_wi_2.h
2000-11-28 10:15:25 +00:00
Mariette Yvinec
32b986272e
add a the following typedef
...
typedef Weighted_point Point_2;
2000-11-27 17:51:24 +00:00
Mariette Yvinec
5ce7e36c84
removed name of in copy constructeur and assignement operator
...
of unused argument of
Triangulation_euclidean_traits_xy_3.h
Triangulation_euclidean_traits_xz_3.h
Triangulation_euclidean_traits_yz_3.h
2000-11-27 13:34:04 +00:00
Mariette Yvinec
def2f5f650
Version imported from Olivier Billet
...
Conform package
2000-11-16 15:25:43 +00:00
Mariette Yvinec
dbb2cadc9f
Replace the CGAL_TYPENAME_MSVC_NULL by typenames
...
in Triangulation_iterators_2.h
Rename the variabled previuosly named "or" in
Triangulation_line_face_circulator_2.h for g++2.97
2000-11-14 12:39:31 +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
b914d9a118
fixe a bug in stack_flip_4_2 :
...
two following lines were in the reversed wrong order:
hide_vertex(h1, vq->point());
remove_degree_3(vq,g);
2000-11-02 15:59:54 +00:00
Mariette Yvinec
38b47e1c2d
temporary modified to try to find out
...
why it loops on VC++ :
suppress the insertion of random points
add a cout to ouput the insertion level of each point
2000-09-14 09:30:17 +00:00
Mariette Yvinec
cf23e27b98
add {} in copy_triangulation
...
to please VCC : redefinition of int varaibles in loops
2000-09-11 07:10:37 +00:00
Mariette Yvinec
ea8611df79
change dummy template parameter type from "Triangulation" to "Tr"
...
to try to make Kcc and Vcc compile
2000-09-07 17:46:48 +00:00
Mariette Yvinec
d0d1cd4cff
fixed does_conflict
2000-09-01 11:43:30 +00:00
Mariette Yvinec
9061bec8a6
changed in constructors :
...
hierarchy[i] = new Tr_Base();
to
hierarchy[i] = new Tr_Base(traits);
2000-08-31 17:28:46 +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
642a3f57e2
fixed long line
2000-08-29 11:54:23 +00:00
Mariette Yvinec
03adea0801
add typedefs for parameters Vb and Fb in
...
Triangulation_data_structure_using_list_2<Vb,Fb>
Triangulation_default_data_structure_2<Gt,Vb,Fb>
make public the typedef for Point in Triangulation_hierarchy_vertex_base_2
2000-08-29 06:53:27 +00:00
Mariette Yvinec
ab6ae7f421
fixed conpare_yz_3()
2000-08-25 13:07:19 +00:00
Mariette Yvinec
8fbb957957
fixed copy_tds
...
so that the faces of the new triangulations
copy the used added extra attribute of face if any
uses create_face(&(*ib) + set_vertices
instead of new Face((Vertex*) .....);
2000-08-21 13:52:47 +00:00
Mariette Yvinec
59ea53dd18
changed dummy parameter Vb to Vbb in Triangulation_hierarchy_2.h
...
add typedef for dummy parameters Vb and Fb in
Triangulation_ds_face_2.h
Triangulation_ds_vertex_2.h
Triangulation_dsul_face_2.h
Triangulation_dsul_vertex_2.h
2000-08-21 12:26:54 +00:00
Mariette Yvinec
7a9b8ea44e
change a forgotten Base to Tr_Base
2000-08-16 07:38:24 +00:00
Mariette Yvinec
3655928b05
changed Base to V_Base in Triangulation_hierarchy_vertex_base_2
...
and to Tr_Base in Triangulation_hierarchy_2
2000-08-11 12:58:37 +00:00
Mariette Yvinec
e8a8315d6a
fixed the constant point B
2000-08-08 16:26:28 +00:00
Mariette Yvinec
bbce4eecfb
fixed long lines and header
2000-08-07 14:48:00 +00:00
Mariette Yvinec
abec03e310
Traits class to build a 2D triangulations
...
out of 3d coplanar points
2000-08-07 08:17:16 +00:00
Mariette Yvinec
108b0e448f
*** empty log message ***
2000-08-07 07:11:09 +00:00
Mariette Yvinec
e918a37eb5
mv Delaunay_hierarchy_2.h into Triangulation_hierarchy_2.h
2000-08-04 09:26:26 +00:00
Mariette Yvinec
c3792a1432
first version of Delaunay_hierarchy
2000-08-01 15:37:29 +00:00
Mariette Yvinec
837a9e3b18
fixed a long line
2000-08-01 14:05:07 +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
f2f0d83ebd
added is_face()
...
fixed is_edge()
2000-07-27 06:40:44 +00:00
Mariette Yvinec
4a6c786883
try to make is_edge compile on vcc
2000-07-26 16:28:17 +00:00
Mariette Yvinec
40878eb197
replace some old fashion cast by static_cast in Triangulation_ds_face_2.h
...
Triangulation_ds_vertex_2.h
Try to make is_edge compile on vcc
2000-07-26 16:21:42 +00:00
Mariette Yvinec
04fa8197fa
add inlines to ++ --, increment and decrement
2000-07-24 11:29:11 +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
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
cb3771f248
Transform classes Constrained_Delaunay_triangulation_2
...
and Constrained_Delaunay_triangulation_wi_2.h
en Constrained_Delaunay_triangulation_base_2
et Constrained_Delaunay_triangulation_wi_base_2
add classes
template <class Gt, class Tds>
class Constrained_Delaunay_triangulation_2
and
template <class Gt, class Tds>
class Constrained_Delaunay_triangulation_wi_2
2000-06-29 15:26:42 +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
4219e7a711
add CGAL_NTS macro in front of calls to sign, compare, square ... etc
2000-06-26 14:27:18 +00:00
Mariette Yvinec
f1097c3552
fixed header
2000-06-23 15:19:02 +00:00
Mariette Yvinec
0ae162a130
fixed the fonction dual() of an edge
2000-06-22 16:57:28 +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
61cb7a3a05
added
...
typedef const value_type& const_reference;
needed by BCC5.5 for push_back to work
2000-05-16 16:35:10 +00:00
Mariette Yvinec
275609f41f
add operator
...
bool operator<(const Pointer& p) const;
in pointer.h and the doc
2000-04-14 14:35:19 +00:00
Mariette Yvinec
92300d02a2
fixed the return statement of
...
remove_first
remove_second
2000-03-17 17:25:07 +00:00
Mariette Yvinec
182608fe8e
fixed long lines
2000-02-28 12:12:39 +00:00
Mariette Yvinec
b92b6a277e
suppressed break statement after return
...
in the switch of
insert(const Point& p, Locate_type lt, Face_handle loc, int li)
2000-02-28 10:19:22 +00:00
Mariette Yvinec
80891b4596
fixed the default parameter declaration of insert_dim_up
2000-02-28 10:14:44 +00:00
Mariette Yvinec
2fa8396413
added typename in
...
typedef typename Triangulation_dsul_iterator_base_2<Tds>::Face Face;
2000-02-28 10:03:33 +00:00
Mariette Yvinec
cb089f5378
fixed headers and long lines
2000-02-21 16:29:26 +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
6b6a84acc9
add the typedef
...
typedef Triangulation_face_circulator_2<Gt,Tds> Face_circulator;
2000-02-18 07:50:44 +00:00
Mariette Yvinec
5e611dc89b
add typedef to please -pedantic option
...
typedef Triangulation_ds_iterator_base_2<Tds>::Face Face
typedef Triangulation_dsul_iterator_base_2<Tds>::Face Face
2000-02-17 18:28:03 +00:00
Mariette Yvinec
7931e611dc
changed std::list<Face*>::iterator and std::list<Vertex*>::iterator
...
to
typename std::list<Face*>::iterator
typename std::list<Vertex*>::iterator
2000-02-17 17:59:40 +00:00
Mariette Yvinec
681085de61
changed Hole::iterator
...
to typename Hole::iterator
2000-02-17 17:52:27 +00:00
Mariette Yvinec
a017481767
fixed some typedef
2000-02-17 16:47:36 +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
76774eb520
change add_face to create_face
...
add missing create _face in Triangulation_default_data_structure_2.h
fixed Triangulation_ds_iterators_2.h to handle decrease of past_the_end
2000-02-14 17:05:35 +00:00
Mariette Yvinec
59fc9f2ec7
added Triangulation_data_structure_using_list_2
2000-02-10 17:50:45 +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
642d7e1c8b
add typedefs for Segment and Triangle
2000-01-24 08:17:51 +00:00
Mariette Yvinec
184147d074
added
...
#include <list> to Regular_triangulation_face_base_2.h
1999-12-10 15:05:54 +00:00
Mariette Yvinec
21ff6b725a
cut a lon line
1999-12-02 09:23:35 +00:00
Mariette Yvinec
0e99dc6794
fixed bugs in previous correction
1999-12-01 10:55:38 +00:00
Mariette Yvinec
33f185d84d
added
...
#include <CGAL/Segment_2_Segment_2_intersection.h>
in Triangulation_euclidean_traits_2.h
to deal with intersecting constraints in Constrained triangulations
added a creator of Face_handle with Line_face_circulator
1999-12-01 09:44:12 +00:00
Mariette Yvinec
c08e6771b0
patches suggested by Dima for bcc
1999-11-26 16:21:56 +00:00
Mariette Yvinec
8e1321ad89
changed the copy constructor in Triangulation_ds_face_2.h
...
to fix a bug in refinement of Constrained_Delaunay_triangulation_2
1999-11-12 09:47:04 +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
a5e3d92bd4
fixed a bug in stack_flip_3_1
1999-10-28 16:21:10 +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
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
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
0e674c4f80
fixed the templated constructor
1999-10-22 07:50:08 +00:00
Mariette Yvinec
4f8fc8c680
Slightly modify copy constructor
...
Introduces a templated constructor with input an iterator
on a list of constraints
1999-10-22 07:30:03 +00:00
Mariette Yvinec
7ddfa787f3
cosmetic move of declaration of circumcenter()
1999-10-18 13:59:42 +00:00
Mariette Yvinec
922c4cbd01
move the definitions of nested class Neighbor_list,
...
Chain, Event_less and Status_comp
before
to please MSVC
1999-10-18 13:36:03 +00:00
Mariette Yvinec
5d2c175c0d
retablish the Distance typedef in Triangulation_euclidean_traits_xy_3.h
...
cosmetics fixes in Triangulation_euclidean_traits_xz_3.h
and Triangulation_euclidean_traits_yz_3.h
1999-10-15 16:45:06 +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
cf1302dedf
ended the addition of Jean Daniel stuff
...
Compiles and run with the file damier
removal and meshing function not yet tested
1999-10-11 16:45:49 +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
03bd74295d
Change the Distance subtypes in Triangulation_euclidean_traits_??_3.h
1999-10-07 14:16:03 +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
f9222a559d
fixed show_face(Face_handle fh)
...
and show_all()
1999-10-07 09:51:02 +00:00
Mariette Yvinec
da97796584
added std::
1999-10-06 09:26:50 +00:00
Mariette Yvinec
93c33b6255
typename added in
...
typedef typename Event_queue::iterator Event_queue_iterator;
typedef typename Sweep_status::iterator Sweep_status_iterator;
1999-10-06 09:15:00 +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
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
Mariette Yvinec
fee4be1880
added std to list::
1999-09-28 16:57:49 +00:00
Mariette Yvinec
4e487f3b1c
Changed name of some iterators variables to avoid
...
multiply defined stuff with M$VC++
1999-09-28 16:51:34 +00:00
Mariette Yvinec
05bf6d1c66
Changes for M$Visual C++ support
...
changes some iterator names in Triangulation_default_data_structure_2
some typenames (to avoid clahes) in Triangulation_face_2 and
Triangulation_vertex_2.h
added CGAL_TYPENAME_MSVC_NULL in Triangulation_iterators_2.h
1999-09-28 16:37:30 +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
90aea285e3
move function reorient from class Triangulation_ds_face_2 to class
...
Triangulation_face_base_2
add two functions ccw_permute() and cw_permute to Triangulation_face_base_2
Modify tds functions insert_dim_up() and remove_dim_down()
accordingly
1999-09-27 09:01:30 +00:00
Mariette Yvinec
692f067bec
*** empty log message ***
1999-09-24 14:46:05 +00:00
Mariette Yvinec
872579c66b
commit changed in include files new kernel
1999-09-24 13:30:05 +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
ca15d04174
fixed the header
1999-09-01 15:38:04 +00:00
Mariette Yvinec
110d91c077
changes made in Dagstuhl to comply to MSVC++
...
includes :
include codes of operators * and -> in class definition of
Tds iterators
Change the power_test
Change names for representation in traits
1999-09-01 14:37:41 +00:00
Mariette Yvinec
c7a58366b1
reverse from Triangulation_window_stream.h to triangulation_Window_stream.h
...
because MS$ doesnot distnguishes cases
1999-09-01 11:52:09 +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
d9ae9526f0
fixed banner of Triangulation_window_stream.h
...
and long lines in Triangulation_ps_stream.h
1999-08-26 14:23:46 +00:00
Mariette Yvinec
17fe611816
readded for backward compatibility
...
just includes the new named file Triangulation_window_stream.h
1999-08-24 07:09:36 +00:00
Mariette Yvinec
c6547093a1
fixed small bugs creating memory leaks in
...
insert_in_edge
remove_second
1999-08-19 15:06:02 +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
e525b13da8
header corrected
1999-08-18 08:40:34 +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
7676cd81ec
make regular triangulation work with new Tds
...
testsuite compiles and runs
1999-08-17 11:50:54 +00:00
Mariette Yvinec
1bbc7378ce
retablish the file
...
which had been scrtched with Regular_triangulation_ftC2.h
1999-08-16 15:56:52 +00:00
Mariette Yvinec
cde1244fd4
added package line in the banner
...
just to check the commit
1999-08-16 12:34:24 +00:00
Mariette Yvinec
256688762c
Move to main trunc
1999-08-16 12:28:19 +00:00
Mariette Yvinec
cb9c49c222
fixed a bug in edge circulators
1999-08-16 10:22:11 +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
0133386852
added typedef for MIPS PRO 7.3
...
begin to make constrained triangulation work with new Tds design
1999-08-05 13:59:24 +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
220beb4baf
OK
1999-08-04 08:55:51 +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
44d8bb76e4
added Triangulation_ps_stream.h
...
renamed triangulation_Window_stream.h -> Triangulation_window_stream.h
make use of template member function of triangulation
template<class Stream>
Stream& draw_triangulation()
1999-08-04 08:52:34 +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
96c3623a49
fixed some bugs in operator --
1999-08-02 16:41:11 +00:00
Mariette Yvinec
066b965c7b
cleaned up circulators
...
removed copy constructors ans assignement opeartors because default are OK
1999-08-02 13:33:02 +00:00
Mariette Yvinec
e08ae96a3e
cleaned up, test suite compiles and runs
1999-07-30 16:41:42 +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
9e258d5efc
Changed creators of Vertex and Edge iterators
...
operators ++ and --
1999-07-22 08:00:05 +00:00
Mariette Yvinec
461f4e4dee
Triangulation_2 new scheme - first trial
1999-07-21 14:21:55 +00:00
Mariette Yvinec
2ffbb9a22a
changee operators--()
1999-07-21 14:14:36 +00:00
Mariette Yvinec
51cd18e217
cleaned up
...
slightly modified is_valid()
1999-07-19 12:26:17 +00:00
Mariette Yvinec
a9d596d6fa
cleaned up
1999-07-16 17:03:26 +00:00
Mariette Yvinec
661b9583cf
cleaned up
1999-07-16 16:34:02 +00:00
Mariette Yvinec
11d9d91f81
up to this point
...
test_triangulation_tds.C compiles and runs
1999-07-16 13:19:49 +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
8d18cc6eba
resolved one forgotten conflict from merge2
1999-07-01 07:58:54 +00:00
Mariette Yvinec
eb753dc22d
resolved conflicts from merge2
1999-07-01 07:57:12 +00:00
Mariette Yvinec
3257f94a0e
resolved conflicts from merge2
...
suppress triangulation_print_OFF.h which is in polyhedron/examples package
1999-07-01 07:55:59 +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
5199e9dd6f
add a return type and an argument in copy_tds
1998-11-30 17:46:03 +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
f14c1dd175
change operator!=
...
to avoid a warning for NULL type
1998-11-16 15:48:45 +00:00
Mariette Yvinec
24cad7822d
fixed the is_valid() member functions
...
to take into account 0 and 1-dimensional face
1998-11-16 15:47:22 +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
26950237d6
merged with the branch b6aout tag merge1
1998-11-10 08:07:23 +00:00
Mariette Yvinec
51ad63460a
merged with the branvh b6aout tag merge1
1998-11-10 08:05:58 +00:00
Mariette Yvinec
2fb63cff51
This commit was generated by cvs2svn to compensate for changes in r692,
...
which included commits to RCS files with non-trunk default branches.
1998-11-06 18:17:24 +00:00
Mariette Yvinec
515cbbb128
This commit was generated by cvs2svn to compensate for changes in r579,
...
which included commits to RCS files with non-trunk default branches.
1998-10-09 14:10:33 +00:00
Mariette Yvinec
32657b13f9
This commit was generated by cvs2svn to compensate for changes in r499,
...
which included commits to RCS files with non-trunk default branches.
1998-09-23 08:02:46 +00:00
Mariette Yvinec
3ce581c6d7
Initial revision
1998-09-14 08:36:25 +00:00
Mariette Yvinec
3f6a942909
This commit was generated by cvs2svn to compensate for changes in r473,
...
which included commits to RCS files with non-trunk default branches.
1998-09-14 08:36:25 +00:00
Mariette Yvinec
cdb94b8feb
This commit was generated by cvs2svn to compensate for changes in r460,
...
which included commits to RCS files with non-trunk default branches.
1998-09-03 15:54:56 +00:00
Mariette Yvinec
ab65b85974
header added
1998-09-03 15:53:43 +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
a5d45c5f8d
*** empty log message ***
1998-08-06 14:49:56 +00:00
Mariette Yvinec
e61976478a
included in it
...
CGAL_WINDOW_STREAM_WEIGHTED_POINT_2_H
CGAL_WINDOW_STREAM_REGULAR_TRIANGULATION_2_H
1998-08-06 12:05:50 +00:00
Mariette Yvinec
2de25145cb
Initial revision
1998-08-06 12:05:18 +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
00788f108d
no change
1998-08-05 12:54:40 +00:00
Mariette Yvinec
09ffa8665d
Initial revision
1998-08-04 09:38:26 +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
93d77e9dfc
*** empty log message ***
1998-08-04 09:38:26 +00:00
Mariette Yvinec
43cd53d127
is_valid() modified
...
plus a fw details
removed const Face_handle & arg into Face_handle etc..
1998-08-04 09:37:13 +00:00
Mariette Yvinec
4a3a86f6db
modified insert() and is_valid()
...
working state
1998-08-04 09:27:00 +00:00
Mariette Yvinec
d872798eeb
save before major changes in insert()
1998-07-31 09:23:17 +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
f7b39a717e
moved the following functions to the Tds class
...
insert_in_face, insert_on_edge, remove_degree_3
1998-07-30 09:49:55 +00:00
Mariette Yvinec
54f673c71d
Initial revision
1998-07-30 08:29:36 +00:00
Mariette Yvinec
17da8eaaee
few changes
1998-07-28 16:12:22 +00:00
Mariette Yvinec
ff13217255
fixed bug in Compare()
1998-07-28 16:02:59 +00:00
Mariette Yvinec
e8eb1add6d
changed insert_in_face(Vertex*)
1998-07-28 13:44:26 +00:00
Mariette Yvinec
293e964f76
fived set_neighbors( Face* ....
1998-07-28 09:05:11 +00:00
Mariette Yvinec
cdad48a75f
function
...
bool is_on_boundary()
is suppressed
1998-07-27 15:35:54 +00:00
Mariette Yvinec
93c876b02c
changed remove(v)
...
to remove_degree_3(v,f)
with f=NuLL if non explicitely given
1998-07-27 09:10:18 +00:00
Mariette Yvinec
e1756f299a
modified is_valid()
...
to add a check of each vectorvertex face()
1998-07-24 08:30:58 +00:00
Mariette Yvinec
1b90a527ad
fixed a bug in remove(Vertex* v)
1998-07-23 15:26:38 +00:00
Mariette Yvinec
5d20dde7d6
retablished
1998-07-23 13:19:03 +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
dbd9b9fa07
added copy constructor
1998-07-22 09:03:35 +00:00
Mariette Yvinec
f58e8ffb1c
intorduce the functiom
...
bool compare(const Point &p, const Point &q) const
1998-07-21 12:30:47 +00:00