Commit Graph

193 Commits

Author SHA1 Message Date
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