diff --git a/Packages/Triangulation_3/changes.txt b/Packages/Triangulation_3/changes.txt index 1ec212dfd3d..01a82cc7436 100644 --- a/Packages/Triangulation_3/changes.txt +++ b/Packages/Triangulation_3/changes.txt @@ -1,3 +1,8 @@ +Version 1.64 (20 June 01) +- new demo for vertex removal +- new example for hierarchy +- doc fixes for tds (new signature for insert methods) + Version 1.63 (20 June 01) - doc for hierarchy fixed - cleanup in examples, demo diff --git a/Packages/Triangulation_3/demo/Triangulation_3/README b/Packages/Triangulation_3/demo/Triangulation_3/README index b6f147f18ff..befb59ce29f 100644 --- a/Packages/Triangulation_3/demo/Triangulation_3/README +++ b/Packages/Triangulation_3/demo/Triangulation_3/README @@ -1,17 +1,15 @@ -------- demo ------------------------------------------------- -(this is an elementary demo, a nice one should come in the future) - -Construction of a Delaunay triangulation. - -Needs an input file "data/points" containing points (given by x y z) - -Opens a geomview window +The demos use Geomview [see the chapter Geomview in the cgal manual - support library: Geomview 1.8.1 is required. Important: The last line in the startup file .geomview must be (echo "started"). The two commands rsh and Geomview must be in the user's path, otherwise the program will not be able to execute.] +------- demo ------------------------------------------------- +Construction of a Delaunay triangulation. + +Needs an input file "data/points" containing points (given by x y z) + Draws the triangulation (vertices and edges) in geomview Locates a point a shows the cell containing it @@ -25,6 +23,13 @@ For a robust version, CGAL::Filtered_exact should be used. -------------------------------------------------------------- -------- blind_demo ------------------------------------------- -Same, but without visualization... +------- demo_remove ------------------------------------------ +Constructs a Delaunay triangulation for points on a grid. + +Then removes all the vertices in random order -------------------------------------------------------------- + +------- blind_demo ------------------------------------------- +Same as demo, but without visualization... +-------------------------------------------------------------- + diff --git a/Packages/Triangulation_3/demo/Triangulation_3/makefile b/Packages/Triangulation_3/demo/Triangulation_3/makefile index fd2ae9a3eec..6465c2c59df 100644 --- a/Packages/Triangulation_3/demo/Triangulation_3/makefile +++ b/Packages/Triangulation_3/demo/Triangulation_3/makefile @@ -37,7 +37,7 @@ LDFLAGS = \ # target entries #---------------------------------------------------------------------# -all: demo blind_demo +all: demo demo_remove blind_demo demo$(EXE_EXT): demo$(OBJ_EXT) $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo demo$(OBJ_EXT) $(LDFLAGS) diff --git a/Packages/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex b/Packages/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex index 44e6b79114f..01a035da8e0 100644 --- a/Packages/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex +++ b/Packages/Triangulation_3/doc_tex/Triangulation_3/Triang3.tex @@ -481,9 +481,14 @@ need not be specified by the user. \section{Examples} \label{Triangulation3-sec-examples} +\subsection{First example} This example shows the incremental construction of a 3D triangulation, the location of a point, and how to manipulate elementary operations -on indices in a cell. +on indices in a cell. It uses the default parameters proposed by +\cgal\ for the \ccc{Triangulation_3} class. -\ccIncludeExampleCode{Triangulation_3/example1.C} +\ccIncludeExampleCode{Triangulation_3/example_simple.C} +\subsection{Delaunay Hierarchy} + +\ccIncludeExampleCode{Triangulation_3/example_hierarchy.C} diff --git a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/Triang3.tex b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/Triang3.tex index 44e6b79114f..01a035da8e0 100644 --- a/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/Triang3.tex +++ b/Packages/Triangulation_3/doc_tex/basic/Triangulation_3/Triang3.tex @@ -481,9 +481,14 @@ need not be specified by the user. \section{Examples} \label{Triangulation3-sec-examples} +\subsection{First example} This example shows the incremental construction of a 3D triangulation, the location of a point, and how to manipulate elementary operations -on indices in a cell. +on indices in a cell. It uses the default parameters proposed by +\cgal\ for the \ccc{Triangulation_3} class. -\ccIncludeExampleCode{Triangulation_3/example1.C} +\ccIncludeExampleCode{Triangulation_3/example_simple.C} +\subsection{Delaunay Hierarchy} + +\ccIncludeExampleCode{Triangulation_3/example_hierarchy.C} diff --git a/Packages/Triangulation_3/examples/Triangulation_3/Makefile b/Packages/Triangulation_3/examples/Triangulation_3/Makefile index 8fd0b2b7777..beb9409d2a1 100644 --- a/Packages/Triangulation_3/examples/Triangulation_3/Makefile +++ b/Packages/Triangulation_3/examples/Triangulation_3/Makefile @@ -30,8 +30,9 @@ LDFLAGS = \ # target entries #---------------------------------------------------------------------# -all: example1 example_tds - ./example1 +all: example_simple example_hierarchy example_tds + ./example_simple + ./example_hierarchy ./example_tds example_simple: ../../src/Triangulation_3.o example_simple.o