diff --git a/Announce.txt b/Announce.txt
index 0429a5453388a41e199f5f1ce6fc33599f492d80..5813e25f9b6f9cb9edee1a84a7f08a420653b15f 100644
--- a/Announce.txt
+++ b/Announce.txt
@@ -1,11 +1,11 @@
- Qhull 2002.1 2002/8/20
+ Qhull 2003.1 2003/12/30
- http://www.geom.umn.edu/software/qhull
- http://www.geom.umn.edu/software/download/qhull.html
+ http://www.qhull.org
http://savannah.gnu.org/projects/qhull/
http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html
http://www.geomview.org
+ http://www.geom.uiuc.edu
Qhull computes convex hulls, Delaunay triangulations, Voronoi diagrams,
furthest-site Voronoi diagrams, and halfspace intersections about a point.
@@ -19,8 +19,8 @@ execution statistics. The program can be called from within your application.
You can view the results in 2-d, 3-d and 4-d with Geomview.
To download Qhull:
-
- http://www.geom.umn.edu/software/download/qhull.html
+ http://www.qhull.org/download
+ http://savannah.nongnu.org/files/?group=qhull
Download qhull-96.ps for:
@@ -28,7 +28,7 @@ Download qhull-96.ps for:
"The Quickhull Algorithm for Convex Hulls," ACM
Trans. on Mathematical Software, Dec. 1996.
http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/
- http://www.geom.umn.edu/software/qhull/qhull-96.ps
+ http://citeseer.nj.nec.com/83502.html
Abstract:
diff --git a/COPYING.txt b/COPYING.txt
index 1334eba6d0be764e899a5184c1b5dcb49e718f15..7230a27a3269ee9455acf04de4793e5ab5e33d30 100644
--- a/COPYING.txt
+++ b/COPYING.txt
@@ -1,18 +1,15 @@
- Qhull, Copyright (c) 1993-2002
+ Qhull, Copyright (c) 1993-2003
The National Science and Technology Research Center for
Computation and Visualization of Geometric Structures
(The Geometry Center)
University of Minnesota
- 400 Lind Hall
- 207 Church Street S.E.
- Minneapolis, MN 55455 USA
- email: qhull@geom.umn.edu
+ email: qhull@qhull.org
This software includes Qhull from The Geometry Center. Qhull is
copyrighted as noted above. Qhull is free software and may be obtained
-via http from www.geom.umn.edu. It may be freely copied, modified,
+via http from www.qhull.org. It may be freely copied, modified,
and redistributed under the following conditions:
1. All copyright notices must remain intact in all files.
@@ -32,6 +29,6 @@ and redistributed under the following conditions:
5. There is no warranty or other guarantee of fitness for Qhull, it is
provided solely "as is". Bug reports or fixes may be sent to
- qhull_bug@geom.umn.edu; the authors may or may not act on them as
+ qhull_bug@qhull.org; the authors may or may not act on them as
they desire.
diff --git a/File_id.diz b/File_id.diz
index 588cb2ffc1513425a43ef6b8a88dbff510004420..21120bdc3976c1da0dbc4e89d76e3e5519ba059a 100644
--- a/File_id.diz
+++ b/File_id.diz
@@ -1,4 +1,4 @@
-Qhull 3.0 - Qhull computes convex hulls,
+Qhull 2003.1 - Qhull computes convex hulls,
Delaunay triangulations, halfspace inter-
sections about a point, Voronoi diagrams,
furthest-site Delaunay triangulations, and
@@ -6,7 +6,7 @@ furthest-site Voronoi diagrams. Qhull
works with 2-d, 3-d, 4-d, 5-d, and higher
dimensions. It computes volumes, surface
areas, and approximations. It runs in a
-DOS window under Windows 95/NT.
-www.geom.umn.edu/software/qhull, freeware.
+DOS window under Windows 95/NT/XP.
+www.qhull.org, freeware.
diff --git a/README.txt b/README.txt
index 9ef958a1f47de3f64c4ddacf6fd701f1c2d4df7a..4cbbdde6123dbf79dba3b3bd66b13ae149c9639d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
Name
- qhull, rbox 2002.1 August 20, 2002
+ qhull, rbox 2003.1 2003/12/30
Convex hull, Delaunay triangulation, Voronoi diagrams, Halfspace intersection
@@ -8,17 +8,16 @@ Convex hull, Delaunay triangulation, Voronoi diagrams, Halfspace intersection
html/index.htm
Available from:
- <http://www.geom.umn.edu/software/qhull>
+ <http://www.qhull.org>
<http://savannah.gnu.org/projects/qhull>
- <http://www.thesa.com/software/qhull>
-
- Version 1 (simplicial only):
- <http://www.geom.umn.edu/software/qhull/qhull-1.0.tar.gz>
- <http://www.geom.umn.edu/software/qhull/qhull.sit.hqx>
+
+ Version 1 (simplicial only):
+ <http://www.qhull.org/download/qhull-1.0.tar.gz>
+ <http://www.qhull.org/download/qhull.sit.hqx>
News and a paper:
- <http://www.geom.umn.edu/~bradb/qhull-news.html>
- <http://www.geom.umn.edu/software/qhull/qhull-96.ps>
+ <http://www.qhull.org/news>
+ <http://citeseer.nj.nec.com/83502.html>
Purpose
@@ -47,7 +46,7 @@ Environment requirements
To contribute to Qhull
- Qhull is on Savannah, http://savannah.gnu.org/projects/qhull/
+ Qhull is on Savannah at http://savannah.gnu.org/projects/qhull/
Qhull on Windows 95, 98, ME, NT, 2000, XP
@@ -56,13 +55,14 @@ Qhull on Windows 95, 98, ME, NT, 2000, XP
To install Qhull:
- Unzip the files into a directory. You may use WinZip32 <www.hotfiles.com>
- - Open a DOS window for the directory.
+ - Click on QHULL-GO
+
- In Windows 95, the DOS window needs improvement.
- - Double-click on qhull\eg\qhull-go.bat to call doskey (arrow keys).
- Increase the size of the screen font to 8x12.
- If the text is too dim, fix the screen colors with shareware (e.g., crt.exe)
- - If you use qhull a lot, consider using the Cygwin Unix shell,
- Cygwin tools (http://sources.redhat.com/cygwin/)
+ - If you use qhull a lot, consider using the Cygwin Unix shell (www.cygwin.com),
+
+ To learn about Qhull:
- Execute 'qconvex' for a synopsis and examples.
- Execute 'rbox 10 | qconvex' to compute the convex hull of 10 random points.
- Execute 'rbox 10 | qconvex i TO file' to write results to 'file'.
@@ -70,22 +70,34 @@ Qhull on Windows 95, 98, ME, NT, 2000, XP
- use 'TO xxx' to send normal output to xxx and error output to stdout
- Browse the documentation: qhull\html\index.htm
-Compiling for Unix
+Compiling with cygwin on Windows NT, 2000, XP
+ - install cygwin [www.cygwin.com] with gcc, make, ar, and ln
+ - cd qhull/src
+ - make -f Makefile.txt
- The gzip file, qhull.tgz, contains documentation and source files for
- qhull and rbox.
+Qhull on Unix (Debian)
+
+ The gzip file, qhull.tar.gz, contains documentation and source files for
+ qhull and rbox. It should compile on all Unix systems, including Debian.
+ You may also use the source instructions below.
To unpack the gzip file
- - tar zxf qhull.tgz
+ - tar zxf qhull.tar.gz
- cd qhull
- Compiling with the Debian Make:[R. Laboissiere]
- - cd src
- - ./Make-config.sh
- - cd ..
- - configure
+ Compile with the configure Makefile [R. Laboissiere]:
+ - ./configure
- make
+Compiling the source distribution
+
+ The gzip file, qhull-src.tgz, contains documentation and source files for
+ qhull and rbox.
+
+ To unpack the gzip file
+ - tar zxf qhull-src.tgz
+ - cd qhull
+
Compiling with Makefile (i.e., Makefile.txt)
- cd src
- in Makefile, check the CC, CCOPTS1, PRINTMAN, and PRINTC defines
@@ -127,18 +139,12 @@ Compiling for Unix
- define MANDIR and BINDIR
- type 'make install'
-Compiling for Windows NT, 2000, XP with cygwin (www.cygwin.com)
-
- - install cygwin with gcc, make, ar, and ln
- - cd qhull/src
- - make -f Makefile.txt
-
-Compiling for Windows 95, 98, NT, 2000, XP
+Compiling on Windows 95, 98, NT, 2000, XP
Qhull compiles as a console application in Visual C++ 5.0 at warning
level 3.
- Visual C++ quickstart for qhull.exe:
+ Visual C++ quickstart for qhull.exe only:
- create a "Win32 console application" called "qhull"
- add the following files:
geom.c geom2.c global.c io.c mem.c merge.c poly.c poly2.c qhull.c
@@ -146,7 +152,7 @@ Compiling for Windows 95, 98, NT, 2000, XP
- create a "Win32 console application" called "rbox"
- add rbox.c
- Visual C++ quickstart for qhull library, qconvex.exe, etc.
+ Visual C++ quickstart for qhull library, qhull.exe, qconvex.exe, etc.
- To simplify setting up lots of projects,
- create a temporary "Win32 console application" called "source"
- add all .c files from .../src/...
@@ -167,26 +173,25 @@ Compiling for Windows 95, 98, NT, 2000, XP
- build the project
- create a "Win32 console application" called "qhull"
- - move unix.c from "qhull source"
- - Set the library file in Project:Settings..., Link
+ - Move unix.c from "qhull source"
+ - Add the library file created by "library"
- Qhull does not use other libraries
- create a "Win32 console application" called "qconvex"
- - move qconvex.c from "qhull source"
- - Set the library file in Project:Settings..., Link
+ - Move qconvex.c from "qhull source"
+ - Copy the library file from "qhull"
- do the same for qdelaun.c, qhalf, qvoronoi.c, user_eg.c, user_eg2.c
- delete "qhull sources" since it is no longer needed
- - Set the library file in Project:Settings..., Link
- use Project:Settings to make any changes
- use batch build to rebuild everything
Qhull compiles with Borland C++ 5.0 bcc32. A Makefile is included.
- Execute 'make -f MBorland'. If you use the Borland IDE, set the ANSI
+ Execute 'make -f Mborland'. If you use the Borland IDE, set the ANSI
option in Options:Project:Compiler:Source:Language-compliance.
Qhull compiles with Borland C++ 4.02 for Win32 and DOS Power Pack.
- Use 'make -f MBorland -D_DPMI'. Qhull 1.0 compiles with Borland
+ Use 'make -f Mborland -D_DPMI'. Qhull 1.0 compiles with Borland
C++ 4.02. For rbox 1.0, use "bcc32 -WX -w- -O2-e -erbox -lc rbox.c".
Use the same options for Qhull 1.0. [D. Zwick]
@@ -197,9 +202,9 @@ Compiling for Windows 95, 98, NT, 2000, XP
intentional. For example, variables may be initialized (unnecessarily)
to prevent warnings about possible use of uninitialized variables.
-Compiling for the Power Macintosh
+Compiling on the Power Macintosh
- Qhull compiles for the Power Macintosh with Metrowerk's C compiler.
+ Qhull compiles on the Power Macintosh with Metrowerk's C compiler.
It uses the SIOUX interface to read point coordinates and return output.
There is no graphical output. For project files, see 'Compiling for
Windows 95'. Instead of using SIOUX, Qhull may be embedded within an
@@ -210,7 +215,7 @@ Compiling for the Power Macintosh
to a standard file. There is no graphical output.
-Compiling for other machines
+Compiling on other machines
Some users have reported problems with compiling Qhull under Irix 5.1. It
compiles under other versions of Irix.
@@ -226,15 +231,17 @@ Distributed files
README.txt // instructions for installing Qhull
REGISTER.txt // Qhull registration
COPYING.txt // copyright notice
+ QHULL-GO.pif // Windows icon for qhull-go.bat
Announce.txt // announcement
Changes.txt // change history for Qhull and rbox
- qh-faq.htm // Frequently asked questions
- qh-home.htm // Home page
- qh-get.htm // Download page
+ File_id.diz // package descriptor
+ index.htm // Home page
+ html/qh-faq.htm // Frequently asked questions
+ html/qh-get.htm // Download page
html/index.htm // Manual
- Makefile.txt // Makefile for Unix or cygwin 'make'
- MBorland // Makefile for Borland C++/Win32
- Make-config.sh // Create Debian configure and automake
+ src/Makefile.txt // Makefile for Unix or cygwin 'make'
+ src/Mborland // Makefile for Borland C++/Win32
+ src/Make-config.sh // Create Debian configure and automake
src/
rbox consists of:
@@ -272,7 +279,7 @@ src/
top-level source files:
src/index.htm // index to source files
- qh-...htm // specific files
+ qh-...htm // specific files
user.h // header file of user definable constants
qhull.h // header file for qhull
unix.c // Unix front end to qhull
@@ -305,14 +312,11 @@ src/
Authors:
C. Bradford Barber Hannu Huhdanpaa
- bradb@geom.umn.edu hannu@geom.umn.edu
+ bradb@qhull.org hannu@qhull.org
- c/o The Geometry Center
+ The Geometry Center
University of Minnesota
- 400 Lind Hall
- 207 Church Street S.E.
- Minneapolis, MN 55455
- This software was developed under NSF grants NSF/DMS-8920161 and
+ Qhull 1.0 was developed under NSF grants NSF/DMS-8920161 and
NSF-CCR-91-15793 750-7504 at the Geometry Center and Harvard
University. If you find Qhull useful, please let us know.
diff --git a/REGISTER.txt b/REGISTER.txt
index 767eb1c0cdac6caa78e9f60d728876402b08c90b..4682e02669f1da0583867cdc91f2c82f1a07c676 100644
--- a/REGISTER.txt
+++ b/REGISTER.txt
@@ -26,12 +26,12 @@ have used in your publications.
To cite Qhull, use
- Barber, C.B., Dobkin, D.P., and Huhdanpaa, H.T., "The Quickhull
+ Barber, C.B., Dobkin, D.P., and Huhdanpaa, H.T., "The Quickhull
algorithm for convex hulls," ACM Trans. on Mathematical Software,
- Dec 1996. http://www.geom.umn.edu/software/qhull
+ Dec 1996. http://www.qhull.org
Please send e-mail to
- qhull@geom.umn.edu
+ qhull@qhull.org
Thank you!
diff --git a/eg/q_egtest b/eg/q_egtest
index f284440bfab7c2c12e5d7557c3cdd2e82ccaccbf..e944694bf481dcf47b4169184506e6ef87392eb0 100644
--- a/eg/q_egtest
+++ b/eg/q_egtest
@@ -23,7 +23,7 @@ rbox 30 s D4 | qconvex s GhD0 Pd0d1d2D3 Tc >eg/eg.t19.intersect.precise.4-3
rbox 100 s P1,1,1 | qconvex s QG-0 Pgp Tc G >eg/eg.t20.notvisible
rbox 100 s | qconvex s QV-10 Pgp Tc G >eg/eg.t21.notvertex
rbox 100 r D2 P1,1 | qhull s Pd0:0.7 PD0:0.8 QgG0 G Tv >eg/eg.t22.split
-rbox 100 D2 c G1.0 | qvoronoi s A-0.95 v Gna Tv >eg/eg.t23.voronoi.imprecise
+rbox 100 D2 c G1.0 | qvoronoi s A-0.95 Gna Tv >eg/eg.t23.voronoi.imprecise
rbox 30 s D4 | qconvex s Gh Pd0d1d2D3 Tc >eg/eg.t24.intersect.precise.4d
echo ==the following generates an error== >/dev/null
diff --git a/eg/q_test b/eg/q_test
index 7b8d30677eedecc14d66c691ffc7359f4772da9e..865763cfd99f46bd005ad8487ea86e746b3ee782 100644
--- a/eg/q_test
+++ b/eg/q_test
@@ -129,6 +129,7 @@ rbox 500 D2 | qhull n A-0.95 C0.1 Tcv
rbox 500 s P1,1,1 | qhull QgG0 Pp Tcv
rbox d | qhull m
+rbox d | qhull FM
rbox c D2 | qhull Tcv Q0
rbox d D2 | qhull Tcv
rbox c D3 | qhull Tcv Q0
@@ -168,6 +169,7 @@ rbox 5 r s D2 | qhull s o
rbox 5 r s D2 | qhull f
rbox 5 r s D2 | qhull i
rbox 5 r s D2 | qhull m
+rbox 5 r s D2 | qhull FM
rbox 5 r s D2 | qhull n
rbox 5 r s D2 | qhull p
rbox 5 r s D2 | qhull o
@@ -209,7 +211,7 @@ rbox 10 D3 | qhull Fa PF0.4
echo === test Qt ${d:-`date`}
rbox c | qhull Qt s o Tcv
rbox c | qhull Qt f i
-rbox c | qhull Qt m n
+rbox c | qhull Qt m FM n
rbox c | qhull Qt p o
rbox c | qhull Qt Fx
rbox c | qhull Qt FA s Fa
diff --git a/eg/q_test.bat b/eg/q_test.bat
index a5561a4a8ebf38d3726f4670316027ddc5ed7961..81b679cfda0f7ebbe7e1da8b427c07b6d95d5a54 100644
--- a/eg/q_test.bat
+++ b/eg/q_test.bat
@@ -195,6 +195,8 @@ rbox 500 s P1,1,1 | qhull QgG0 Pp Tcv >>q_test.x
echo "rbox d | qhull m" >>q_test.x
rbox d | qhull m >>q_test.x
+echo "rbox d | qhull FM" >>q_test.x
+rbox d | qhull FM >>q_test.x
echo "rbox c D2 | qhull Q0 Tcv" >>q_test.x
rbox c D2 | qhull Q0 Tcv >>q_test.x
echo "rbox d D2 | qhull Tcv" >>q_test.x
@@ -271,6 +273,8 @@ echo "rbox 5 r s D2 | qhull i " >>q_test.x
rbox 5 r s D2 | qhull i >>q_test.x
echo "rbox 5 r s D2 | qhull m " >>q_test.x
rbox 5 r s D2 | qhull m >>q_test.x
+echo "rbox 5 r s D2 | qhull FM " >>q_test.x
+rbox 5 r s D2 | qhull FM >>q_test.x
echo "rbox 5 r s D2 | qhull n " >>q_test.x
rbox 5 r s D2 | qhull n >>q_test.x
echo "rbox 5 r s D2 | qhull p " >>q_test.x
@@ -347,8 +351,8 @@ echo "rbox c | qhull Qt s o Tcv" >>q_test.x
rbox c | qhull Qt s o Tcv >>q_test.x
echo "rbox c | qhull Qt f i" >>q_test.x
rbox c | qhull Qt f i >>q_test.x
-echo "rbox c | qhull Qt m n" >>q_test.x
-rbox c | qhull Qt m n >>q_test.x
+echo "rbox c | qhull Qt m FM n" >>q_test.x
+rbox c | qhull Qt m FM n >>q_test.x
echo "rbox c | qhull Qt p o" >>q_test.x
rbox c | qhull Qt p o >>q_test.x
echo "rbox c | qhull Qt Fx" >>q_test.x
diff --git a/html/index.htm b/html/index.htm
index 70c67a213bf08685bf22ec4480648c470ea36a5e..8b721617a91a41c3d1b0bb3ff9ca6ebf5037658e 100644
--- a/html/index.htm
+++ b/html/index.htm
@@ -15,10 +15,10 @@ NOTE -- verify all links by 'grep href=' 'grep name=' add # 'sort /+7'
<body>
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b><a
-href="http://www.geom.umn.edu/~bradb/qhull-news.html">News</a> about Qhull<br>
-<b>Up:</b> <a href="qh-faq.htm">FAQ</a> about Qhull<br>
+href="http://www.qhull.org/news">News</a> about Qhull<br>
+<b>Up:</b> <a href="http://www.qhull.org/html/qh-faq.htm">FAQ</a> about Qhull<br>
<b>To:</b> <a href="#TOC">Qhull manual: Table of Contents</a>
(please wait while loading) <br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -34,7 +34,7 @@ href="http://www.geom.umn.edu/~bradb/qhull-news.html">News</a> about Qhull<br>
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/fixed.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/fixed.html"><img
src="qh--rand.gif" alt="[random-fixed]" align="middle"
width="100" height="100"></a> Qhull manual </h1>
@@ -44,11 +44,12 @@ diagrams, furthest-site Delaunay triangulations, and
furthest-site Voronoi diagrams. These structures have
applications in science, engineering, statistics, and
mathematics. See <a
-href="http://www.ifor.math.ethz.ch/ifor/staff/fukuda/polyfaq/polyfaq.html">Fukuda's
+href="http://www.ifor.math.ethz.ch/staff/fukuda/polyfaq/polyfaq.html">Fukuda's
introduction</a> to convex hulls, Delaunay triangulations,
Voronoi diagrams, and linear programming. For a detailed
introduction, see O'Rourke [<a href="#orou94">'94</a>], <i>Computational
-Geometry in C</i>.</p>
+Geometry in C</i>.
+</p>
<p>There are six programs. Except for rbox, they use
the same code.
@@ -83,9 +84,9 @@ guarantees simplicial output, but it
is less accurate than merged facets. For merged facets, Qhull
reports the maximum outer and inner plane.
-<p><i>Brad Barber, Cambridge MA, June 1, 2002</i></p>
+<p><i>Brad Barber, Cambridge MA, 2003/12/30</i></p>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -95,17 +96,22 @@ Contents </a></h2>
<ul>
<li><a href="#when">When</a> to use Qhull
<ul>
- <li><a href="../README.txt">README.txt</a> - installation
- instructions<br>
+ <li><a href="http://www.qhull.org/news">News</a> for Qhull
+ with new features and reported bugs.
+ <li><a href="http://www.qhull.org">Home</a> for Qhull with additional URLs
+ (<a href=index.htm>local copy</a>)
+ <li><a href="http://www.qhull.org/html/qh-faq.htm">FAQ</a> for Qhull (<a href="qh-faq.htm">local copy</a>)
+ <li><a href="http://www.qhull.org/download">Download</a> Qhull (<a href=qh-get.htm>local copy</a>)
+ <li><a href="qh-quick.htm#programs">Quick</a> reference for Qhull and its <a href="qh-quick.htm#options">options</a>
+ <p>
<li><a href="../COPYING.txt">COPYING.txt</a> - copyright notice<br>
<li><a href="../REGISTER.txt">REGISTER.txt</a> - registration<br>
- <li><a href="qh-get.htm">Download</a> Qhull
- <li><a href="qh-faq.htm">FAQ</a> - Frequently Asked Questions about Qhull<br>
- <li><a href="qh-quick.htm#programs">Programs</a> - Program quick reference<br>
- <li><a href="qh-quick.htm#options">Options</a> - Option quick reference<br>
+ <li><a href="../README.txt">README.txt</a> - installation
+ instructions<br>
<li><a href="../src/Changes.txt">Changes.txt</a> - change history <br>
<li><a href="qhull.txt">qhull.txt</a> - Unix manual page
</ul>
+ <p>
<li><a href="#description">Description</a> of Qhull
<ul>
<li><a href="#definition">de</a>finition • <a
@@ -113,12 +119,12 @@ Contents </a></h2>
• <a href="#algorithm">al</a>gorithm • <a
href="#structure">da</a>ta structure </li>
<li><a href="qh-impre.htm">Imprecision</a> in Qhull</li>
- <LI><a href="qh-impre.htm#joggle">Joggled input or merged
- facets</a>
+ <LI><a href="qh-impre.htm#joggle">Merged facets</a> or joggled input
<li><a href="#geomview">Geomview</a>, Qhull's graphical
viewer</li>
<li><a href="qh-eg.htm">Examples</a> of Qhull using Geomview</li>
</ul>
+ <p>
<li><a href=qh-quick.htm#programs>Qhull programs</a>
<ul>
<li><a href="qconvex.htm">qconvex</a> -- convex hulls
@@ -130,36 +136,29 @@ Contents </a></h2>
furthest-site Voronoi diagrams
<li><a href="rbox.htm">rbox</a> -- generate point distributions for qhull
</ul>
+ <p>
<li>Related URLs
<ul>
- <li><a href="http://www.geom.umn.edu/~bradb/qhull-news.html">News page</a> for Qhull
- with new features and reported bugs.
- <li><a href="http://www.geom.umn.edu/~bradb/qhull-news.html#use">How</a> is Qhull used?
- <li><a href="http://www.geom.umn.edu/software/qhull/html/qh-faq.htm">Current FAQ</a> for Qhull
- <li><a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull with additional URLs
- (<a href=qh-home.htm>local copy</a>)
<li><a href="news:comp.graphics.algorithms">Newsgroup</a>:
comp.graphics.algorithms
<li><a
href="http://exaflop.org/docs/cgafaq/">FAQ</a> for computer graphics algorithms and
<a href="http://exaflop.org/docs/cgafaq/cga6.html">geometric</a> structures.
- <li>Amenta's <a href="http://www.geom.umn.edu/software/cglist">Directory
+ <li>Amenta's <a href="http://www.geom.uiuc.edu/software/cglist">Directory
of Computational Geometry Software </a></li>
- <li>Bronnimann's <a
- href="http://www.inria.fr/prisme/personnel/bronnimann/cgt/WWW.html">Computational
- Geometry Tribune, WWW sites</a> </li>
<li>Erickson's <a
href="http://compgeom.cs.uiuc.edu/~jeffe/compgeom/code.html">Computational
Geometry Software</a> </li>
<li>Fukuda's <a
- href="http://www.ifor.math.ethz.ch/ifor/staff/fukuda/polyfaq/polyfaq.html">
+ href="http://www.ifor.math.ethz.ch/staff/fukuda/polyfaq/polyfaq.html">
introduction</a> to convex hulls, Delaunay triangulations,
Voronoi diagrams, and linear programming.
<li>Stony Brook's <a
href="http://www.cs.sunysb.edu/~algorith/major_section/1.6.shtml">Algorithm Repository</a> on computational geometry.
</li>
</ul>
+ <p>
<li><a href="qh-quick.htm#options">Qhull options</a><ul>
<li><a href="qh-opto.htm#output">Output</a> formats</li>
<li><a href="qh-optf.htm#format">Additional</a> I/O
@@ -173,6 +172,7 @@ Contents </a></h2>
<li><a href="qh-optt.htm#trace">Trace</a> options</li>
</ul>
</li>
+ <p>
<li><a href="qh-in.htm">Qhull internals</a><ul>
<li><a href="qh-in.htm#performance">Performance</a>
of Qhull</li>
@@ -184,6 +184,7 @@ Contents </a></h2>
data structures</a> </li>
</ul>
</li>
+ <p>
<li><a href="#bugs">What to do</a> if something goes wrong</li>
<li><a href="#email">Email</a></li>
<li><a href="#authors">Authors</a></li>
@@ -209,7 +210,26 @@ grows by <i>n^(floor(d/2)</i>
not try to build a 16-d convex hull of 1000 points. It will
have on the order of 1,000,000,000,000,000,000,000,000 facets.
-<!-- duplicated in qh-home.htm and html/index.htm -->
+<p>On a 600 MHz Pentium 3, Qhull computes the 2-d convex hull of
+300,000 cocircular points in 11 seconds. It computes the
+2-d Delaunay triangulation and 3-d convex hull of 120,000 points
+in 12 seconds. It computes the
+3-d Delaunay triangulation and 4-d convex hull of 40,000 points
+in 18 seconds. It computes the
+4-d Delaunay triangulation and 5-d convex hull of 6,000 points
+in 12 seconds. It computes the
+5-d Delaunay triangulation and 6-d convex hull of 1,000 points
+in 12 seconds. It computes the
+6-d Delaunay triangulation and 7-d convex hull of 300 points
+in 15 seconds. It computes the
+7-d Delaunay triangulation and 8-d convex hull of 120 points
+in 15 seconds. It computes the
+8-d Delaunay triangulation and 9-d convex hull of 70 points
+in 15 seconds. It computes the
+9-d Delaunay triangulation and 10-d convex hull of 50 points
+in 17 seconds. The 10-d convex hull of 50 points has about 90,000 facets.
+
+<!-- duplicated in index.htm and html/index.htm -->
<p>Qhull does <i>not</i> support constrained Delaunay
triangulations, triangulation of non-convex surfaces, mesh
generation of non-convex objects, or medium-sized inputs in 9-D
@@ -230,11 +250,11 @@ program</a>. It is much faster than Qhull and it allows
constraints. Both programs use exact arithmetic. They are in <a
href="ftp://netlib.bell-labs.com/netlib/voronoi">ftp://netlib.bell-labs.com/netlib/voronoi</a>.
Qhull <a
-href="http://www.geom.umn.edu/software/download/qhull.html">version
+href="http://www.qhull.org/download">version
1.0</a> may also meet your needs. It detects precision problems,
but does not handle them.</p>
-<p><a href=http://www.mpi-sb.mpg.de/LEDA/leda.html>Leda</a> is a
+<p><a href=http://www.algorithmic-solutions.com/enleda.htm>Leda</a> is a
library for writing computational
geometry programs and other combinatorial algorithms. It
includes routines for computing 3-d convex
@@ -244,7 +264,7 @@ platforms.
<p>If your problem is in high dimensions with a few,
non-simplicial facets, try Fukuda's <a
-href="http://www.ifor.math.ethz.ch/ifor/staff/fukuda/cdd_home/cdd.html">cdd</a>.
+href="http://www.cs.mcgill.ca/~fukuda/soft/cdd_home/cdd.html">cdd</a>.
It is much faster than Qhull for these distributions. </p>
<p>Custom software for 2-d and 3-d convex hulls may be faster
@@ -390,7 +410,7 @@ the last point is <i>n-1</i>.</p>
<p>Except for bounding box
('<a href="qh-optq.htm#Qbk">Qbk:n</a>', etc.), drop facets
('<a href="qh-optp.htm#Pdk">Pdk:n</a>', etc.), and
-Qhull command ('<a href="qh-opto.htm#FQ">FQ</a>'), only the last
+Qhull command ('<a href="qh-optf.htm#FQ">FQ</a>'), only the last
occurence of an option counts.
Bounding box and drop facets may be repeated for each dimension.
Option 'FQ' may be repeated any number of times.
@@ -414,7 +434,7 @@ href="qh-opto.htm#s">s</a>') to <tt>stdout</tt>. There are many
others (see <a href="qh-opto.htm">output</a> and <a
href="qh-optf.htm">formats</a>). You can list vertex incidences,
vertices and facets, vertex coordinates, or facet normals. You
-can view Qhull objects with Geomview or Mathematica. You can
+can view Qhull objects with Geomview, Mathematica, or Maple. You can
print the internal data structures. You can call Qhull from your
application (see <a href="qh-in.htm#library">Qhull library</a>).</p>
@@ -522,7 +542,7 @@ ftp <tt>ndview</tt> from the <tt>newpieces</tt> directory. </p>
<p>See <a href="qh-eg.htm">Examples</a>. Some of the examples
have <a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">pictures
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">pictures
</a>.</p>
</blockquote>
@@ -543,7 +563,7 @@ href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry
goes wrong</a></h2>
<blockquote>
-<p>Please report bugs to <a href=mailto:qhull_bug@geom.umn.edu>qhull_bug@geom.umn.edu</a>
+<p>Please report bugs to <a href=mailto:qhull_bug@qhull.org>qhull_bug@qhull.org</a>
</a>. Please report if Qhull crashes. Please report if Qhull
generates an "internal error". Please report if Qhull
produces a poor approximate hull in 2-d, 3-d or 4-d. Please
@@ -597,8 +617,8 @@ myself. Qhull is maintained part-time. </p>
<h2><a href="#TOC">»</a><a name="email">Email</a></h2>
<blockquote>
-<p>Please send correspondence to Brad Barber at <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
-and report bugs to <a href=mailto:qhull_bug@geom.umn.edu>qhull_bug@geom.umn.edu</a>
+<p>Please send correspondence to Brad Barber at <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
+and report bugs to <a href=mailto:qhull_bug@qhull.org>qhull_bug@qhull.org</a>
</a>. Let me know how you use Qhull. If you mention it in a
paper, please send a reference and abstract.</p>
@@ -609,14 +629,14 @@ communicate with other Qhull users, I will add you to the
qhull_users alias. For Internet news about geometric algorithms
and convex hulls, look at comp.graphics.algorithms and
sci.math.num-analysis. For Qhull news look at <a
-href="http://www.geom.umn.edu/~bradb/qhull-news.html">qhull-news.html</a>.</p>
+href="http://www.qhull.org/news">qhull-news.html</a>.</p>
</blockquote>
<h2><a href="#TOC">»</a><a name="authors">Authors</a></h2>
<blockquote>
<pre> C. Bradford Barber Hannu Huhdanpaa
- bradb@geom.umn.edu hannu@geom.umn.edu
+ bradb@qhull.org hannu@qhull.org
c/o The Geometry Center
University of Minnesota
@@ -633,16 +653,22 @@ href="http://www.geom.umn.edu/~bradb/qhull-news.html">qhull-news.html</a>.</p>
thanks to Albert Marden, Victor Milenkovic, the Geometry Center,
and Harvard University for supporting this work.</p>
+<p>A special thanks to Mark Phillips, Robert Miner, and Stuart Levy for running the Geometry
+ Center web site long after the Geometry Center closed.
+ Stuart moved the web site to the University of Illinois at Champaign-Urbana.
+Mark and Robert are founders of <a href=http://www.geomtech.com>Geometry Technologies</a>.
+Mark, Stuart, and Tamara Munzner are the original authors of <a href=http://www.geomview.org>Geomview</a>.
+
<p>A special thanks to <a href="http://www.endocardial.com/">Endocardial
Solutions, Inc.</a> of St. Paul, Minnesota for their support of the
internal documentation (<a href=../src/index.htm>src/index.htm</a>). They use Qhull to build 3-d models of
heart chambers.</p>
-<p>The software was developed under National Science Foundation
+<p>Qhull 1.0 was developed under National Science Foundation
grants NSF/DMS-8920161 and NSF-CCR-91-15793 750-7504. If you find
it useful, please let us know.</p>
-<p>The Geometry Center is supported by grant DMS-8920161 from the
+<p>The Geometry Center was supported by grant DMS-8920161 from the
National Science Foundation, by grant DOE/DE-FG02-92ER25137 from
the Department of Energy, by the University of Minnesota, and by
Minnesota Technology, Inc.</p>
@@ -660,7 +686,7 @@ Huhdanpaa, "The Quickhull Algorithm for Convex Hulls," <i>ACM
Transactions on Mathematical Software</i>, Vol. 22, No. 4 (Dec.
1996), p. 469-483 [<a
href="http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/">http://www.acm.org</a>;
-<a href="http://www.geom.umn.edu/software/qhull/qhull-96.ps">http://www.geom.umn.edu/software/qhull/qhull-96.ps</a>].
+<a href="http://citeseer.nj.nec.com/83502.html">http://citeseer.nj.nec.com</a>].
</p>
<p><a name="cla-sho89">Clarkson</a>, K.L. and P.W. Shor,
@@ -672,12 +698,21 @@ Seidel, "Four results on randomized incremental
construction," <em>Computational Geometry: Theory and
Applications</em>, vol. 3, p. 185-211, 1993.</p>
+<p><a name="devi01">Devillers</a>, et. al.,
+"Walking in a triangulation," <i>ACM Symposium on
+Computational Geometry</i>, June 3-5,2001, Medford MA.
+
<p><a name="dob-kir90">Dobkin</a>, D.P. and D.G. Kirkpatrick,
"Determining the separation of preprocessed polyhedra--a
unified approach," in <i>Proc. 17th Inter. Colloq. Automata
Lang. Program.</i>, in <i>Lecture Notes in Computer Science</i>,
Springer-Verlag, 443:400-413, 1990. </p>
+<p><a name="edel01">Edelsbrunner</a>, H, <i>Geometry and Topology for Mesh Generation</i>,
+Cambridge University Press, 2001.
+
+<p><a name=gart99>Gartner, B.</a>, "Fast and robust smallest enclosing balls", <i>Algorithms - ESA '99</i>, LNCS 1643.
+
<p><a name="fort93">Fortune, S.</a>, "Computational
geometry," in R. Martin, editor, <i>Directions in Geometric
Computation</i>, Information Geometers, 47 Stockers Avenue,
@@ -691,7 +726,7 @@ September 1993. </p>
randomized point location without preprocessing in Two- and
Three-dimensional Delaunay Triangulations</i>, ACM Symposium on
Computational Geometry, p. 274-283, 1996 [<a
-href="http://www.geom.umn.edu/software/cglist/GeomDir/">GeomDir</a>].
+href="http://www.geom.uiuc.edu/software/cglist/GeomDir/">GeomDir</a>].
</p>
<p><a name="mulm94">Mulmuley</a>, K., <i>Computational Geometry,
@@ -709,10 +744,10 @@ Geometry</i>, Springer-Verlag, New York, 1985.</p>
<hr>
<p><b>Up:</b> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b><a
-href="http://www.geom.umn.edu/~bradb/qhull-news.html">News</a> about Qhull<br>
-<b>Up:</b> <a href="qh-faq.htm">FAQ</a> about Qhull<br>
+href="http://www.qhull.org/news">News</a> about Qhull<br>
+<b>Up:</b> <a href="http://www.qhull.org/html/qh-faq.htm">FAQ</a> about Qhull<br>
<b>To:</b> <a href="#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -731,11 +766,11 @@ structures</a>
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qconvex.htm b/html/qconvex.htm
index 94e52483f5fa015536a3b4c01ae46efa11ad4d9e..cffbc7a690573a93408744aea0f7345e27de832b 100644
--- a/html/qconvex.htm
+++ b/html/qconvex.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a> -- Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -27,7 +27,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
src="qh--cone.gif" alt="[cone]" align="middle" width="100"
height="100"></a>qconvex -- convex hull</h1>
@@ -101,18 +101,27 @@ href="qh-eg.htm#how">How Qhull adds a point</a>.</p>
<p>Except for rbox, all of the qhull programs compute a convex hull.
-<p>If you use '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output) or '<a href="qh-optq.htm#QJn">QJ</a>' (joggled input), all facets
-will be simplicial (e.g., triangles in 3-d). If you do not use
-'QJ', <tt>qconvex</tt> merges coplanar facets. This is more accurate
-than joggled input. With 'QJ', duplicate points will
-be joggled apart. See <a
-href="qh-impre.htm#joggle">Joggled input or merged facets</a>. </p>
+<p>By default, Qhull merges coplanar facets. For example, the convex
+hull of a cube's vertices has six facets.
+
+<p>If you use '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output),
+all facets will be simplicial (e.g., triangles in 2-d). For the cube
+example, it will have 12 facets. Some facets may be
+degenerate and have zero area.
+
+<p>If you use '<a href="qh-optq.htm#QJn">QJ</a>' (joggled input),
+all facets will be simplicial. The corresponding vertices will be
+slightly perturbed and identical points will be joggled apart.
+Joggled input is less accurate that triangulated
+output.See <a
+href="qh-impre.htm#joggle">Merged facets or joggled input</a>. </p>
<p>The output for 4-d convex hulls may be confusing if the convex
hull contains non-simplicial facets (e.g., a hypercube). See
<a href=qh-faq.htm#extra>Why
are there extra points in a 4-d or higher convex hull?</a><br>
</p>
+</p>
<p>The 'qconvex' program is equivalent to
'<a href=qhull.htm#outputs>qhull</a>' in 2-d to 4-d, and
@@ -121,7 +130,7 @@ in 5-d and higher. It disables the following Qhull
<a href=qh-quick.htm#options>options</a>: <i>d v H Qbb Qf Qg Qm
Qr Qu Qv Qx Qz TR E V Fp Gt Q0,etc</i>.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -323,7 +332,7 @@ individually or together.</p>
The first line is the dimension. The
second line is the number of facets. Each remaining line is the outer plane's
coefficients followed by its offset.</dd>
- <dt><a href="qh-optf.htm#n">Fi</a></dt>
+ <dt><a href="qh-optf.htm#Fi">Fi</a></dt>
<dd>print inner plane for each facet. The inner plane of a facet is
below its vertices.
The first line is the dimension. The
@@ -342,6 +351,8 @@ individually or together.</p>
href="qh-opto.htm#s">s</a>' and '<a href="qh-optf.htm#FS">FS</a>'</dd>
<dt><a href="qh-opto.htm#m">m</a></dt>
<dd>Mathematica output for the convex hull in 2-d or 3-d.</dd>
+ <dt><a href="qh-optf.htm#FM">FM</a></dt>
+ <dd>Maple output for the convex hull in 2-d or 3-d.</dd>
<dt><a href="qh-optg.htm#G">G</a></dt>
<dd>Geomview output for the convex hull in 2-d, 3-d, or 4-d.</dd>
@@ -377,7 +388,7 @@ individually or together.</p>
degenerate facets of zero area.</dd>
<dt><a href="qh-optq.htm#QJn">QJ</a></dt>
<dd>joggle the input instead of merging facets. This guarantees simplicial facets
- (e.g., triangles in 3-d).</dd>
+ (e.g., triangles in 3-d). It is less accurate than triangulated output ('Qt').</dd>
<dt><a href="qh-optq.htm#Qc">Qc</a></dt>
<dd>keep coplanar points</dd>
<dt><a href="qh-optq.htm#Qi">Qi</a></dt>
@@ -469,7 +480,7 @@ See <a href="index.htm#structure">Qhull's data structures</a>.</p>
<pre>
qconvex- compute the convex hull
- http://www.geom.umn.edu/software/qhull
+ http://www.qhull.org
input (stdin):
first lines: dimension and number of points (or vice-versa).
@@ -538,6 +549,7 @@ More formats:
Fi - inner plane for each facet
FI - ID for each facet
Fm - merge count for each facet (511 max)
+ FM - Maple output (2-d and 3-d)
Fn - count plus neighboring facets for each facet
FN - count plus neighboring facets for each point
Fo - outer plane (or max_outside) for each facet
@@ -586,7 +598,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
•<a href="qh-quick.htm#options">Options</a>
@@ -605,11 +617,11 @@ Print options:
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qdelau_f.htm b/html/qdelau_f.htm
index c165ce6a0575cb9975d9acfb32bbb972da787b55..8a487e04d9cfa766b920a05fa5b31f7ef9d4e6e9 100644
--- a/html/qdelau_f.htm
+++ b/html/qdelau_f.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -28,7 +28,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a>qdelaunay Qu -- furthest-site Delaunay triangulation</h1>
@@ -83,14 +83,20 @@ coefficient is nearly zero). Vertical facets correspond to input
sites that are coplanar to the convex hull of the input. An
example is points on the boundary of a lattice.</p>
-<p>If you use '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output) or
-'<a href="qh-optq.htm#QJn">QJ</a>' (joggled input), all furthest-site
+<p>By default, qdelaunay merges cocircular and cospherical regions.
+For example, the furthest-site Delaunay triangulation of a square inside a diamond
+('rbox D2 c d G4 | qdelaunay Qu') consists of one region (the diamond).
+
+<p>If you use '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output),
+all furthest-site Delaunay regions will be simplicial (e.g., triangles in 2-d).
+Some regions may be
+degenerate and have zero area.
+
+<p>If you use '<a href="qh-optq.htm#QJn">QJ</a>' (joggled input), all furthest-site
Delaunay regions
-will be simplicial (e.g., triangles in 2-d). If you do not use
-'QJ', <tt>qdelaunay Qu</tt> merges the furthest-site Delaunay regions
-for cocircular or cospherical input sites. This is more accurate
-than joggled input. See <a
-href="qh-impre.htm#joggle">Joggled input or merged facets</a>. </p>
+will be simplicial (e.g., triangles in 2-d). Joggled input
+is less accurate than triangulated output ('Qt'). See <a
+href="qh-impre.htm#joggle">Merged facets or joggled input</a>. </p>
<p>The output for 3-d, furthest-site Delaunay triangulations may be confusing if the
input contains cospherical data. See the FAQ item
@@ -108,7 +114,7 @@ in 4-d and higher. It disables the following Qhull
Qm Qr QR Qv Qx TR E V FC Fi Fo Fp FV Q0,etc</i>.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -250,6 +256,8 @@ outputs</a></h3>
paraboloid)</dd>
<dt><a href="qh-opto.htm#m">m</a></dt>
<dd>Mathematica output for the upper facets of the paraboloid (2-d triangulations).</dd>
+ <dt><a href="qh-optf.htm#FM">FM</a></dt>
+ <dd>Maple output for the upper facets of the paraboloid (2-d triangulations).</dd>
<dt><a href="qh-optg.htm#G">G</a></dt>
<dd>Geomview output for the paraboloid (2-d or 3-d triangulations).</dd>
<dt><a href="qh-opto.htm#s">s</a></dt>
@@ -275,7 +283,7 @@ controls</a></h3>
degenerate facets of zero area.</dd>
<dt><a href="qh-optq.htm#QJn">QJ</a></dt>
<dd>joggle the input to avoid cospherical and coincident
- sites.</dd>
+ sites. It is less accurate than triangulated output ('Qt').</dd>
<dt><a href="qh-optq.htm#QVn">QVn</a></dt>
<dd>select facets adjacent to input site <em>n</em> (marked
'good').</dd>
@@ -302,8 +310,7 @@ graphics</a></h3>
<blockquote>
See <a href="qdelaun.htm#graphics">Delaunay graphics</a>.
-They are the same except
-for Mathematica output.
+They are the same except for Mathematica and Maple output.
</blockquote>
<h3><a href="#TOP">»</a><a name="notes">furthest-site
@@ -315,13 +322,16 @@ record coincident input sites. Use <tt>qdelaunay</tt> instead.
<p><tt>qdelaunay Qu</tt> does not work for purely cocircular
or cospherical points (e.g., rbox c | qdelaunay Qu). Instead,
-use <tt>qdelaunay Qz</tt>. In this case, it is the same as
-the furthest-site Delaunay triangulation.
+use <tt>qdelaunay Qz</tt> -- when all points are vertices of the convex
+hull of the input sites, the Delaunay triangulation is the same
+as the furthest-site Delaunay triangulation.
<p>A non-simplicial, furthest-site Delaunay region indicates nearly cocircular or
cospherical input sites. To avoid non-simplicial regions triangulate
the output ('<a href="qh-optq.htm#Qt">Qt</a>') or joggle
-the input ('<a href="qh-optq.htm#QJn">QJ</a>'). You may also triangulate
+the input ('<a href="qh-optq.htm#QJn">QJ</a>'). Joggled input
+is less accurate than triangulated output.
+You may also triangulate
non-simplicial regions with option '<a
href="qh-optf.htm#Ft">Ft</a>'. It adds
the centrum to non-simplicial regions. Alternatively, use an <a
@@ -374,7 +384,7 @@ for furthest-site Delaunay triangulations.
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -393,11 +403,11 @@ for furthest-site Delaunay triangulations.
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qdelaun.htm b/html/qdelaun.htm
index 8c678883422aeb9cb2d3c55e1e5ec4534c199a28..74150d0bc41d31cc8154efed5a9998bb7d82c669 100644
--- a/html/qdelaun.htm
+++ b/html/qdelaun.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -28,7 +28,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a>qdelaunay -- Delaunay triangulation</h1>
@@ -68,29 +68,38 @@ by O'Rourke [<a href="index.htm#orou94">'94</a>]. </p>
<p>Qhull computes the Delaunay triangulation by computing a
convex hull. It lifts the input sites to a paraboloid by adding
-the sum of the squares of the coordinates. It computes the convex
+the sum of the squares of the coordinates. It scales the height
+of the paraboloid to improve numeric precision ('<a href=qh-optq.htm#Qbb>Qbb</a>').
+It computes the convex
hull of the lifted sites, and projects the lower convex hull to
-the input. Each region of the Delaunay triangulation
+the input.
+
+<p>Each region of the Delaunay triangulation
corresponds to a facet of the lower half of the convex hull.
Facets of the upper half of the convex hull correspond to the <a
href="qdelau_f.htm">furthest-site Delaunay triangulation</a>.
See the examples, <a href="qh-eg.htm#delaunay">Delaunay and
Voronoi diagrams</a>.</p>
-<p>See <a href="qh-faq.htm#TOC">Qhull FAQ</a> - Delaunay and
+<p>See <a href="http://www.qhull.org/html/qh-faq.htm#TOC">Qhull FAQ</a> - Delaunay and
Voronoi diagram questions.</p>
+<p>By default, qdelaunay merges cocircular and cospherical regions.
+For example, the Delaunay triangulation of a square inside a diamond
+('rbox D2 c d G4 | qdelaunay') contains one region for the square.
+It identifies coincident points.
+
<p>If you use '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output),
-all Delaunay regions
-will be simplicial (e.g., triangles in 2-d). Some regions may be
-degenerate and have zero area. Qhull can identify coincident
-points. If you do not use 'Qt', cocircular and cospherical data will lead
-to non-simplicial output (e.g., a square).
+all Delaunay regions will be simplicial (e.g., triangles in 2-d).
+Some regions may be
+degenerate and have zero area. Triangulated output identifies coincident
+points.
-<p>If you use '<a href="qh-optq.htm#QJn">QJ</a>' (joggle), all Delaunay regions
-will be simplicial (e.g., triangles in 2-d). Duplicate points will
-create small regions since the points are joggled apart. See <a
-href="qh-impre.htm#joggle">Joggled input or merged facets</a>. </p>
+<p>If you use '<a href="qh-optq.htm#QJn">QJ</a>' (joggled input), all Delaunay regions
+will be simplicial (e.g., triangles in 2-d). Coincident points will
+create small regions since the points are joggled apart. Joggled input
+is less accurate than triangulated output ('Qt'). See <a
+href="qh-impre.htm#joggle">Merged facets or joggled input</a>. </p>
<p>The output for 3-d Delaunay triangulations may be confusing if the
input contains cospherical data. See the FAQ item
@@ -108,7 +117,7 @@ in 4-d and higher. It disables the following Qhull
Qm Qr QR Qv Qx TR E V FC Fi Fo Fp Ft FV Q0,etc</i>.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -287,6 +296,8 @@ outputs</a></h3>
paraboloid)</dd>
<dt><a href="qh-opto.htm#m">m</a></dt>
<dd>Mathematica output for the lower facets of the paraboloid (2-d triangulations).</dd>
+ <dt><a href="qh-optf.htm#FM">FM</a></dt>
+ <dd>Maple output for the lower facets of the paraboloid (2-d triangulations).</dd>
<dt><a href="qh-optg.htm#G">G</a></dt>
<dd>Geomview output for the paraboloid (2-d or 3-d triangulations).</dd>
<dt><a href="qh-opto.htm#s">s</a></dt>
@@ -310,7 +321,7 @@ controls</a></h3>
degenerate facets of zero area.</dd>
<dt><a href="qh-optq.htm#QJn">QJ</a></dt>
<dd>joggle the input to avoid cospherical and coincident
- sites.</dd>
+ sites. It is less accurate than triangulated output ('Qt').</dd>
<dt><a href="qh-optq.htm#Qu">Qu</a></dt>
<dd>compute the <a href="qdelau_f.htm">furthest-site Delaunay triangulation</a>.</dd>
<dt><a href="qh-optq.htm#Qz">Qz</a></dt>
@@ -361,11 +372,12 @@ options). Use option '<a href="qh-optg.htm#Gt">Gt</a>' to make
the outer ridges transparent in 3-d. See <a
href="qh-eg.htm#delaunay">Delaunay and Voronoi examples</a>.</p>
-<p>For 2-d Delaunay triangulations, Mathematica output ('<a
-href="qh-opto.htm#m">m</a>') displays the lower facets of the corresponding convex
+<p>For 2-d Delaunay triangulations, Mathematica ('<a
+href="qh-opto.htm#m">m</a>') and Maple ('<a
+href="qh-optf.htm#FM">FM</a>') output displays the lower facets of the corresponding convex
hull (a paraboloid). </p>
-<p>For 2-d, furthest-site Delaunay triangulations, Mathematica output ('<a
+<p>For 2-d, furthest-site Delaunay triangulations, Maple and Mathematica output ('<a
href="qh-optq.htm#Qu">Qu</a> <a
href="qh-opto.htm#m">m</a>') displays the upper facets of the corresponding convex
hull (a paraboloid). </p>
@@ -381,8 +393,9 @@ for cocircular or cospherical input data.
<p>A non-simplicial Delaunay region indicates nearly cocircular or
cospherical input sites. To avoid non-simplicial regions either triangulate
-the output ('<a href="qh-optq.htm#Qt">Qt</a>')or joggle
-the input ('<a href="qh-optq.htm#QJn">QJ</a>'). Alternatively, use an <a
+the output ('<a href="qh-optq.htm#Qt">Qt</a>') or joggle
+the input ('<a href="qh-optq.htm#QJn">QJ</a>'). Triangulated output
+is more accurate than joggled input. Alternatively, use an <a
href="qh-impre.htm#exact">exact arithmetic code</a>.</p>
<p>Delaunay triangulations do not include facets that are
@@ -402,7 +415,7 @@ input. The points may be restricted to a hemisphere. [S. Fortune]
</p>
<p>The 3-d Delaunay triangulation of regular points on a half
-spiral (e.g., 'rbox 100 l | qhull d') has quadratic size, while the Delaunay triangulation
+spiral (e.g., 'rbox 100 l | qdelaunay') has quadratic size, while the Delaunay triangulation
of random 3-d points is
approximately linear for reasonably sized point sets.
@@ -476,7 +489,7 @@ conventions</a>.</p>
<pre>
qdelaunay- compute the Delaunay triangulation
- http://www.geom.umn.edu/software/qhull
+ http://www.qhull.org
input (stdin):
first lines: dimension and number of points (or vice-versa).
@@ -535,6 +548,7 @@ More formats:
FF - facet dump without ridges
FI - ID of each Delaunay region
Fm - merge count for each Delaunay region (511 max)
+ FM - Maple output (2-d only, lifted to a paraboloid)
Fn - count plus neighboring region for each Delaunay region
FN - count plus neighboring region for each point
FO - options and precision constants
@@ -580,7 +594,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -599,11 +613,11 @@ Print options:
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-eg.htm b/html/qh-eg.htm
index 1267330d339987acab254369d2c563a1fddf5b3e..5fd2caa8ef553d57cb1ccbeac3341eadaad9ccf9 100644
--- a/html/qh-eg.htm
+++ b/html/qh-eg.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><a name="TOP"><b>Up:</b></a> <a href="http://www.geom.umn.edu/software/qhull">Home
+<p><a name="TOP"><b>Up:</b></a> <a href="http://www.qhull.org">Home
page</a> for Qhull <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -25,7 +25,7 @@ while loading)<br>
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/half.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/half.html"><img
src="qh--half.gif" alt="[halfspace]" align="middle" width="100"
height="100"></a> Examples of Qhull</h1>
@@ -35,7 +35,7 @@ href="index.htm#geomview">Geomview</a>. You will need to
use a Unix computer with a copy of Geomview.
<p>
If you are not running Unix, you can view <a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">pictures</a>
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">pictures</a>
for some of the examples. To understand Qhull without Geomview, try the
examples in <a href="qh-quick.htm#programs">Programs</a> and
<a href="qh-quick.htm#programs">Programs/input</a>. You can also try small
@@ -48,7 +48,7 @@ test examples, and <tt>eg/q_test</tt> exercises the code. If you
find yourself viewing the inside of a 3-d example, use Geomview's
normalization option on the 'obscure' menu.</p>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -58,7 +58,7 @@ Contents </a></h2>
<ul>
<li><a href="#2d">2-d and 3-d examples</a></li>
<li><a href="#how">How Qhull adds a point</a></li>
- <li><a href="#joggle">Joggled input and triangulated output</a></li>
+ <li><a href="#joggle">Triangulated output or joggled input</a></li>
<li><a href="#delaunay">Delaunay and Voronoi diagrams</a></li>
<li><a href="#merge">Facet merging for imprecision</a></li>
<li><a href="#4d">4-d objects</a></li>
@@ -89,7 +89,7 @@ Contents </a></h2>
<li><a href="#14">eg.14.sphere.corner</a></li>
</ul>
</li>
- <li><a href="#TOC">»</a> <a name="joggle">Joggled input and triangulated output</a>
+ <li><a href="#TOC">»</a> <a name="joggle">Triangulated output or joggled input</a>
<ul>
<li><a href="#15a">eg.15a.surface</a></li>
<li><a href="#15b">eg.15b.triangle</a></li>
@@ -299,7 +299,7 @@ tells Qhull to only build facets that might be part of a good
facet. This technique reduces output size in low dimensions. It
does not work with facet merging.</p>
-<h2><a href="#TOC">»</a>Joggled input and triangulated output</h2>
+<h2><a href="#TOC">»</a>Triangulated output or joggled input</h2>
<h3><a href="#joggle">»</a><a name="15a">rbox 500 W0 | qconvex QR0 Qc Gvp >eg.15a.surface</a></h3>
@@ -340,8 +340,7 @@ this process until no precision problems occur.
<p>
Joggled input is a simple solution to precision problems in
computational geometry. Qhull can also merge facets to handle
-precision problems. See <a href="qh-impre.htm#joggle">Joggled input
-or merged facets</a>.
+precision problems. See <a href="qh-impre.htm#joggle">Merged facets or joggled input</a>.
<h2><a href="#TOC">»</a>Delaunay and Voronoi diagrams</h2>
@@ -371,7 +370,7 @@ Ga >eg.17c.delaunay.2-3 </a></h3>
<p>This is how Qhull generated both diagrams. Use Geomview's
'obscure' menu to turn off normalization, and Geomview's
'cameras' menu to turn off perspective. Then load this <a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html">object</a>
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html">object</a>
with one of the previous diagrams.</p>
<p>The points are lifted to a paraboloid by summing the squares
@@ -473,7 +472,7 @@ Voronoi diagram.</p>
qconvex G >eg.20.cone </a></h3>
<p>There are two things unusual about this <a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html">cone</a>.
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html">cone</a>.
One is the large flat disk at one end and the other is the
rectangles about the middle. That's how the points were
generated, and if those points were exact, this is the correct
@@ -509,7 +508,7 @@ R0.01 Gpav >eg.21b.roundoff.fixed </a></h3>
<p>Qhull handles the random perturbations and returns an
imprecise <a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/fixed.html">sphere</a>.
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/fixed.html">sphere</a>.
In this case, the output is a weak approximation to the points.
This is because a random perturbation of '<a
href="qh-optc.htm#Rn">R0.01 </a>' is equivalent to losing all but
@@ -584,7 +583,7 @@ vertices. That is why the cube looks lopsided.</p>
C-0.02 C0.1 Gh >eg.30.4d.merge.cube </a></h3>
<p><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/4dcube.html">Here</a>
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/4dcube.html">Here</a>
is the equivalent in 4-d of the imprecise <a href="#06">square</a>
and imprecise <a href="#23">cube</a>. It's the imprecise convex
hull of 5000 random points in a hypercube. It's a full 4-d object
@@ -648,7 +647,7 @@ qconvex FV n | qhalf Fp | qconvex G >eg.33c.cone.halfspace</a></h3>
<p>These examples illustrate halfspace intersection. The first
picture is the convex hull of two 20-gons plus an apex. The
second picture is the dual of the first. Try loading <a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/half.html">both</a>
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/half.html">both</a>
at once. Each vertex of the second picture corresponds to a facet
or halfspace of the first. The vertices with four edges
correspond to a facet with four neighbors. Similarly the facets
@@ -664,7 +663,7 @@ third picture is a duplicate of the first. </p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home
+<p><b>Up:</b> <a href="http://www.qhull.org">Home
page for Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual: Table of Contents</a><br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -681,11 +680,11 @@ while loading)<br>
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-faq.htm b/html/qh-faq.htm
index d0d33647cf79df263ec5fea9c1f16a1409bf8500..a6c507eae64ddc5697c31f9b8cdb2f93d4b02ad9 100644
--- a/html/qh-faq.htm
+++ b/html/qh-faq.htm
@@ -15,8 +15,8 @@ NOTE -- verify all links by 'grep href=' 'grep name=' add # 'sort /+7'
<body>
<p><a name="TOP"><b>Up:</b></a> <a
- href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull
-(http://www.geom.umn.edu/software/qhull)<br>
+ href="http://www.qhull.org">Home page</a> for Qhull
+(http://www.qhull.org)<br>
<b>Up:</b> <A href="index.htm#TOC">Qhull manual</A>: Table of Contents<br>
<b>To:</b> <A href="qh-quick.htm#programs">Programs</A>
• <A href="qh-quick.htm#options">Options</A>
@@ -33,7 +33,7 @@ wait while loading) <br>
<hr>
<!-- Main text of document -->
<h1><a
- href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/4dcube.html"><IMG
+ href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/4dcube.html"><IMG
align=middle alt ="[4-d cube]"
height=100 src="qh--4d.gif" width=100 ></a> Frequently Asked Questions about Qhull</h1><!--
<p><i>This is the most recent FAQ. It was updated Sept. 13, 1999.</i>
@@ -41,14 +41,14 @@ wait while loading) <br>
<p>If your question does not appear here, see: </p>
<ul>
- <li><a href="http://www.geom.umn.edu/~bradb/qhull-news.html">News</a> about Qhull
+ <li><a href="http://www.qhull.org/news">News</a> about Qhull
<li><A href="index.htm#TOC">Qhull manual:</A> table of contents
<li><A href="../README.txt">Installation</A> instructions for Qhull and rbox
- <li><A href="mailto:qhull@geom.umn.edu">Send e-mail</A> to
- qhull@geom.umn.edu
- <li><A href="mailto:qhull_bug@geom.umn.edu">Report bugs</A>
- to qhull_bug@geom.umn.edu </li>
+ <li><A href="mailto:qhull@qhull.org">Send e-mail</A> to
+ qhull@qhull.org
+ <li><A href="mailto:qhull_bug@qhull.org">Report bugs</A>
+ to qhull_bug@qhull.org </li>
</ul>
<p>Qhull is a general dimension code for computing convex hulls,
@@ -70,10 +70,10 @@ It should be used for Delaunay triangulations instead of
using joggled input ('<A href="qh-optq.htm#QJn">QJ</A>').
<p><i>Brad Barber, Cambridge MA,
-June 1, 2002 <!--
+2003/12/30 <!--
--> </i></p>
-<p><b>Copyright © 1998-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1998-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -313,8 +313,7 @@ problems. It can triangulate the output ('<A
approximation and does not modify the input.
<li>With triangulated output, Qhull merges facets and triangulates
the result.</li>
- <li>See <A href="qh-impre.htm#joggle">Joggled input or merged
- facets</A>. </li>
+ <li>See <A href="qh-impre.htm#joggle">Merged facets or joggled input</A>. </li>
</ul>
</blockquote>
@@ -1120,15 +1119,16 @@ See functions <a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref
<a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/tsearchn.shtml"
>tsearchn</a>, and
<a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/voronoin.shtml"
- >voronoin</a>.
+ >voronoin</a>. V. Brumberg update MATLAB R14 for Qhull 2003.1 and triangulated output.
<p>See <a href="http://www.mathsource.com/Content/Enhancements/Geometry/0211-251"
>qh-math</a>
for a Delaunay interface to Mathematica. It includes projects for CodeWarrior
on the Macintosh and Visual C++ on Win32 PCs.
-<p>If you write in interface for Maple, please send
-a note to <A href="mailto:bradb@geom.umn.edu" >bradb@geom.umn.edu</A>.
+<p>See Mathematica ('<a
+href="qh-opto.htm#m">m</a>') and Maple ('<a
+href="qh-optf.htm#FM">FM</a>') output options.
<p></p>
</blockquote><h4><A href="#TOC">»</A><a name="ridges">Why</a> are there too few ridges?</h4><blockquote>
@@ -1475,7 +1475,7 @@ the vertex order and the flag facet->toporient.</p>
<hr><!-- Navigation links -->
<p><a><b>Up:</b> </a><a
- href="http://www.geom.umn.edu/software/qhull">Home page for Qhull</a><br>
+ href="http://www.qhull.org">Home page for Qhull</a><br>
<b>Up:</b> <A href="index.htm#TOC">Qhull manual</A>: Table of Contents <br>
<b>To:</b> <A href="qh-quick.htm#programs">Programs</A>
• <A href="qh-quick.htm#options">Options</A>
@@ -1490,11 +1490,11 @@ the vertex order and the flag facet->toporient.</p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><IMG align=middle
+<p><a href="http://www.geom.uiuc.edu/"><IMG align=middle
height=40 src="qh--geom.gif" width=40 ></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created:
Sept. 25, 1995 --- <!-- hhmts start -->Last modified: see top
diff --git a/html/qh-get.htm b/html/qh-get.htm
index 93633c4ec50f1a82592df7ef193d2b3fba64879e..dfcb374f1b707df1bfc1243a387b3b24eab2c6cb 100644
--- a/html/qh-get.htm
+++ b/html/qh-get.htm
@@ -2,24 +2,24 @@
<html>
<head>
-<title>Download Qhull</title>
+<title>Qhull Downloads</title>
</head>
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="./"><i>Downloadable Software from the
+<p><b>Up:</b> <a href="http://www.geom.uiuc.edu/software/download"><i>Downloadable Software from the
Geometry Center </i></a><br>
</p>
<hr>
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
-src="/software/qhull/html/qh--cone.gif" alt="[CONE]" align="middle"
-width="100" height="100"></a> Download Qhull</h1>
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
+src="../html/qh--cone.gif" alt="[CONE]" align="middle"
+width="100" height="100"></a> Qhull Downloads</h1>
<ul>
- <li><a href="http://www.geom.umn.edu/software/qhull">Home page for Qhull</a> <p>Qhull
+ <li><a href="http://www.qhull.org">Qhull Home Page</a> <p>Qhull
computes convex hulls, Delaunay triangulations, halfspace
intersections about a point, Voronoi diagrams, furthest-site Delaunay
triangulations, and furthest-site Voronoi diagrams. It
@@ -27,36 +27,56 @@ width="100" height="100"></a> Download Qhull</h1>
implements the Quickhull algorithm for computing the
convex hull. Qhull handles roundoff errors from floating
point arithmetic. It can approximate a convex hull. </p>
- </li>
+
+ <p>Visit <a href="http://www.qhull.org/news">Qhull News</a>
+ for news, bug reports, change history, and users.</p>
+ </li>
<li><a
- href="http://www.geom.umn.edu/software/qhull/qhull2002.1.zip">Download:
- Qhull 2002.1 for Windows</a> (1.2 Mbytes) <p>Type: console program for
+ href="http://www.qhull.org/download/qhull-2003.1.zip">Download:
+ Qhull 2003.1 for Windows</a> (1.2 Mbytes) <p>Type: console programs for
Windows 95, 98, ME, 2000, NT, XP</p>
- <p>Includes documentation and sources files. It runs in a
+ <p>Includes executables, documentation, sources files, and a cygwin Makefile. It runs in a
DOS window.</p>
</li>
- <li><a href="http://www.geom.umn.edu/software/qhull/qhull2002.1.tgz">Download:
- Qhull version 2002.1</a> (600K) <p>Type: C source code for
+ <li><a href="http://www.qhull.org/download/qhull-2003.1-src.tgz">Download:
+ source for Qhull 2003.1</a> (600K) <p>Type: C source code for
32-bit and 64-bit architectures </p>
- <p>Includes makefiles and instructions for Unix and Power
- MacOS. It should compile on other 32-bit and 64-bit
- operating systems. </p>
+ <p>Includes documentation, source files, and a simple Makefile</p>
</li>
- <li><a href=http://savannah.gnu.org/projects/qhull/>Savannah sources</a>
- <p>Sources for Qhull 2002.1 in CVS. Includes downloads of Qhull's current and previous
+ <li><a href=http://savannah.nongnu.org/files/?group=qhull>Download: Qhull 2002.1 for Unix</a>
+ <p>Type: C source code for Unix systems (Debian configure)</b>
+
+ <p>Includes documentation, source files, and a configure Makefile.
+ Includes Debian configuration files. Includes downloads of Qhull's current and previous
versions.</p>
+
+ <!---
+ <p>B. Pearlmutter created a
+<a href=http://packages.debian.org/stable/math/qhull-bin.html>Debian build</a> of Qhull 3.1
+and upgraded it to 2002.1.
+ -->
+
+ </li>
+ <li><a href="http://www.qhull.org/download/qhull-2002.1-1mdk.i686.rpm">Download:
+ Qhull version 2002.1 i686 rpm</a> (643K) <p>Type: rpm build for Mandrake 8.2 and RedHat 7.3</p>
+
+ <p>For other Linux systems, use the <a href="http://www.qhull.org/download/qhull-2002.1-1mdk.src.rpm">src rpm</a> [L. Mazet]
+ </li>
+
+ <li><a href=http://savannah.gnu.org/projects/qhull/>Qhull@Savannah</a>
+ <p>Type: CVS repository</b>
+
+ <p>CVS repositiory of Qhull sources, documentation, and Makefiles.
+ </p>
</li>
<li><a href=http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html>Spanish
mirror site</a> <p>Download Qhull's current and
previous versions from <a href=http://www.etsimo.uniovi.es/derechos.html>Servidor
WWW de la Escuela de Minas</a> of the Universidad de Oviedo.</p>
</li>
- <li><a href="http://www.thesa.com/software/qhull">http://www.thesa.com/software/qhull</a>
- <p>Backup web site for Qhull.
- </li>
<li><a
- href="http://www.geom.umn.edu/software/qhull/qhull-96.ps">Download:
- Article about Qhull</a> (210K) <p>Type: Postscript file</p>
+ href="http://citeseer.nj.nec.com/83502.html">Download:
+ Article about Qhull</a> (210K) <p>Type: various formats on CiteSeer</p>
<p>Barber, C.B., Dobkin, D.P., and Huhdanpaa, H.T.,
"The Quickhull algorithm for convex hulls," <i>ACM
Transactions on Mathematical Software</i>, vol. 22, pp.
@@ -64,7 +84,7 @@ width="100" height="100"></a> Download Qhull</h1>
href="http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/">abstract</a>].</p>
</li>
<li><a
- href="http://www.geom.umn.edu/software/qhull/qhull-1.0.tar.gz">Download:
+ href="http://www.qhull.org/download/qhull-1.0.tar.gz">Download:
Qhull version 1.0</a> (92K) <p>Type: C source code for
32-bit architectures </p>
<p>Version 1.0 is a fifth the size of version 2.4. It
@@ -78,7 +98,7 @@ width="100" height="100"></a> Download Qhull</h1>
options for qhull are the same. [D. Zwick] </p>
</li>
<li><a
- href="http://www.geom.umn.edu/software/qhull/qhull-1.0.sit.hqx">Download:
+ href="http://www.qhull.org/download/qhull-1.0.sit.hqx">Download:
Qhull version 1.0 (Mac)</a> (180K) <p>Type: C source
code, packaged for Macintosh w/68881 </p>
<p>The Macintosh implementation of Qhull 1.0 reads input
@@ -91,18 +111,15 @@ width="100" height="100"></a> Download Qhull</h1>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/download"><i>Downloadable Software from the
+<p><b>Up:</b> <a href="http://www.geom.uiuc.edu/software/download"><i>Downloadable Software from the
Geometry Center </i></a><br>
<!-- GC common information --></p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="/pix/home.gif" alt="[HOME]"
+<p><a href="http://www.geom.uiuc.edu/"><img src="../html/qh--geom.gif" alt="[HOME]"
align="middle"></a> <i>The Geometry Center Home Page</i> </p>
-<p>Comments to: <a href="http://www.geom.umn.edu/admin/mail/webmaster.html">webmaster@geom.umn.edu</a><br>
-Created: Feb 28 1995 ---
-<!-- hhmts start -->
-Last modified: November 2, 2001 <!-- hhmts end --> </p>
+<p>Comments to: <a href="mailto:qhull@qhull.org">qhull@qhull.org</a><br>
</body>
</html>
diff --git a/html/qh-impre.htm b/html/qh-impre.htm
index ce7ca276869f67e027d17ba0c6d7feade4898153..c18c585c88149d411eaa3abfb7edcb42d307834d 100644
--- a/html/qh-impre.htm
+++ b/html/qh-impre.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><a name="TOP"><b>Up:</b></a> <a href="http://www.geom.umn.edu/software/qhull">Home
+<p><a name="TOP"><b>Up:</b></a> <a href="http://www.qhull.org">Home
page</a> for Qhull <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of
Contents<br>
@@ -26,7 +26,7 @@ Contents<br>
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/4dcube.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/4dcube.html"><img
src="qh--4d.gif" alt="[4-d cube]" align="middle" width="100"
height="100"></a> Imprecision in Qhull</h1>
@@ -46,7 +46,7 @@ convex. It verifies that all points are on or below all facets. </p>
<p>Qhull automatically tests for convexity if it detects
precision errors while constructing the hull. </p>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -55,7 +55,7 @@ imprecision: Table of Contents </a></h2>
<ul>
<li><a href="#prec">Precision problems</a></li>
- <li><a href="#joggle">Joggled input or merged facets</a></li>
+ <li><a href="#joggle">Merged facets or joggled input</a></li>
<li><a href="#delaunay">Delaunay triangulations</a></li>
<li><a href="#imprecise">Merged facets</a></li>
<li><a href="#how">How Qhull merges facets</a></li>
@@ -137,18 +137,25 @@ the original extreme points. Qhull may split or merge an extreme
point, but this appears to be unlikely.</p>
<p>The following pipe implements the identity function for
-extreme points (with roundoff):</p>
-
+extreme points (with roundoff):
<blockquote>
- <p>qconvex <a href="qh-optf.htm#FV">FV</a> <a
- href="qh-opto.htm#n">n</a> | qhalf <a href="qh-optf.htm#Fp">Fp</a></p>
+ qconvex <a href="qh-optf.htm#FV">FV</a> <a
+ href="qh-opto.htm#n">n</a> | qhalf <a href="qh-optf.htm#Fp">Fp</a>
</blockquote>
-<h2><a href="#TOC">»</a><a name="joggle">Joggled input or merged
-facets</a></h2>
+<p>Bernd Gartner published his
+<a href=http://www.inf.ethz.ch/personal/gaertner/miniball.html>Miniball</a>
+algorithm ["Fast and robust smallest enclosing balls", <i>Algorithms - ESA '99</i>, LNCS 1643].
+It uses floating point arithmetic and a carefully designed primitive operation.
+It is practical to 20-D or higher, and identifies at least two points on the
+convex hull of the input set. Like Qhull, it is an incremental algorithm that
+processes points furthest from the intermediate result and ignores
+points that are close to the intermediate result.
-<p>This section discusses the choice between joggled input and
-merged facets. By default, Qhull uses merged facets to handle
+<h2><a href="#TOC">»</a><a name="joggle">Merged facets or joggled input</a></h2>
+
+<p>This section discusses the choice between merged facets and joggled input.
+By default, Qhull uses merged facets to handle
precision problems. With option '<a href="qh-optq.htm#QJn">QJ</a>',
the input is joggled. See <a href="qh-eg.htm#joggle">examples</a>
of joggled input and triangulated output.
@@ -158,15 +165,16 @@ when you want non-simplicial output (e.g., the faces of a cube).
<li>Use merged facets and triangulated output ('<a href="qh-optq.htm#Qt">Qt</a>') when
you want simplicial output and coplanar facets (e.g., triangles for a Delaunay triangulation).
<li>Use joggled input ('<a href="qh-optq.htm#QJn">QJ</a>') when you need clearly-convex,
-simplicial output
-(e.g., triangles for a Delaunay triangulation).
+simplicial output.
</ul>
-<p>The choice between joggled input and merged facets depends on
+<p>The choice between merged facets and joggled input depends on
the application. Both run about the same speed. Joggled input may
be faster if the initial joggle is sufficiently large to avoid
-precision errors. Most applications should used merged facets
-with triangulated output.</p>
+precision errors.
+
+<p>Most applications should used merged facets
+with triangulated output. </p>
<p>Use merged facets (the
default, '<a href="qh-optc.htm#C0">C-0</a>')
@@ -232,6 +240,15 @@ roundoff error. It is automatically set for <a href=qdelaun.htm>qdelaunay</a>,
<a href=qvoronoi.htm>qvoronoi</a>, and option '<a
href="qh-optq.htm#QJn">QJ</a>'.</p>
+<p>Edelsbrunner, H, <i>Geometry and Topology for Mesh Generation</i>, Cambridge University Press, 2001.
+Good mathematical treatise on Delaunay triangulation and mesh generation for 2-d
+and 3-d surfaces. The chapter on surface simplification is
+particularly interesting. It is similar to facet merging in Qhull.
+
+<p>Veron and Leon published an algorithm for shape preserving polyhedral
+simplification with bounded error [<i>Computers and Graphics</i>, 22.5:565-585, 1998].
+It remove nodes using front propagation and multiple remeshing.
+
<h2><a href="#TOC">»</a><a name="imprecise">Merged facets </a></h2>
<p>Qhull detects precision
@@ -728,10 +745,11 @@ quickly and <a href="index.htm#geomview">Geomview</a> to view
the results. You will probably want to write your own driver for
Qhull using the Qhull library. For example, you could select the
largest facet in each quadrant.</p>
+
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home
+<p><b>Up:</b> <a href="http://www.qhull.org">Home
page</a> for Qhull <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of
Contents<br>
@@ -749,11 +767,11 @@ Contents<br>
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-in.htm b/html/qh-in.htm
index 53d6436491f76ceef58d28b03a407c7252cb7fe6..e2b5b5e65370168ac789cc80c6e892b7f61a96dc 100644
--- a/html/qh-in.htm
+++ b/html/qh-in.htm
@@ -9,7 +9,7 @@
<body>
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page for Qhull</a>
+href="http://www.qhull.org">Home page for Qhull</a>
<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual: Table of
Contents</a><br>
@@ -31,13 +31,13 @@ structures
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/4dcube.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/4dcube.html"><img
src="qh--4d.gif" alt="[4-d cube]" align="middle" width="100"
height="100"></a> Qhull internals</h1>
<p>This section discusses the internals of Qhull. </p>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -186,16 +186,33 @@ the most expensive function.
<h2><a href="#TOC">»</a><a name="library">Calling Qhull from
your program</a></h2>
-<p>The <tt>Makefile</tt> produces a library, <tt>libqhull.a</tt>,
-for inclusion in your programs. First review <tt>qhull.h</tt>.
-This defines the data structures used by Qhull and provides
-prototypes for the top-level functions. </p>
+<p><b>Warning:</b> Qhull was not designed for calling from other
+programs. There is neither API nor Qhull classes.
+It can be done, but it takes work and head scratching.
+You will need to understand the data structures and read the code.
+Most users will find it easier to call Qhull as an external
+command.
+
+<p>For examples of calling Qhull, see GNU Octave's
+<a href=http://octave.sourceforge.net/index/analysis.html#Geometry>computational geometry code</a>,
+and Qhull's
+<a href=../src/user_eg.c>user_eg.c</a>,
+<a href=../src/user_eg2.c>user_eg2.c</a>,
+<a href=../src/user.c>user.c</a>, and
+<a href=../src/qhull_interface.cpp>qhull_interface.cpp</a>.
+Qhull's programs use the same library:
+<a href=../src/unix.c>unix.c</a>,
+<a href=../src/qconvex.c>qconvex.c</a>,
+<a href=../src/qdelaun.c>qdelaun.c</a>,
+<a href=../src/qhalf.c>qhalf.c</a>, and
+<a href=../src/qvoronoi.c>qvoronoi.c</a>.
-<p>Most users will only need qhull.h in their programs. For
-example, the Qhull program is defined with <tt>qhull.h</tt> and <tt>unix.c</tt>.
-To access all functions, use <tt>qhull_a.h</tt>. Include the file
-with "<tt>#include <qhull/qhull_a.h>".</tt> This
-avoids potential name conflicts.</p>
+<p>The <a href=http://www.boost.org/libs/graph/doc/table_of_contents.html>BGL</a>
+Boost Graph Library [aka GGCL] provides C++ classes for graph data structures
+and algorithms [Dr. Dobb's 9/00 p. 29-38; OOPSLA '99 p. 399-414]. It is modelled after the
+Standard Template Library. It would provide a good interface to Qhull.
+If you are interested in adapting BGL to Qhull, please contact
+<a href="mailto:bradb@qhull.org">bradb@qhull.org</a>.
<p>See <a href="../src/index.htm">Qhull functions, macros, and data
structures</a> for internal documentation of Qhull. The
@@ -210,19 +227,15 @@ defined in <tt>qhull.h</tt>. They allow the global data
structures to be pre-allocated (faster access) or dynamically
allocated (allows multiple copies). </p>
-<p><tt>User.c</tt> and <tt>qhull_interface.cpp</tt> include
-an application template. You can use <tt>user_eg.c</tt>
-as an example. It also shows how to reduce memory requirements by
-not loading <tt>io.o</tt>. If you use joggled input ('<a
-href="qh-optq.htm#QJn">QJ</a>'), you may also remove <tt>merge.o</tt>
-with <a href="../src/user.h#NOmerge">qh_NOmerge</a>'. </p>
-
-<p>The <a href=http://www.boost.org/libs/graph/doc/table_of_contents.html>BGL</a>
-Boost Graph Library [aka GGCL] provides C++ classes for graph data structures
-and algorithms [Dr. Dobb's 9/00 p. 29-38; OOPSLA '99 p. 399-414]. It is modelled after the
-Standard Template Library. It would provide a good interface to Qhull.
-If you are interested in adapting BGL to Qhull, please contact
-<a href="mailto:bradb@geom.umn.edu">bradb@geom.umn.edu</a>.
+<p>Qhull's <tt>Makefile</tt> produces a library, <tt>libqhull.a</tt>,
+for inclusion in your programs. First review <tt>qhull.h</tt>.
+This defines the data structures used by Qhull and provides
+prototypes for the top-level functions.
+Most users will only need qhull.h in their programs. For
+example, the Qhull program is defined with <tt>qhull.h</tt> and <tt>unix.c</tt>.
+To access all functions, use <tt>qhull_a.h</tt>. Include the file
+with "<tt>#include <qhull/qhull_a.h>".</tt> This
+avoids potential name conflicts.</p>
<p>If you use the Qhull library, you are on your own as far as
bugs go. Start with small examples for which you know the output.
@@ -289,6 +302,20 @@ the lifted point. For convex hulls, the distance of a point to
the convex hull is either the distance to this facet or the
distance to a subface of the facet.</p>
+<blockquote>
+<p><b>Warning:</b> If triangulated output ('<a href=qh-optq.htm#Qt>Qt</a>') and
+the best facet is triangulated, qh_findbestfacet() returns one of
+the corresponding 'tricoplanar' facets. The actual best facet may be a different
+tricoplanar facet.
+<p>
+See qh_nearvertex() in poly2.c for sample code to visit each
+tricoplanar facet. To identify the correct tricoplanar facet,
+see Devillers, et. al., [<a href="index.htm#devi01">'01</a>]
+and Mucke, et al [<a href="index.htm#muck96">'96</a>]. If you
+implement this test in general dimension, please notify
+<a href="mailto:qhull@qhull.org">qhull@qhull.org</a>.
+</blockquote>
+
<p>qh_findbestfacet performs an exhaustive search if its directed
search returns a facet that is above the point. This occurs when
the point is inside the hull or if the curvature of the convex
@@ -387,7 +414,7 @@ separation may be incorrect. [H. Geron] </p>
<h3><A href="#TOC">»</A><a name="tricoplanar">Tricoplanar facets and option 'Qt'</h3>
-<p>Option '<a href=qh_optq.htm#Qt>Qt</a>' triangulates non-simplicial
+<p>Option '<a href=qh-optq.htm#Qt>Qt</a>' triangulates non-simplicial
facets (e.g., a square facet in 3-d or a cubical facet in 4-d).
All facets share the same apex (i.e., the first vertex in facet->vertices).
For each triangulated facet, Qhull
@@ -488,9 +515,9 @@ graph of the convex hull. </p>
<p>There are many ways in which Qhull can be improved. </p>
<pre>Here is a partial list:
+ - fix finddelaunay() in user_eg.c for tricoplanar facets
- write a BGL, C++ interface to Qhull
http://www.boost.org/libs/graph/doc/table_of_contents.html
- - rewrite Qhull in C++ to make it easier to use Qhull in a program
- change qh_save_qhull to swap the qhT structure instead of using pointers
- change error handling and tracing to be independent of 'qh ferr'
- determine the maximum width for a given set of parameters
@@ -517,6 +544,7 @@ Precision improvements:
- improve facet width for very narrow distributions
New features:
+ - implement Matlab's tsearch() using Qhull
- compute volume of Voronoi regions. You need to determine the dual face
graph in all dimensions [see Clarkson's hull program]
- compute alpha shapes [see Clarkson's hull program]
@@ -562,7 +590,7 @@ Performance improvements:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home
+<p><b>Up:</b> <a href="http://www.qhull.org">Home
page for Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual: Table of
Contents</a><br>
@@ -581,11 +609,11 @@ structures <!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see changes.txt <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optc.htm b/html/qh-optc.htm
index ac23526ce610bdb2d06bce4eb450f208a326b823..3893f94daaab116a2474559ad7a292a26a680f88 100644
--- a/html/qh-optc.htm
+++ b/html/qh-optc.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -22,14 +22,14 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a> Qhull precision options</h1>
This section lists the precision options for Qhull. These options are
indicated by an upper-case letter followed by a number.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -264,7 +264,7 @@ distinguish coplanar points from interior points.</p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -278,11 +278,11 @@ distinguish coplanar points from interior points.</p>
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optf.htm b/html/qh-optf.htm
index 1207e0c332374d753a2d7dccdd805730098e0ff6..fe745f0e6c2d64672bf373b1009896c0922a4639 100644
--- a/html/qh-optf.htm
+++ b/html/qh-optf.htm
@@ -6,7 +6,7 @@
</head>
<body><!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <A href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <A href="qh-quick.htm#programs">Programs</a>
• <A href="qh-quick.htm#options">Options</a>
@@ -20,7 +20,7 @@
<hr>
<!-- Main text of document -->
<h1><a
- href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><IMG
+ href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><IMG
align=middle alt=[delaunay] height=100
src="qh--dt.gif" width=100 ></a> Qhull format options (F)</h1>
@@ -30,7 +30,7 @@ are indicated by 'F' followed by a letter. See <A
and <A href="qh-optg.htm#geomview">Geomview</a> for other output
options. </p>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -74,6 +74,8 @@ may also be used.</p>
<dd>use format for input (offset first)
<dt><A href="#FD">FD</a>
<dd>use cdd format for normals (offset first)
+ <dt><a href="#FM">FM</a>
+ <dd>print Maple output (2-d and 3-d)
<dt>
<dt>
<dd><b>Facets, points, and vertices</b>
@@ -302,6 +304,66 @@ number of merges for each facet, one per line. At most 511 merges
are reported for a facet. See '<A href="qh-optp.htm#PMn">PMn</a>'
for printing the facets with the most merges. </p>
+<h3><a href="#format">»</a><a name="FM">FM - print Maple
+output </a></h3>
+
+<p>Qhull writes a Maple file for 2-d and 3-d convex hulls,
+2-d and 3-d halfspace intersections,
+and 2-d Delaunay triangulations. Qhull produces a 2-d
+or 3-d plot.
+
+<p><i>Warning</i>: This option has not been tested in Maple.
+
+<p>[From T. K. Abraham with help from M. R. Feinberg and N. Platinova.]
+The following steps apply while working within the
+Maple worksheet environment :
+<ol>
+<li>Generate the data and store it as an array . For example, in 3-d, data generated
+in Maple is of the form : x[i],y[i],z[i]
+<p>
+<li>Create a single variable and assign the entire array of data points to this variable.
+Use the "seq" command within square brackets as shown in the following example.
+(The square brackets are essential for the rest of the steps to work.)
+<p>
+>data:=[seq([x[i],y[i],z[i]],i=1..n)]:# here n is the number of data points
+
+<li>Next we need to write the data to a file to be read by qhull. Before
+writing the data to a file, make sure that the qhull executable files and
+the data file lie in the same subdirectory. If the executable files are
+stored in the "C:\qhull3.1\" subdirectory, then save the file in the same
+subdirectory, say "C:\qhull3.1\datafile.txt". For the sake of integrity of
+the data file , it is best to first ensure that the data file does not
+exist before writing into the data file. This can be done by running a
+delete command first . To write the data to the file, use the "writedata"
+and the "writedata[APPEND]" commands as illustrated in the following example :
+<p>
+>system("del c:\\qhull3.1\\datafile.txt");#To erase any previous versions of the file
+<br>>writedata("c:\\qhull3.1\\datafile.txt ",[3, nops(data)]);#writing in qhull format
+<br>>writedata[APPEND]("c:\\ qhull3.1\\datafile.txt ", data);#writing the data points
+<li>
+Use the 'FM' option to produce Maple output. Store the output as a ".mpl" file.
+For example, using the file we created above, we type the following (in DOS environment)
+<p>
+qconvex s FM <datafile.txt >dataplot.mpl
+
+<li>
+To read 3-d output in Maple, we use the 'read' command followed by
+a 'display3d' command. For example (in Maple environment):
+<p>
+>with(plots):
+<br>>read `c:\\qhull3.1\\dataplot.mpl`:#IMPORTANT - Note that the punctuation mark used is ' and NOT '. The correct punctuation mark is the one next to the key for "1" (not the punctuation mark near the enter key)
+<br>> qhullplot:=%:
+<br>> display3d(qhullplot);
+</ol>
+
+<p>For Delaunay triangulation orthogonal projection is better.
+
+<p>For halfspace intersections, Qhull produces the dual
+convex hull.
+
+<p>See <a href="qh-faq.htm#math">Is Qhull available for Maple?</a>
+for other URLs.
+
<h3><A href="#format">»</a><a name="Fn">Fn - print neighboring
facets for each facet </a></h3>
@@ -352,7 +414,7 @@ option '<A href="qh-opto.htm#o">o</a>'. To convert from 'FN' to '<A
href="qh-opto.htm#o" >o</a>', replace negative indices with zero
and increment non-negative indices by one. </p>
-<p>If you are using the <A href="index.htm#library">Qhull
+<p>If you are using the <A href="qh-in.htm#library">Qhull
library</a>, option 'FN' has the side effect of reordering the
neighbors for a vertex </p>
@@ -473,7 +535,7 @@ followed by the:
<li>number of nonsimplicial or merged facets selected for
output
<LI>number of deleted vertices</LI>
-<LI>number of triangulated facets ('<A href="qh-optq.htm#t">Qt</a>')</LI>
+<LI>number of triangulated facets ('<A href="qh-optq.htm#Qt">Qt</a>')</LI>
</ul>
<p>The second line consists of the number of reals
@@ -488,7 +550,7 @@ Roundoff and joggle are included.
<p>For Delaunay triangulations and Voronoi diagrams, the
number of deleted vertices should be zero. If greater than zero, then the
input is highly degenerate and coplanar points are not necessarily coincident
-points. For example, <tt>'RBOX 1000 s W1e-13 t995138628 | QHULL d'</tt> reports
+points. For example, <tt>'RBOX 1000 s W1e-13 t995138628 | QHULL d Qbb'</tt> reports
deleted vertices; the input is nearly cospherical.</p>
<P>Later versions of Qhull may produce additional integers or reals.</P>
@@ -583,7 +645,7 @@ inner, bounded regions. </p>
midpoint. For example, the Voronoi diagram of cospherical points
lists zero ridges (e.g., 'rbox 10 s | qvoronoi Fv Qz').
Other examples are the Voronoi diagrams of a rectangular mesh
-(e.g., 'rbox 27 M1,0 | qhull v Fv') or a point set with
+(e.g., 'rbox 27 M1,0 | qvoronoi Fv') or a point set with
a rectangular corner (e.g.,
'rbox P4,4,4 P4,2,4 P2,4,4 P4,4,2 10 | qvoronoi Fv').
Both cases miss unbounded rays at the corners.
@@ -592,7 +654,7 @@ large cube (e.g., 'rbox 10 s c G2.0 | qvoronoi Fv Qz').
Please report any other cases that are missed. If you
can formally describe these cases or
write code to handle them, please send email to <A
- href="mailto:qhull@geom.umn.edu" >qhull@geom.umn.edu</a>. </p>
+ href="mailto:qhull@qhull.org" >qhull@qhull.org</a>. </p>
<h3><A href="#format">»</a><a name="FV">FV - print average
vertex </a></h3>
@@ -631,7 +693,7 @@ are unordered. <!-- Navigation links --> </p>
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <A href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <A href="qh-quick.htm#programs">Programs</a>
• <A href="qh-quick.htm#options">Options</a>
@@ -644,11 +706,11 @@ are unordered. <!-- Navigation links --> </p>
• <A href="qh-optt.htm#trace">Trace</a></p><!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><IMG align=middle
+<p><a href="http://www.geom.uiuc.edu/"><IMG align=middle
height=40 src="qh--geom.gif" width=40 ></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created:
Sept. 25, 1995 --- <!-- hhmts start -->Last modified: see top
diff --git a/html/qh-optg.htm b/html/qh-optg.htm
index 5bb0b69d85220700ca38a17d33a95ba9f43c477f..3db0fc6b9b72df236589a350babfb3021cf5453d 100644
--- a/html/qh-optg.htm
+++ b/html/qh-optg.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -23,7 +23,7 @@
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a> Qhull Geomview options (G)</h1>
@@ -33,7 +33,7 @@ indicated by 'G' followed by a letter. See
and <a href="qh-optf.htm#format">Format</a> for other output options.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -245,7 +245,7 @@ data. See '<a href="#Gp">Gp</a>' for determining the radius.</p>
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -260,11 +260,11 @@ data. See '<a href="#Gp">Gp</a>' for determining the radius.</p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-opto.htm b/html/qh-opto.htm
index 97cd59cf429c02de476219e7233d77ced9a7c67b..0ec45f17b4ac58a0301eddeff68de70562993530 100644
--- a/html/qh-opto.htm
+++ b/html/qh-opto.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -22,7 +22,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a> Qhull output options</h1>
@@ -33,7 +33,7 @@ href="qh-optp.htm#print">Print</a>, and <a
href="qh-optg.htm#geomview">Geomview</a> for other output
options. </p>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -318,7 +318,7 @@ than 0.05. </p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -332,11 +332,11 @@ than 0.05. </p>
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optp.htm b/html/qh-optp.htm
index b0c48b78258aea92a4ccef0a00f05af3d4a28a47..8849da26a25ea6162a7507b8a14e4532eeaa96fc 100644
--- a/html/qh-optp.htm
+++ b/html/qh-optp.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -22,7 +22,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a> Qhull print options (P)</h1>
@@ -32,7 +32,7 @@ indicated by 'P' followed by a letter. See
and <a href="qh-optf.htm#format">Format</a> for other output options.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -224,7 +224,7 @@ removes the narrow hull warning.</p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -238,11 +238,11 @@ removes the narrow hull warning.</p>
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optq.htm b/html/qh-optq.htm
index fd954ce5523bb2a7b2aa8693e55a0f9acc341a41..331daa0c0ed088facadcb397ed6736dd40cb22eb 100644
--- a/html/qh-optq.htm
+++ b/html/qh-optq.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -22,14 +22,14 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a> Qhull control options (Q)</h1>
<p>This section lists the control options for Qhull. These
options are indicated by 'Q' followed by a letter. </p>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -249,7 +249,7 @@ build those facets that it needs to determine the good facets in
the output. This may speed up Qhull in 2-d and 3-d. It is
useful for furthest-site Delaunay
triangulations (<a href=qdelau_f.htm>qdelaunay Qu</a>,
-invoke with 'qhull d <a href="#Qu">Qu</a> Qg').
+invoke with 'qhull d Qbb <a href="#Qu">Qu</a> Qg').
It is not effective in higher
dimensions because many facets see a given point and contain a
given vertex. It is not guaranteed to work for all combinations.</p>
@@ -305,7 +305,7 @@ ten-fold and tries again. The maximum value for increasing <i>n</i>
is 0.01 times the maximum width of the input. Option 'QJ' selects
a default value for <i>n</i>. <a href="../src/user.h#JOGGLEdefault">User.h</a>
defines these parameters and a maximum number of retries. See <a
-href="qh-impre.htm#joggle">Joggled input or merged facets</a>. </p>
+href="qh-impre.htm#joggle">Merged facets or joggled input</a>. </p>
<p>Option 'QJ' also sets '<a href="qh-optq.htm#Qbb">Qbb</a>' for
Delaunay triangulations and Voronoi diagrams. It does not set
@@ -436,13 +436,13 @@ prints facets of the upper hull. These correspond to the <a
href="qdelau_f.htm">furthest-site Delaunay triangulation</a>
and the <a href="qvoron_f.htm">furthest-site Voronoi diagram</a>.</p>
-<p>Option 'qhull d Qu <a href="#Qg">Qg</a>' may improve the speed of option
+<p>Option 'qhull d Qbb Qu <a href="#Qg">Qg</a>' may improve the speed of option
'Qu'. If you use the Qhull library, a faster method is 1) use
Qhull to compute the convex hull of the input sites; 2) take the
extreme points (vertices) of the convex hull; 3) add one interior
point (e.g.,
'<a href="qh-optf.htm#FV">FV</a>', the average of <em>d</em> extreme points); 4) run
-'qhull d Qu' or 'qhull v Qu' on these points.</p>
+'qhull d Qbb Qu' or 'qhull v Qbb Qu' on these points.</p>
<h3><a href="#qhull">»</a><a name="Qv">Qv - test vertex
neighbors for convexity </a></h3>
@@ -671,7 +671,7 @@ reports an error due to a duplicate ridge.
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -685,11 +685,11 @@ reports an error due to a duplicate ridge.
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optt.htm b/html/qh-optt.htm
index d7404b0fc0267d57b194d9b55ff8afc367d670ee..15d8c550ed1bb5ae531d921dc3a50c8868a2e7b3 100644
--- a/html/qh-optt.htm
+++ b/html/qh-optt.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -22,14 +22,14 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a> Qhull trace options (T)</h1>
This section lists the trace options for Qhull. These options are
indicated by 'T' followed by a letter.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -250,7 +250,7 @@ stdout </a></h3>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -264,11 +264,11 @@ stdout </a></h3>
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-quick.htm b/html/qh-quick.htm
index 2d4ecb2520a38fa45c8c860b477aa355535e7ca0..29d9d0d022f9e32df55eebb092f865fd2baa940a 100644
--- a/html/qh-quick.htm
+++ b/html/qh-quick.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><a name="TOC"><b>Up:</b></a> <a href="http://www.geom.umn.edu/software/qhull">Home
+<p><a name="TOC"><b>Up:</b></a> <a href="http://www.qhull.org">Home
page for Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a> <br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -32,13 +32,13 @@ page for Qhull</a> <br>
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
src="qh--cone.gif" alt="[cone]" align="middle" width="100"
height="100"></a> Qhull quick reference</h1>
This section lists all programs and options in Qhull.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<p>
<a name="programs"> </a>
@@ -172,46 +172,48 @@ Finner_bounded
FIDs
</nobr></td><td><nobr>'<a href=qh-optf.htm#Fm>Fm</a>'
Fmerges
-</nobr></td><td><nobr>'<a href=qh-optf.htm#Fn>Fn</a>'
-Fneighbors
+</nobr></td><td><nobr>'<a href=qh-optf.htm#FM>FM</a>'
+FMaple
</nobr></td></tr><tr>
-<td><nobr>'<a href=qh-optf.htm#FN>FN</a>'
+<td><nobr>'<a href=qh-optf.htm#Fn>Fn</a>'
+Fneighbors
+</nobr></td><td><nobr>'<a href=qh-optf.htm#FN>FN</a>'
FNeigh-vertex
</nobr></td><td><nobr>'<a href=qh-optf.htm#Fo>Fo</a>'
Fouter
</nobr></td><td><nobr>'<a href=qh-optf.htm#Fo2>Fo</a>'
Fouter_unbounded
-</nobr></td><td><nobr>'<a href=qh-optf.htm#FO>FO</a>'
-FOptions
</nobr></td></tr><tr>
-<td><nobr>'<a href=qh-optf.htm#Fp>Fp</a>'
+<td><nobr>'<a href=qh-optf.htm#FO>FO</a>'
+FOptions
+</nobr></td><td><nobr>'<a href=qh-optf.htm#Fp>Fp</a>'
Fpoint-intersect
</nobr></td><td><nobr>'<a href=qh-optf.htm#FP>FP</a>'
FPoint_near
</nobr></td><td><nobr>'<a href=qh-optf.htm#FQ>FQ</a>'
FQhull
-</nobr></td><td><nobr>'<a href=qh-optf.htm#Fs>Fs</a>'
-Fsummary
</nobr></td></tr><tr>
-<td><nobr>'<a href=qh-optf.htm#FS>FS</a>'
+<td><nobr>'<a href=qh-optf.htm#Fs>Fs</a>'
+Fsummary
+</nobr></td><td><nobr>'<a href=qh-optf.htm#FS>FS</a>'
FSize
</nobr></td><td><nobr>'<a href=qh-optf.htm#Ft>Ft</a>'
Ftriangles
</nobr></td><td><nobr>'<a href=qh-optf.htm#Fv>Fv</a>'
Fvertices
-</nobr></td><td><nobr>'<a href=qh-optf.htm#Fv2>Fv</a>'
-Fvoronoi
</nobr></td></tr><tr>
-<td><nobr>'<a href=qh-optf.htm#FV>FV</a>'
+<td><nobr>'<a href=qh-optf.htm#Fv2>Fv</a>'
+Fvoronoi
+</nobr></td><td><nobr>'<a href=qh-optf.htm#FV>FV</a>'
FVertex-ave
</nobr></td><td><nobr>'<a href=qh-optf.htm#Fx>Fx</a>'
Fxtremes
</nobr></td><td colspan=2><nobr>
-<a href=qh-impre.htm#joggle>Joggled input</a> or merged facets
+<a href=qh-impre.htm#joggle>Merged facets or joggled input</a>
</nobr></td></tr>
<tr><td> </td></tr><tr>
@@ -455,7 +457,7 @@ Q11_trinormals
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home
+<p><b>Up:</b> <a href="http://www.qhull.org">Home
page for Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a> <br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -478,11 +480,11 @@ page for Qhull</a> <br>
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qhalf.htm b/html/qhalf.htm
index 4076516c307dc8041f469a8d368bcabe7ed8088f..34ab9c79eccf6c6d249cb2930e5efddb2e23c5f9 100644
--- a/html/qhalf.htm
+++ b/html/qhalf.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><a name="TOP"><b>Up</b></a><b>:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><a name="TOP"><b>Up</b></a><b>:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -27,7 +27,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/half.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/half.html"><img
src="qh--half.gif" alt="[halfspace]" align="middle" width="100"
height="100"></a>qhalf -- halfspace intersection about a point</h1>
@@ -48,6 +48,23 @@ programming. </p>
that define the cube. <tt>qhalf Fp</tt> computes the intersection of
the halfspaces about the origin. The intersection is the vertices
of the original cube.</dd>
+
+ <dt><p><b>Example:</b> rbox c d G0.55 | qconvex <a href="qh-optf.htm#FQ">FQ</a> <a href="qh-optf.htm#FV">FV</a>
+ <a href="qh-opto.htm#n">n</a> | qhalf <a
+ href="qh-optf.htm#Fp">Fp</a></dt>
+ <dd>Print the intersection of the facets of a cube and a diamond. There
+ are 24 facets and 14 intersection points. Four facets define each diamond
+ vertext. Six facets define each cube vertex.
+ </dd>
+
+ <dt><p><b>Example:</b> rbox c d G0.55 | qconvex <a href="qh-optf.htm#FQ">FQ</a> <a href="qh-optf.htm#FV">FV</a>
+ <a href="qh-opto.htm#n">n</a> | qhalf <a
+ href="qh-optf.htm#Fp">Fp</a>
+ <a href="qh-optq.htm#Qt">Qt</a></dt>
+ <dd>Same as above except triangulate before computing
+ the intersection points. Three facets define each intersection
+ point. There are two duplicates of the diamond and four duplicates of the cube.
+ </dd>
</dl>
</blockquote>
@@ -57,18 +74,26 @@ See <a href="qh-eg.htm#half">halfspace examples</a>,
<a href="#notes">qhalf notes</a>, and
option 'p' of <a href="#outputs">qhalf outputs</a>. </p>
+<p>By default, halfspace intersections may be defined by more than
+<i>d</i> halfspaces. See the previous cube and diamond example.
+This is the expected output for halfspace intersection.
+
+<p>You can try triangulated output and joggled input. It demonstrates
+that triangulated output is more accurate than joggled input.
+
<p>If you use '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output), all
halfspace intersections are simplicial (e.g., three halfspaces per
intersection in 3-d). In 3-d, if more than three halfspaces intersect
-at the same point, option '<a href="qh-optq.htm#Qt">Qt</a>' will produce
-duplicate intersections, one for each additional halfspace.</p>
+at the same point, triangulated output will produce
+duplicate intersections, one for each additional halfspace. See the previous
+cube and diamond example.</p>
<p>If you use '<a href="qh-optq.htm#QJn">QJ</a>' (joggled input), all halfspace
-intersections are simplicial. Coincident intersections will be
-joggled apart. If you do not use
-'QJ', <tt>qhalf</tt> merges coincident intersections. This is more accurate
-than joggled input. See <a
-href="qh-impre.htm#joggle">Joggled input or merged facets</a>. </p>
+intersections are simplicial. This may lead to nearly identical
+intersections. For example, replace 'Qt' with 'QJ' above and
+compare the duplicated intersections.
+See <a
+href="qh-impre.htm#joggle">Merged facets or joggled input</a>. </p>
<p>The 'qhalf' program is equivalent to
'<a href=qhull.htm#outputs>qhull H</a>' in 2-d to 4-d, and
@@ -78,7 +103,7 @@ in 5-d and higher. It disables the following Qhull
Qr QR Qv Qx Qz TR E V Fa FA FC FD FS Ft FV Gt Q0,etc</i>.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<h3><a href="#TOP">»</a><a name="synopsis">qhalf synopsis</a></h3>
@@ -290,6 +315,8 @@ intersection.</p>
Options 'p <a href="qh-optq.htm#Qi">Qi</a>' includes redundant halfspaces.</dd>
<dt><a href="qh-opto.htm#m">m</a></dt>
<dd>Mathematica output for the dual convex hull in 2-d or 3-d.</dd>
+ <dt><a href="qh-optf.htm#FM">FM</a></dt>
+ <dd>Maple output for the dual convex hull in 2-d or 3-d.</dd>
<dt><a href="qh-optg.htm#G">G</a></dt>
<dd>Geomview output for the dual convex hull in 2-d, 3-d, or 4-d.</dd>
</dl>
@@ -432,7 +459,7 @@ conventions</a> and <a href="index.htm#structure">Qhull's data structures</a>.</
<pre>
qhalf- compute the intersection of halfspaces about a point
- http://www.geom.umn.edu/software/qhull
+ http://www.qhull.org
input (stdin):
optional interior point: dimension, 1, coordinates
@@ -493,6 +520,7 @@ More formats:
FF - facet dump without ridges
FI - ID of each intersection
Fm - merge count for each intersection (511 max)
+ FM - Maple output (dual convex hull)
Fn - count plus neighboring intersections for each intersection
FN - count plus intersections for each non-redundant halfspace
FO - options and precision constants
@@ -536,7 +564,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -555,11 +583,11 @@ Print options:
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qhull.htm b/html/qhull.htm
index 5618bfa186081499d8c9e96a778de8a3df766807..affad504bc0ffb2654d0ce4008232bc01b5fa04d 100644
--- a/html/qhull.htm
+++ b/html/qhull.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b><a name="TOP">Up</a></b><b>:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b><a name="TOP">Up</a></b><b>:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -24,7 +24,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
src="qh--cone.gif" alt="[cone]" align="middle" width="100"
height="100"></a>qhull -- convex hull and related structures</h1>
@@ -56,6 +56,7 @@ It takes the same options and uses the same code.
used with any of the Qhull programs.</dd>
<dt> </dt>
<dt><b>Example:</b> rbox 1000 D3 | qhull <a href=qhull.htm#outputs>d</a>
+ <a href="qh-optq.htm#Qbb">Qbb</a>
<a href="qh-optc.htm#Rn">R1e-4</a>
<a href="qh-optq.htm#Q0">Q0</a></dt>
<dd>Compute the 3-d Delaunay triangulation of 1000 random
@@ -95,17 +96,19 @@ Delaunay triangulation is a 5-d convex hull):
</blockquote>
+<p>By default, Qhull merges coplanar facets. For example, the convex
+hull of a cube's vertices has six facets.
+
<p>If you use '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output),
-all furthest-site Delaunay regions
-will be simplicial (e.g., triangles in 2-d). Some regions may be
-degenerate and have zero area. Qhull can identify coincident
-points. With facet merging, cocircular and cospherical extreme points will lead
-to non-simplicial output (e.g., a square).
+all facets will be simplicial (e.g., triangles in 2-d). For the cube
+example, it will have 12 facets. Some facets may be
+degenerate and have zero area.
-<p>If you use '<a href="qh-optq.htm#QJn">QJ</a>' (joggle), all furthest-site
-Delaunay regions will be simplicial (e.g., triangles in 2-d). Duplicate points will
-create small regions since the points are joggled apart. See <a
-href="qh-impre.htm#joggle">Joggled input or merged facets</a>. </p>
+<p>If you use '<a href="qh-optq.htm#QJn">QJ</a>' (joggled input),
+all facets will be simplicial. The corresponding vertices will be
+slightly perturbed. Joggled input is less accurate that triangulated
+output.See <a
+href="qh-impre.htm#joggle">Merged facets or joggled input</a>. </p>
<p>The output for 4-d convex hulls may be confusing if the convex
hull contains non-simplicial facets (e.g., a hypercube). See
@@ -113,7 +116,7 @@ hull contains non-simplicial facets (e.g., a hypercube). See
are there extra points in a 4-d or higher convex hull?</a><br>
</p>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -153,7 +156,7 @@ Output options (subset):
examples:
rbox c d D2 | qhull Qc s f Fx | more rbox 1000 s | qhull Tv s FA
- rbox 10 D2 | qhull d QJ s i TO result rbox 10 D2 | qhull v Qt p
+ rbox 10 D2 | qhull d QJ s i TO result rbox 10 D2 | qhull v Qbb Qt p
rbox 10 D2 | qhull d Qu QJ m rbox 10 D2 | qhull v Qu QJ o
rbox c | qhull n rbox c | qhull FV n | qhull H Fp
rbox d D12 | qhull QR0 FA rbox c D7 | qhull FA TF1000
@@ -236,11 +239,18 @@ individually or together.</p>
<dt> </dt>
<dd><b>General</b></dd>
<dt><a name="d">qhull d</a></dt>
+ <dd>compute the convex hull of the input points.
+ See <a href=qconvex.htm>qconvex</a>.</dd>
+ <dt><a name="d">qhull d Qbb</a></dt>
<dd>compute the Delaunay triangulation by lifting the points
- to a paraboloid. See <a href=qdelaun.htm>qdelaunay</a>.</dd>
- <dt><a name="v">qhull v</a></dt>
+ to a paraboloid. Use option '<a href="qh-optq.htm#Qbb">Qbb</a>'
+ to scale the paraboloid and improve numeric precision.
+ See <a href=qdelaun.htm>qdelaunay</a>.</dd>
+ <dt><a name="v">qhull v Qbb</a></dt>
<dd>compute the Voronoi diagram by computing the Delaunay
- triangulation. See <a href=qvoronoi.htm>qvoronoi</a>.</dd>
+ triangulation. Use option '<a href="qh-optq.htm#Qbb">Qbb</a>'
+ to scale the paraboloid and improve numeric precision.
+ See <a href=qvoronoi.htm>qvoronoi</a>.</dd>
<dt><a name="H">qhull H</a></dt>
<dd>compute the halfspace intersection about a point via polar
duality. See <a href=qhalf.htm>qhalf</a>.</dd>
@@ -278,7 +288,7 @@ individually or together.</p>
<pre>
qhull- compute convex hulls and related structures.
- http://www.geom.umn.edu/software/qhull
+ http://www.qhull.org
input (stdin):
first lines: dimension and number of points (or vice-versa).
@@ -380,6 +390,7 @@ More formats:
for 'v', separating hyperplanes for bounded Voronoi regions
FI - ID of each facet
Fm - merge count for each facet (511 max)
+ FM - Maple output (2-d and 3-d)
Fn - count plus neighboring facets for each facet
FN - count plus neighboring facets for each point
Fo - outer plane (or max_outside) for each facet
@@ -430,7 +441,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -447,11 +458,11 @@ Print options:
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qhull.man b/html/qhull.man
index 8f0a0b5d0a8b4335a83b05f7b237349860e41820..a65d0823222970d54c471ed79b0f975a6f252284 100644
--- a/html/qhull.man
+++ b/html/qhull.man
@@ -12,7 +12,7 @@
./"
./" Warning: a leading quote "'" or dot "." will not format correctly
./"
-.TH qhull 1 "August 20, 2002" "Geometry Center"
+.TH qhull 1 "2003/12/30" "Geometry Center"
.SH NAME
qhull \- convex hull, Delaunay triangulation, Voronoi diagram,
halfspace intersection about a point, hull volume, facet area
@@ -56,16 +56,15 @@ example:
- html manual: index.htm
- installation: README.txt
- see also: COPYING.txt, REGISTER.txt, Changes.txt
- - WWW: <http://www.geom.umn.edu/software/qhull>
+ - WWW: <http://www.qhull.org>
- CVS: <http://savannah.gnu.org/projects/qhull/>
- mirror: <http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html>
- - backup: <http://www.thesa.com/software/qhull>
- - news: <http://www.geom.umn.edu/~bradb/qhull-news.html>
+ - news: <http://www.qhull.org/news>
- Geomview: <http://www.geomview.org>
- news group: <news:comp.graphics.algorithms>
- FAQ: <http://exaflop.org/docs/cgafaq/cga6.html>
- - email: qhull@geom.umn.edu
- - bug reports: qhull_bug@geom.umn.edu
+ - email: qhull@qhull.org
+ - bug reports: qhull_bug@qhull.org
The sections are:
- INTRODUCTION
@@ -448,6 +447,12 @@ Fm
Print number of merges for each facet. At most 511 merges are reported for
a facet. See 'PMn' for printing the facets with the most merges.
.TP
+FM
+Output the hull in Maple format. Qhull writes a Maple
+file for 2-d and 3-d
+convex hulls and for 2-d Delaunay triangulations. Qhull produces a '.mpl'
+file for displaying with display3d().
+.TP
Fn
Print neighbors for each facet. The output starts with the number of facets.
Then each facet is printed one per line. Each line
@@ -918,7 +923,7 @@ Tz
Redirect stderr to stdout.
.PP
.SH BUGS
-Please report bugs to Brad Barber at qhull_bug@geom.umn.edu.
+Please report bugs to Brad Barber at qhull_bug@qhull.org.
If Qhull does not compile, it is due to an incompatibility between your
system and ours. The first thing to check is that your compiler is
@@ -943,8 +948,8 @@ end of your message. This allows us to see the error for ourselves.
Qhull is maintained part-time.
.PP
.SH E-MAIL
-Please send correspondence to qhull@geom.umn.edu and report bugs to
-qhull_bug@geom.umn.edu. Let us know how you use Qhull. If you
+Please send correspondence to qhull@qhull.org and report bugs to
+qhull_bug@qhull.org. Let us know how you use Qhull. If you
mention it in a paper, please send the reference and an abstract.
If you would like to get Qhull announcements (e.g., a new version)
@@ -961,7 +966,7 @@ Barber, C. B., D.P. Dobkin, and H.T. Huhdanpaa,
"The Quickhull Algorithm for Convex Hulls," ACM
Trans. on Mathematical Software, Dec. 1996.
http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/
-http://www.geom.umn.edu/software/qhull/qhull-96.ps
+http://citeseer.nj.nec.com/83502.html
Clarkson, K.L., K. Mehlhorn, and R. Seidel, "Four results on randomized
incremental construction," Computational Geometry: Theory and Applications,
@@ -974,7 +979,7 @@ Geometry, Springer-Verlag, New York, 1985.
.SH AUTHORS
.nf
C. Bradford Barber Hannu Huhdanpaa
- bradb@geom.umn.edu hannu@geom.umn.edu
+ bradb@qhull.org hannu@qhull.org
c/o The Geometry Center
University of Minnesota
@@ -998,4 +1003,4 @@ The Geometry Center is supported by grant DMS-8920161 from the National
Science Foundation, by grant DOE/DE-FG02-92ER25137 from the Department
of Energy, by the University of Minnesota, and by Minnesota Technology, Inc.
-Qhull is available from http://www.geom.umn.edu/software/qhull
+Qhull is available from http://www.qhull.org
diff --git a/html/qhull.txt b/html/qhull.txt
index ed100e26f3c09dbf119be57f03b7486da9015e02..f3b2f88f7db800a691935555888372bc4bb8e059 100644
--- a/html/qhull.txt
+++ b/html/qhull.txt
@@ -45,21 +45,20 @@ SYNOPSIS
- html manual: index.htm
- installation: README.txt
- see also: COPYING.txt, REGISTER.txt, Changes.txt
- - WWW: <http://www.geom.umn.edu/software/qhull>
+ - WWW: <http://www.qhull.org>
- CVS: <http://savannah.gnu.org/projects/qhull/>
- mirror: <http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html>
- - backup: <http://www.thesa.com/software/qhull>
- - news: <http://www.geom.umn.edu/~bradb/qhull-news.html>
+ - news: <http://www.qhull.org/news>
- Geomview: <http://www.geomview.org>
- news group: <news:comp.graphics.algorithms>
- FAQ: <http://exaflop.org/docs/cgafaq/cga6.html>
- - email: qhull@geom.umn.edu
- - bug reports: qhull_bug@geom.umn.edu
+ - email: qhull@qhull.org
+ - bug reports: qhull_bug@qhull.org
-Geometry Center Aug 20, 2002 1
+Geometry Center 2003/12/30 1
@@ -125,7 +124,7 @@ DESCRIPTION
-Geometry Center Aug 20, 2002 2
+Geometry Center 2003/12/30 2
@@ -191,7 +190,7 @@ OPTIONS
-Geometry Center Aug 20, 2002 3
+Geometry Center 2003/12/30 3
@@ -257,7 +256,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 4
+Geometry Center 2003/12/30 4
@@ -325,7 +324,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 5
+Geometry Center 2003/12/30 5
@@ -391,7 +390,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 6
+Geometry Center 2003/12/30 6
@@ -457,7 +456,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 7
+Geometry Center 2003/12/30 7
@@ -523,7 +522,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 8
+Geometry Center 2003/12/30 8
@@ -544,6 +543,8 @@ qhull(1) qhull(1)
merges are reported for a facet. See 'PMn' for
printing the facets with the most merges.
+ FM Output the hull in Maple format. See 'm'
+
Fn Print neighbors for each facet. The output starts
with the number of facets. Then each facet is
printed one per line. Each line is the number of
@@ -589,9 +590,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 9
-
-
+Geometry Center 2003/12/30 9
@@ -655,7 +654,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 10
+Geometry Center 2003/12/30 10
@@ -721,7 +720,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 11
+Geometry Center 2003/12/30 11
@@ -787,7 +786,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 12
+Geometry Center 2003/12/30 12
@@ -851,7 +850,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 13
+Geometry Center 2003/12/30 13
@@ -918,7 +917,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 14
+Geometry Center 2003/12/30 14
@@ -987,7 +986,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 15
+Geometry Center 2003/12/30 15
@@ -1064,7 +1063,7 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 16
+Geometry Center 2003/12/30 16
@@ -1101,7 +1100,7 @@ qhull(1) qhull(1)
BUGS
Please report bugs to Brad Barber at
- qhull_bug@geom.umn.edu.
+ qhull_bug@qhull.org.
If Qhull does not compile, it is due to an incompatibility
between your system and ours. The first thing to check is
@@ -1130,7 +1129,7 @@ BUGS
-Geometry Center Aug 20, 2002 17
+Geometry Center 2003/12/30 17
@@ -1140,8 +1139,8 @@ qhull(1) qhull(1)
E-MAIL
- Please send correspondence to qhull@geom.umn.edu and
- report bugs to qhull_bug@geom.umn.edu. Let us know how
+ Please send correspondence to qhull@qhull.org and
+ report bugs to qhull_bug@qhull.org. Let us know how
you use Qhull. If you mention it in a paper, please send
the reference and an abstract.
@@ -1160,9 +1159,9 @@ SEE ALSO
Barber, C. B., D.P. Dobkin, and H.T. Huhdanpaa, "The
Quickhull Algorithm for Convex Hulls," ACM Trans. on Math-
ematical Software, Dec. 1996.
- http://www.acm.org/pubs/citations/jour-
- nals/toms/1996-22-4/p469-barber/
- http://www.geom.umn.edu/software/qhull/qhull-96.ps
+ http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/
+ http://citeseer.nj.nec.com/83502.html
+
Clarkson, K.L., K. Mehlhorn, and R. Seidel, "Four results
on randomized incremental construction," Computational
@@ -1176,7 +1175,7 @@ SEE ALSO
AUTHORS
C. Bradford Barber Hannu Huhdanpaa
- bradb@geom.umn.edu hannu@geom.umn.edu
+ bradb@qhull.org hannu@qhull.org
c/o The Geometry Center
University of Minnesota
@@ -1196,7 +1195,7 @@ ACKNOWLEDGEMENTS
-Geometry Center Aug 20, 2002 18
+Geometry Center 2003/12/30 18
@@ -1213,7 +1212,7 @@ qhull(1) qhull(1)
FG02-92ER25137 from the Department of Energy, by the Uni-
versity of Minnesota, and by Minnesota Technology, Inc.
- Qhull is available at http://www.geom.umn.edu/software/qhull
+ Qhull is available at http://www.qhull.org
@@ -1259,6 +1258,6 @@ qhull(1) qhull(1)
-Geometry Center Aug 20, 2002 19
+Geometry Center 2003/12/30 19
diff --git a/html/qvoron_f.htm b/html/qvoron_f.htm
index f7ce9d3a520de7985095bfcc29ae2ce557d6cba3..8aa3ea2c7544d074aeab1a2df3ee804cfd695093 100644
--- a/html/qvoron_f.htm
+++ b/html/qvoron_f.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -28,7 +28,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a>qvoronoi Qu -- furthest-site Voronoi diagram</h1>
@@ -76,14 +76,14 @@ facet of the Delaunay triangulation. Each furthest-site Voronoi
region corresponds to a vertex of the Delaunay triangulation
(i.e., an input site).</p>
-<p>See <a href="qh-faq.htm#TOC">Qhull FAQ</a> - Delaunay and
+<p>See <a href="http://www.qhull.org/html/qh-faq.htm#TOC">Qhull FAQ</a> - Delaunay and
Voronoi diagram questions.</p>
<p>Options '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output)
and '<a href="qh-optq.htm#QJn">QJ</a>' (joggled input), may produce
unexpected results. Cocircular and cospherical input sites will
produce duplicate or nearly duplicate furthest-site Voronoi vertices. See also <a
-href="qh-impre.htm#joggle">Joggled input or merged facets</a>. </p>
+href="qh-impre.htm#joggle">Merged facets or joggled input</a>. </p>
<p>The 'qvonoroi' program is equivalent to
'<a href=qhull.htm#outputs>qhull v</a> <a href=qh-optq.htm#Qbb>Qbb</a>' in 2-d to 3-d, and
@@ -93,7 +93,7 @@ in 4-d and higher. It disables the following Qhull
QB Qc Qf Qg Qi Qm Qr QR Qv Qx TR E V Fa FA FC Fp FS Ft FV Gt Q0,etc</i>.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<h3><a href="#TOP">»</a><a name="synopsis">furthest-site qvoronoi synopsis</a></h3>
@@ -276,7 +276,7 @@ controls</a></h3>
will contain two, identical furthest-site Voronoi vertices.</dd>
<dt><a href="qh-optq.htm#QJn">QJ</a></dt>
<dd>joggle the input to avoid furthest-site Voronoi vertices defined by more
- than <i>dim+1</i> points.
+ than <i>dim+1</i> points. It is less accurate than triangulated output ('Qt').
</dd>
<dt><a href="qh-optq.htm#QVn">QVn</a></dt>
<dd>select furthest-site Voronoi vertices for input site <em>n</em> </dd>
@@ -378,7 +378,7 @@ for furthest-site Voronoi diagrams.
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -397,11 +397,11 @@ for furthest-site Voronoi diagrams.
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qvoronoi.htm b/html/qvoronoi.htm
index 72e898688560a562199ac3716e61396b96322cc9..5f50e878b7549b6e4a3ba542cc2d2e84c51c3282 100644
--- a/html/qvoronoi.htm
+++ b/html/qvoronoi.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -28,7 +28,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/delaunay.html"><img
src="qh--dt.gif" alt="[delaunay]" align="middle" width="100"
height="100"></a>qvoronoi -- Voronoi diagram</h1>
@@ -91,7 +91,7 @@ triangulation. Each Voronoi region corresponds to a vertex (i.e., input site) of
Delaunay triangulation. </p>
<p>Qhull outputs the Voronoi vertices for each Voronoi region. With
-option '<a href="qh-optf.htm#Fv2">Fv</a>'),
+option '<a href="qh-optf.htm#Fv2">Fv</a>',
it lists all ridges of the Voronoi diagram with the corresponding
pairs of input sites. With
options '<a href="qh-optf.htm#Fi2">Fi</a>' and '<a href="qh-optf.htm#Fo2">Fo</a>',
@@ -99,14 +99,14 @@ it lists the bounded and unbounded separating hyperplanes.
You can also output a single Voronoi region
for further processing [see <a href="#graphics">graphics</a>].</p>
-<p>See <a href="qh-faq.htm#TOC">Qhull FAQ</a> - Delaunay and
+<p>See <a href="http://www.qhull.org/html/qh-faq.htm#TOC">Qhull FAQ</a> - Delaunay and
Voronoi diagram questions.</p>
<p>Options '<a href="qh-optq.htm#Qt">Qt</a>' (triangulated output)
and '<a href="qh-optq.htm#QJn">QJ</a>' (joggled input) may produce
unexpected results. Cocircular and cospherical input sites will
produce duplicate or nearly duplicate Voronoi vertices. See also <a
-href="qh-impre.htm#joggle">Joggled input or merged facets</a>. </p>
+href="qh-impre.htm#joggle">Merged facets or joggled input</a>. </p>
<p>The 'qvonoroi' program is equivalent to
'<a href=qhull.htm#outputs>qhull v</a> <a href=qh-optq.htm#Qbb>Qbb</a>' in 2-d to 3-d, and
@@ -115,7 +115,7 @@ in 4-d and higher. It disables the following Qhull
<a href=qh-quick.htm#options>options</a>: <i>d n v Qbb QbB Qf Qg Qm
Qr QR Qv Qx Qz TR E V Fa FA FC FD FS Ft FV Gt Q0,etc</i>.
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<h3><a href="#TOP">»</a><a name="synopsis">qvoronoi synopsis</a></h3>
@@ -346,7 +346,7 @@ controls</a></h3>
will contain two copies of the Voronoi vertex.</dd>
<dt><a href="qh-optq.htm#QJn">QJ</a></dt>
<dd>joggle the input to avoid Voronoi vertices defined by more
- than <i>dim+1</i> points.
+ than <i>dim+1</i> points. It is less accurate than triangulated output ('Qt').
</dd>
<dt><a href="qh-optq.htm#Qu">Qu</a></dt>
<dd>compute the <a href="qvoron_f.htm">furthest-site Voronoi diagram</a>.</dd>
@@ -544,7 +544,7 @@ href="qdelaun.htm#conventions">Delaunay conventions</a>, and
<pre>
qvoronoi- compute the Voronoi diagram
- http://www.geom.umn.edu/software/qhull
+ http://www.qhull.org
input (stdin):
first lines: dimension and number of points (or vice-versa).
@@ -643,7 +643,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -662,11 +662,11 @@ Print options:
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/rbox.htm b/html/rbox.htm
index 7bf60f9ed9be8e0a9d649d7dfe12ddc3f6b922cf..4b133b6543c75715cf7699c2e1a8c0089ff41094 100644
--- a/html/rbox.htm
+++ b/html/rbox.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b><a name="TOP">Up:</a></b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b><a name="TOP">Up:</a></b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -24,7 +24,7 @@
<hr>
<!-- Main text of document -->
<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
+href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
src="qh--cone.gif" alt="[CONE]" align="middle" width="100"
height="100"></a>rbox -- generate point distributions</h1>
@@ -244,7 +244,7 @@ Some combinations of arguments generate odd results.
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -261,11 +261,11 @@ Some combinations of arguments generate odd results.
<!-- GC common information -->
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="qh--geom.gif"
+<p><a href="http://www.geom.uiuc.edu/"><img src="qh--geom.gif"
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
<br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: August 12, 1998 <!-- hhmts end --> </p>
</body>
diff --git a/html/rbox.man b/html/rbox.man
index 7e28d25607c49d7671a0eeeda42e10cdea2a9c16..13ad4a38cfbacceb44926b595a389516c66b3900 100644
--- a/html/rbox.man
+++ b/html/rbox.man
@@ -162,7 +162,7 @@ generate a regular cone
.SH BUGS
Some combinations of arguments generate odd results.
-Report bugs to qhull_bug@geom.umn.edu, other correspondence to qhull@geom.umn.edu
+Report bugs to qhull_bug@qhull.org, other correspondence to qhull@qhull.org
.SH SEE ALSO
qhull(1)
.SH AUTHOR
diff --git a/html/rbox.txt b/html/rbox.txt
index c205a514fa64c2e94d6488600774f6aaf8bab9ff..bc459525fe97fb3ea9ac062e1eba7f7279f0e733 100644
--- a/html/rbox.txt
+++ b/html/rbox.txt
@@ -174,8 +174,8 @@ rbox(1) rbox(1)
BUGS
Some combinations of arguments generate odd results.
- Report bugs to qhull_bug@geom.umn.edu, other correspon-
- dence to qhull@geom.umn.edu
+ Report bugs to qhull_bug@qhull.org, other correspon-
+ dence to qhull@qhull.org
SEE ALSO
qhull(1)
diff --git a/html/qh-home.htm b/index.htm
similarity index 55%
rename from html/qh-home.htm
rename to index.htm
index 51162b7bdc2dc56280fcad56f79cda59cad2a405..9cb22f91bb3905c473b2e997f61f28cc9e69c341 100644
--- a/html/qh-home.htm
+++ b/index.htm
@@ -2,24 +2,34 @@
<html>
<head>
-<title>Home page for Qhull</title>
+<title>Qhull for Convex Hull, Delaunay Triangulation, Voronoi Diagram, and Halfspace Intersection about a Point</title>
</head>
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/past-projects.html"><i>Past Software
-Projects of the Geometry Center</i></a> <br>
-<b>URL:</b> <a href="http://www.geom.umn.edu/software/qhull">http://www.geom.umn.edu/software/qhull</a>
+<b>URL:</b> <a href="http://www.qhull.org">http://www.qhull.org</a>
+<br><b>To:</b>
+<a href="http://www.qhull.org/news">News</a>
+• <a href="http://www.qhull.org/download">Download</a>
+• <a href="http://citeseer.nj.nec.com/83502.html">CiteSeer</a>
+• <a href=http://images.google.com/images?q=qhull&num=100>Images</a>
+• <a href="html/index.htm#TOC">Manual</a>
+• <a href="http://www.qhull.org/html/qh-faq.htm">FAQ</a>
+• <a href="html/qh-quick.htm#programs">Programs</a>
+• <a href="html/qh-quick.htm#options">Options</a>
</p>
<hr>
<!-- Main text of document -->
-<h1><a
-href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
-src="/software/qhull/html/qh--cone.gif" alt="[CONE]" align="middle" width="100"
-height="100"></a> Home page for Qhull</h1>
-
-<p>Qhull computes convex hulls, Delaunay triangulations,
+<table>
+<tr><td valign=top>
+ <h1>Qhull</h1>
+ <a
+ href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
+ src="html/qh--cone.gif" alt="[CONE]" align="middle" width="100"
+ height="100"></a>
+</td><td>
+Qhull computes convex hulls, Delaunay triangulations,
halfspace intersections about a point, Voronoi diagrams, furthest-site Delaunay
triangulations, and furthest-site Voronoi diagrams. It runs in
2-d, 3-d, 4-d, and higher dimensions. It implements the Quickhull
@@ -27,56 +37,52 @@ algorithm for computing the convex hull. Qhull handles roundoff
errors from floating point arithmetic. It computes volumes,
surface areas, and approximations to the convex hull.</p>
-<!-- duplicated in qh-home.htm and html/index.htm -->
+<!-- duplicated in index.htm and html/index.htm -->
<p>Qhull does <i>not</i> support constrained Delaunay
triangulations, triangulation of non-convex surfaces, mesh
generation of non-convex objects, or medium-sized inputs in 9-D
and higher. </p>
+</td></tr></table>
<hr>
-
<ul>
- <li><a href="http://www.geom.umn.edu/~bradb/qhull-news.html">News</a> about Qhull </li>
- <li><a href="http://www.geom.umn.edu/~bradb/qhull-news.html#use">How</a> is Qhull used?</li>
- <li><a href="http://www.geom.umn.edu/software/download/qhull.html">Download</a>
+ <li><a href="http://www.qhull.org/news">News</a> about Qhull </li>
+ <li><a href="http://www.qhull.org/download">Download</a>
Qhull</li>
<li><a
- href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">Examples
+ href="http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">Examples
</a>of Qhull output </li>
<li><a href=http://savannah.gnu.org/projects/qhull/>Qhull development</a> at Savannah
- <li><a href="/software/qhull/html/index.htm">Manual</a> for Qhull and rbox
- <ul>
- <li><a href="/software/qhull/html/qconvex.htm">qconvex</a> -- convex hull
- <li><a href="/software/qhull/html/qdelaun.htm">qdelaunay</a> -- Delaunay triangulation
- <li><a href="/software/qhull/html/qvoronoi.htm">qvoronoi</a> -- Voronoi diagram
- <li><a href="/software/qhull/html/qhalf.htm">qhalf</a> -- halfspace intersection about a point
- <li><a href="/software/qhull/html/rbox.htm">rbox</a> -- generate point distributions
- <li><a href=/software/qhull/src/index.htm>Qhull functions</a>, macros, and data structures with source
- </ul>
- <li><a href="/software/qhull/html/qh-faq.htm">Frequently</a> asked
- questions about Qhull</li>
- <li><a href=http://www.geomview.org>Geomview</a> -- 3-D and 4-D visualization of Qhull output
- <li>MATLAB's qhull functions: <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/convhulln.shtml>convhulln</a>
+ <p>
+ <li><a href="http://www.qhull.org/news/qhull-news.html#use">How</a> is Qhull used?</li>
+ <li><a href="http://citeseer.nj.nec.com/context/86585/83502">CiteSeer</a> references to Qhull
+</p>
+ <li><a href=http://www.google.com/search?as_q=qhull&num=100>Google</a> Qhull,
+ Qhull <a href=http://images.google.com/images?q=qhull&num=100>Images</a>,
+ Qhull in <a href=http://groups.google.com/groups?as_q=qhull&num=100&as_scoring=d>Newsgroups</a>,
+ and <a href=http://www.googlism.com/who_is/q/qhull/>Who is</a> Qhull?
+
+ <p>
+ <li><a href=http://www.mathworks.com/>MATLAB</a> uses Qhull for their computational geometry functions: <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/convhulln.shtml>convhulln</a>
<a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/delaunayn.shtml>delaunayn</a>
<a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/griddata3.shtml>griddata3</a>
<a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/griddatan.shtml>griddatan</a>
<a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/tsearch.shtml>tsearch</a>
<a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/tsearchn.shtml>tsearchn</a>
- <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/voronoin.shtml>voronoin</a>. MATLAB has not upgraded
- to version 3.1 and triangulated output ('Qt').
+ <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/voronoin.shtml>voronoin</a>. MATLAB R14 will upgrade to
+ Qhull 2003.1 and triangulated output ('Qt').
</li>
<li><a href=http://www.octave.org/>GNU Octave</a> uses Qhull for their
- <a href=http://octave.sourceforge.net/index/analysis.html#Geometry>computational geometry functions</a>. Octave has not upgraded
- to version 3.1 and triangulated output ('Qt').
- <li>Mathematica's Delaunay interface: <a href=http://www.mathsource.com/Content/Enhancements/Geometry/0211-251>qh-math</a>
- <li>Send e-mail to <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a> </li>
- <li>Report bugs to <a
- href="mailto:qhull_bug@geom.umn.edu">qhull_bug@geom.umn.edu</a>
+ <a href=http://octave.sourceforge.net/index/analysis.html#Geometry>computational geometry functions</a>. Octave has partially upgraded
+ to Qhull 2002.1 and triangulated output ('Qt').
+ <li><a href=http://www.wolfram.com/products/mathematica/>Mathematica</a>'s Delaunay interface: <a href=http://www.mathsource.com/Content/Enhancements/Geometry/0211-251>qh-math</a>
+ <li><a href=http://www.geomview.org>Geomview</a> for 3-D and 4-D visualization of Qhull output
</ul>
+<p><b>Introduction</b>
<ul>
<li><a
- href="http://www.ifor.math.ethz.ch/ifor/staff/fukuda/polyfaq/polyfaq.html">Fukuda's
+ href="http://www.ifor.math.ethz.ch/staff/fukuda/polyfaq/polyfaq.html">Fukuda's
introduction</a> to convex hulls, Delaunay
triangulations, Voronoi diagrams, and linear programming</li>
<li><a
@@ -87,7 +93,29 @@ and higher. </p>
Brook</a> Algorithm Repository, computational geometry</li>
</ul>
+<p><b>Qhull Documentation and Support</b>
<ul>
+ <li><a href="html/index.htm">Manual</a> for Qhull and rbox
+ <ul>
+ <li><a href="html/qconvex.htm">qconvex</a> -- convex hull
+ <li><a href="html/qdelaun.htm">qdelaunay</a> -- Delaunay triangulation
+ <li><a href="html/qvoronoi.htm">qvoronoi</a> -- Voronoi diagram
+ <li><a href="html/qhalf.htm">qhalf</a> -- halfspace intersection about a point
+ <li><a href="html/rbox.htm">rbox</a> -- generate point distributions
+ <li><a href=src/index.htm>Qhull functions</a>, macros, and data structures with source
+ </ul>
+ <li><a href="http://www.qhull.org/html/qh-faq.htm">Frequently</a> asked
+ questions about Qhull</li>
+ <li>Send e-mail to <a href=mailto:qhull@qhull.org>qhull@qhull.org</a> </li>
+ <li>Report bugs to <a
+ href="mailto:qhull_bug@qhull.org">qhull_bug@qhull.org</a>
+</ul>
+
+<p><b>Related URLs</b>
+<ul>
+ <li><a href="http://www.geom.uiuc.edu/software/cglist">Amenta's directory</a> of
+ computational geometry software </li>
+
<li><a href=http://www.boost.org/libs/graph/doc/table_of_contents.html>BGL</a>
Boost Graph Library provides C++ classes for graph data structures
and algorithms,
@@ -95,43 +123,42 @@ and algorithms,
href="http://netlib.bell-labs.com/netlib/voronoi/hull.html">Clarkson's
hull </a>program with exact arithmetic for convex hulls, Delaunay triangulations,
Voronoi volumes, and alpha shapes. </li>
- <li><a
- href="http://www.ifor.math.ethz.ch/ifor/staff/fukuda/cdd_home/cdd.html">Fukuda's
- cdd</a> program for halfspace intersection and convex hulls</li>
- <li><a href=http://www.algorithmic-solutions.com/as_html/research/research.html>Leda</a>
-and CGAL libraries for writing computational
-geometry programs and other combinatorial algorithms
- <li><a href="http://www.cs.cmu.edu/~quake/triangle.html">Shewchuk's
- triangle </a>program for 2-d Delaunay</li>
-</ul>
-
-<ul>
- <li><a href="http://www.geom.umn.edu/software/cglist">Amenta's directory</a> of
- computational geometry software </li>
<li><a href="http://compgeom.cs.uiuc.edu/~jeffe/compgeom/compgeom.html">Erickson's
Computational</a> Geometry Pages and
<a href="http://compgeom.cs.uiuc.edu/~jeffe/compgeom/code.html">Software</a>
+ <li><a
+ href="http://www.cs.mcgill.ca/~fukuda/soft/cdd_home/cdd.html">Fukuda's
+ cdd</a> program for halfspace intersection and convex hulls</li>
+ <li><a href="http://www.inf.ethz.ch/personal/gaertner/miniball.html">Gartner's
+ Miniball</a> for fast and robust smallest enclosing balls (up to 20-d)
+
+ <li><a href=http://directory.google.com/Top/Science/Math/Geometry/Computational_Geometry/Software/>Google's directory</a> for
+ Science > Math > Geometry > Computational Geometry > Software
+ <li><a href=http://www.algorithmic-solutions.com/enleda.htm>Leda</a>
+and <a href=http://www.cgal.org/>CGAL</a> libraries for writing computational
+geometry programs and other combinatorial algorithms
<li><a href=http://www.magic-software.com>Magic Software</a> source code for computer
graphics, image analysis, and numerical methods
- <li>MathWork's <a href=http://www.mathtools.net/>Mathtools.net</a> -- scientific and engineering
+ <li><a href=http://www.mathtools.net/>Mathtools.net</a> of scientific and engineering
software
<li><a href="http://www.andrew.cmu.edu/user/sowen/mesh.html">Owen's Meshing</a> Research Corner
<li><a
href="http://www-users.informatik.rwth-aachen.de/~roberts/meshgeneration.html">Schneiders'
Finite Element</a> Mesh Generation page</li>
+ <li><a href="http://www.cs.cmu.edu/~quake/triangle.html">Shewchuk's
+ triangle </a>program for 2-d Delaunay</li>
<li><a href=ftp://ftp.zib.de/pub/Packages/mathprog/index.html>Skorobohatyj's Mathprog@ZIB</a> for
mathematical software
<li><a href=http://www.voronoi.com>Voronoi Web Site</a> for all things Voronoi
</ul>
+<p><b>FAQs and Newsgroups</b>
<ul>
<li><a
href="http://exaflop.org/docs/cgafaq/">FAQ</a>
for computer graphics algorithms
(<a href="http://exaflop.org/docs/cgafaq/cga6.html">geometric</a> structures)
</li>
- <li><a href=http://www.google.com/search?as_q=qhull&num=100&btnG=Google+Search&as_epq=&as_oq=&as_eq=&lr=&as_ft=i&as_filetype=&as_qdr=m3&as_occt=any&as_dt=i&as_sitesearch=>Recent references</a> to Qhull in Google.
- <li><a href=http://groups.google.com/groups?as_q=qhull&num=100&as_scoring=d&btnG=Google+Search&as_epq=&as_oq=&as_eq=%22alt.%22&as_ugroup=&as_usubject=&as_uauthors=&as_umsgid=&lr=&as_qdr=&as_mind=12&as_minm=5&as_miny=1981&as_maxd=8&as_maxm=1&as_maxy=2002>Qhull references</a> in Google Groups (i.e., newsgroups)
<li><a
href="http://www-unix.mcs.anl.gov/otc/Guide/faq/linear-programming-faq.html">FAQ
</a>for linear programming </li>
@@ -144,7 +171,7 @@ geometry programs and other combinatorial algorithms
<li><a href="news:sci.op-research">Newsgroup</a>:
sci.op-research </li>
</ul>
-
+</blockquote>
<hr>
<p>The program includes options for input transformations,
@@ -156,8 +183,8 @@ application. </p>
href="http://www.geomview.org">Geomview</a>. An alternative
is <a href=http://www.kitware.com/vtk.html>VTK</a>.</p>
-<p>For an article about Qhull, download <a
-href="/software/qhull/qhull-96.ps">qhull-96.ps.Z</a>:
+<p>For an article about Qhull, download from <a
+href="http://citeseer.nj.nec.com/83502.html">CiteSeer</a>:
</p>
<blockquote>
@@ -193,19 +220,27 @@ href="/software/qhull/qhull-96.ps">qhull-96.ps.Z</a>:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/past-projects.html"><i>Past Software
+<p><b>Up:</b> <a href="http://www.geom.uiuc.edu/software/past-projects.html"><i>Past Software
Projects of the Geometry Center</i></a> <br>
-<b>URL:</b> <a href="http://www.geom.umn.edu/software/qhull">http://www.geom.umn.edu/software/qhull</a>
+<b>URL:</b> <a href="http://www.qhull.org">http://www.qhull.org</a>
+<br><b>To:</b>
+<a href="http://www.qhull.org/news">News</a>
+• <a href="http://www.qhull.org/download">Download</a>
+• <a href="http://citeseer.nj.nec.com/83502.html">CiteSeer</a>
+• <a href=http://images.google.com/images?q=qhull&num=100>Images</a>
+• <a href="html/index.htm#TOC">Manual</a>
+• <a href="http://www.qhull.org/html/qh-faq.htm">FAQ</a>
+• <a href="html/qh-quick.htm#programs">Programs</a>
+• <a href="html/qh-quick.htm#options">Options</a>
<!-- GC common information --></p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img src="/pix/home.gif" alt="[HOME]"
+<p><a href="http://www.geom.uiuc.edu/"><img src="html/qh--geom.gif" alt="[HOME]"
align="middle"></a> <i>The Geometry Center Home Page</i> </p>
-<p>Comments to: <a href="mailto:qhull@geom.umn.edu">qhull@geom.umn.edu</a>
+<p>Comments to: <a href="mailto:qhull@qhull.org">qhull@qhull.org</a>
<br>
Created: May 17 1995 --- <!-- hhmts start -->
-Last modified: August 21, 2002<!-- hhmts end --> </p>
</body>
</html>
diff --git a/src/Changes.txt b/src/Changes.txt
index 5ab22a877c8280ffa838479ea7d598b481a38410..626008a6068791b2cd340deb97977bcaf2741094 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -1,12 +1,65 @@
.............This file lists all changes to qhull and rbox.....................
+qhull 2003.1 2003/12/30
+
+New Features:
+ - Add Maple output ('FM') for 2-d and 3-d convex hulls [T. Abraham]
+
+Bug Fixes and Code Changes:
+ - Fixed qh_findbest() for upperdelaunay facets w/o better, lower neighbors
+ - For library users and some qhull users [A. Cutti, E. Milloti, K. Sun]
+ - Preserved qhmem.ferr in qh_memfreeshort() for library users
+ - Removed 'static' from qh_compare... for io.h and merge.h [V. Brumberg]
+
+Documentation:
+ - Add warning to findDelaunay() and qh_in.htm about tricoplanar facets
+ - Noted Edelsbrunner's Geometry & Topology for Mesh Generation [qh-impre.htm]
+ - Noted Gartner's Miniball algorithm [qh_impre.htm]
+ - Noted Veron and Leon's shape preserving simplification [qh_impre.htm]
+
+qhull 2003.1 2003/12/19
+
+Bug Fixes:
+ - Reversed coordinate order for qh.ATinfinity in qh_projectinput [V. Brumberg]
+ - This effects:
+ - Qhull library 'd' or 'v' users with 'Qz' and unequal coordinate ranges.
+ - qdelaunay/qvoronoi users with 'Qbk:0Bk:0', 'Qz', and unequal coordinate ranges
+
+Changes to code:
+ - Replaced qh_VERSION with qh_version in global.c [B. Pearlmutter]
+ The previous techniques were either clumsy or caused compiler errors
+ - Removed unused variables from qh_findbest and qh_findbestnew [B. Pearlmutter]
+ - Note that qh.TESTpoints was added in 2002.1 for tsearch implementation
+
+Changes to distribution:
+ - Added Unix distribution including Debian files [R. Laboissiere]
+ The previous Unix distribution is now the source distribution
+ - Added rpm distribution [L. Mazet]
+ - Investigated generation of Win32 dll. Need to define a C++ interface.
+
+Changes to documentation:
+ - Moved Qhull to www.qhull.org (geom.umn.edu is not available)
+ - The Geometry Center is archived at http://www.geom.uiuc.edu
+ - Reviewed introduction to each program
+ Triangulated output ('Qt') is more accurate than joggled input ('QJ')
+ qdelaunay is 'qhull d Qbb' [C. Ulbrich]
+ qvoronoi is 'qhull v Qbb'
+ Added example of non-simplicial intersection to halfspace intersections
+ - Added warning about using the Qhull library.
+ - Added qhull timings to When to use Qhull [C. Ulbrich]
+ - Reorganized the home page index and the manual index
+ - Moved qh-home.htm to index.htm
+
+Changes to examples
+ - Fixed options for eg/eg.t23.voronoi.imprecise [B. Pearlmutter]
+
qhull 2002.1 2002/8/20
Changes to distribution:
- Set up savannah.gnu.org/projects/qhull/ [R. Laboissiere]
- - Set up www.thesa.com/software/qhull as a backup
+ - Set up www.thesa.com as a backup
- Added qh-get.htm, a local copy of the download page
- Added Visual C++ interface to Qhull, qhull_interface.cpp [K. Erleben]
- Use HTTP instead of FTP for downloading Qhull
@@ -18,6 +71,7 @@ Bug fixes:
Changes to code:
- Replace qh_version with qh_VERSION in qhull.h.
Allows shared libraries and single point of definition
+ - Added qh.TESTpoints for future implementation of tsearch
Changes to build
- Makefile.txt works under cygwin
@@ -736,7 +790,7 @@ qhull V2.1 6/7/95
qhull V2.1 6/3/95
- home page for Qhull and new descriptions for the Qhull examples
- http://www.geom.umn.edu/software/qhull
+ http://www.qhull.org
- changed SIOUX buffering for Power Macintosh. It runs fast now.
added a project file for Metrowerk's C
- note in README about compiling qhull on the PC
@@ -793,7 +847,7 @@ qhull V2.1 beta 5/15/95
- added a section on performance
- added an example on halfspace intersection
- installed examples of Qhull in
- <http://www.geom.umn.edu/pix/archive/subjects/computational_geometry.html>
+ <http://www.geom.uiuc.edu/graphics/pix/Special_Topics/Computational_Geometry/>
======= Makefile, user.h, and messages =======
- Makefile calls ./qhull, ./rbox, and prints short prompt for qhull
diff --git a/src/Make-config.sh b/src/Make-config.sh
index 90bbb9585992f15875ad76939ce6a6218a2515cf..cc247865257de3b26f6c1665b9f85d243812c62a 100644
--- a/src/Make-config.sh
+++ b/src/Make-config.sh
@@ -52,6 +52,7 @@ docdir = $(prefix)/share/doc/$(PACKAGE)
# which:
doc_DATA = \
+ index.htm \
Announce.txt \
COPYING.txt \
README.txt \
@@ -138,7 +139,6 @@ html_DATA = \
qh-eg.htm \
qh-faq.htm \
qh-get.htm \
- qh-home.htm \
qh-impre.htm \
qh-in.htm \
qh-optc.htm \
diff --git a/src/Makefile b/src/Makefile
index e87b66b49bc29139ac2d6d912df464c945f065a1..5d5f8d8d98e4af8742854a867d590dace1dcd444 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
# Unix Makefile for qhull and rbox
#
# see README.txt
+# the Unix distribution contains a configure Makefile
#
# make to produce qhull qconvex qdelaunay qhalf qvoronoi rbox
# make qvoronoi to produce qvoronoi (etc.)
diff --git a/src/Makefile.txt b/src/Makefile.txt
deleted file mode 100644
index e87b66b49bc29139ac2d6d912df464c945f065a1..0000000000000000000000000000000000000000
--- a/src/Makefile.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-# Unix Makefile for qhull and rbox
-#
-# see README.txt
-#
-# make to produce qhull qconvex qdelaunay qhalf qvoronoi rbox
-# make qvoronoi to produce qvoronoi (etc.)
-# make qhullx to produce qhull qconvex etc. w/o using libqhull.a
-# make doc to print documentation
-# make install to copy qhull, rbox, qhull.1, rbox.1 to BINDIR, MANDIR
-# make new to rebuild qhull and rbox from source
-#
-# make printall to print all files
-# make user_eg to produce user_eg
-# make user_eg2 to produce user_eg2
-# make clean to remove object files and core
-# make cleanall to remove all generated files
-#
-# PRINTMAN -- command for printing manual pages
-# PRINTC -- command for printing C files
-# BINDIR -- directory where to copy executables
-# MANDIR -- directory where to copy manual pages
-# CC -- ANSI C or C++ compiler
-# CCOPTS1 - options used to compile .c files
-# CCOPTS2 -- options used to link .o files
-#
-# CFILES -- .c files for printing
-# HFILES -- .h files for printing
-# DFILES -- documentation files
-# MFILES -- man pages and html files
-# TFILES -- .txt versions of html html files
-# FILES -- all other files
-# OBJS -- specifies the object files of libqhull.a
-#
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man/man1
-
-# if you do not have enscript, try a2ps or just use lpr. The files are text.
-PRINTMAN = enscript -2rl
-PRINTC = enscript -2r
-# PRINTMAN = lpr
-# PRINTC = lpr
-
-#for Gnu's gcc compiler -O2 for optimization, -g for debugging, -Wall for check
-#
-CC = gcc
-CCOPTS1 = -O2 -ansi
-
-# for Sun's cc compiler, -fast or O2 for optimization, -g for debugging, -Xc for ANSI
-#CC = cc
-#CCOPTS1 = -Xc -v -fast
-
-# for Silicon Graphics cc compiler, -O2 for optimization, -g for debugging
-#CC = cc
-#CCOPTS1 = -ansi -O2
-
-# for Next cc compiler with fat executable
-#CC = cc
-#CCOPTS1 = -ansi -O2 -arch m68k -arch i386 -arch hppa
-
-# for loader, ld
-CCOPTS2 = $(CCOPTS1)
-
-# OBJS in execution frequency order. CFILES after qhull.c are alphabetical
-OBJS = user.o global.o stat.o io.o geom2.o poly2.o \
- merge.o qhull.o geom.o poly.o qset.o mem.o
-
-CFILES= unix.c qhull.c geom.c geom2.c global.c io.c mem.c merge.c poly.c \
- poly2.c qset.c stat.c user.c qconvex.c qdelaun.c qhalf.c qvoronoi.c
-HFILES= user.h qhull.h qhull_a.h geom.h io.h mem.h merge.h poly.h qset.h stat.h
-TXTFILES= ../Announce.txt ../REGISTER.txt ../COPYING.txt ../README.txt Changes.txt
-DOCFILES= ../html/rbox.txt ../html/qhull.txt
-FILES= Makefile rbox.c user_eg.c ../eg/q_test ../eg/q_egtest ../eg/q_eg
-HTMFILES= qhull.man rbox.man qh-in.htm qh-optg.htm qh-optt.htm qh-optp.htm \
- index.htm qh-quick.htm qh-impre.htm qh-eg.htm \
- qh-optc.htm qh-opto.htm qh-optf.htm qh-optq.htm \
- qh-c.htm qh-faq.htm qhull.htm qconvex.htm qdelaun.htm \
- qh-geom.htm qh-globa.htm qh-io.htm qh-mem.htm qh-merge.htm \
- qh-poly.htm qh-qhull.htm qh-set.htm qh-stat.htm qh-user.htm \
- qdelau_f.htm qhalf.htm qvoronoi.htm qvoron_f.htm rbox.htm
-
-all: rbox qconvex qdelaunay qhalf qvoronoi qhull
-
-unix.o: qhull.h user.h mem.h
-qconvex.o: qhull.h user.h mem.h
-qdelaun.o: qhull.h user.h mem.h
-qhalf.o: qhull.h user.h mem.h
-qvoronoi.o: qhull.h user.h mem.h
-qhull.o: $(HFILES)
-geom.o: $(HFILES)
-geom2.o: $(HFILES)
-global.o: $(HFILES)
-io.o: $(HFILES)
-mem.o: mem.h
-merge.o: $(HFILES)
-poly.o: $(HFILES)
-poly2.o: $(HFILES)
-qset.o: qset.h mem.h
-stat.o: $(HFILES)
-user.o: $(HFILES)
-
-.c.o:
- $(CC) -c $(CCOPTS1) $<
-
-clean:
- rm -f *.o ../core qconvex qdelaunay qhalf qvoronoi qhull libqhull.a \
- *.exe
-
-cleanall: clean
- rm -f *~ ../rbox ../qhull ../qhalf ../qconvex ../qdelaunay ../qhalf\
- ../qvoronoi ../user_eg ../user_eg2 ../*.exe >/dev/null
-
-doc:
- $(PRINTMAN) $(TXTFILES) $(DOCFILES)
-
-install: all
- cp ../qconvex $(BINDIR)/qconvex
- cp ../qdelaunay $(BINDIR)/qdelaunay
- cp ../qhalf $(BINDIR)/qhalf
- cp ../qhull $(BINDIR)/qhull
- cp ../qvoronoi $(BINDIR)/qvoronoi
- cp ../rbox $(BINDIR)/rbox
- cp ../html/qhull.man $(MANDIR)/qhull.1
- cp ../html/rbox.man $(MANDIR)/rbox.1
-
-new: cleanall all
-
-printall: doc printh printc printf
-
-printh:
- $(PRINTC) $(HFILES)
-
-printc:
- $(PRINTC) $(CFILES)
-
-printf:
- $(PRINTC) $(FILES)
-
-libqhull.a: $(OBJS)
- @echo if 'ar' or 'ranlib' fails, try 'make qhullx'
- ar r libqhull.a $(OBJS)
- @echo the next line may need to be removed.
- -test -x /bin/ranlib -o -x /usr/bin/ranlib && ranlib libqhull.a
-
-# don't use ../qconvex. Does not work on Red Hat Linux
-qconvex: qconvex.o libqhull.a
- $(CC) -o qconvex $(CCOPTS2) qconvex.o -L. -lqhull -lm
- cp qconvex ..
-
-qdelaunay: qdelaun.o libqhull.a
- $(CC) -o qdelaunay $(CCOPTS2) qdelaun.o -L. -lqhull -lm
- cp qdelaunay ..
-
-qhalf: qhalf.o libqhull.a
- $(CC) -o qhalf $(CCOPTS2) qhalf.o -L. -lqhull -lm
- cp qhalf ..
-
-qvoronoi: qvoronoi.o libqhull.a
- $(CC) -o qvoronoi $(CCOPTS2) qvoronoi.o -L. -lqhull -lm
- cp qvoronoi ..
-
-qhull: unix.o libqhull.a
- $(CC) -o qhull $(CCOPTS2) unix.o -L. -lqhull -lm
- cp qhull ..
- -chmod +x ../eg/q_test ../eg/q_eg ../eg/q_egtest
- -cd ..; ./rbox D4 | ./qhull
-
-# compile qhull without using libqhull.a
-qhullx: qconvex.o qdelaun.o qhalf.o qvoronoi.o unix.o $(OBJS)
- $(CC) -o qconvex $(CCOPTS2) qconvex.o $(OBJS) -lm
- $(CC) -o qdelaunay $(CCOPTS2) qdelaun.o $(OBJS) -lm
- $(CC) -o qhalf $(CCOPTS2) qhalf.o $(OBJS) -lm
- $(CC) -o qvoronoi $(CCOPTS2) qvoronoi.o $(OBJS) -lm
- $(CC) -o qhull $(CCOPTS2) unix.o $(OBJS) -lm
- cp qconvex qdelaunay qhalf qvoronoi qhull ..
- -chmod +x ../eg/q_test ../eg/q_eg ../eg/q_egtest
- -cd ..; ./rbox D4 | ./qhull
-
-rbox: rbox.o
- $(CC) -o rbox rbox.o $(CCOPTS2) -lm
- cp rbox ..
-
-user_eg: user_eg.o libqhull.a
- $(CC) -o user_eg $(CCOPTS2) user_eg.o -L. -lqhull -lm
- cp user_eg ..
-
-user_eg2: user_eg2.o libqhull.a
- $(CC) -o user_eg2 $(CCOPTS2) user_eg2.o -L. -lqhull -lm
- cp user_eg2 ..
-
-# end of Makefile
diff --git a/src/geom.c b/src/geom.c
index b3cf198d51028a60c41239ceb6f0b73778275628..af633eeafc2710e7b354e7c76b36b5d131d8126f 100644
--- a/src/geom.c
+++ b/src/geom.c
@@ -6,7 +6,7 @@
see qh-geom.htm and geom.h
- copyright (c) 1993-2002 The Geometry Center
+ copyright (c) 1993-2003 The Geometry Center
infrequent code goes into geom2.c
*/
@@ -138,8 +138,8 @@ facetT *qh_findbest (pointT *point, facetT *startfacet,
boolT bestoutside, boolT isnewfacets, boolT noupper,
realT *dist, boolT *isoutside, int *numpart) {
realT bestdist= -REALmax/2 /* avoid underflow */;
- facetT *facet, *neighbor, **neighborp, *bestfacet= NULL;
- facetT *bestfacet_all= startfacet;
+ facetT *facet, *neighbor, **neighborp;
+ facetT *bestfacet= NULL, *lastfacet= NULL;
int oldtrace= qh IStracing;
unsigned int visitid= ++qh visit_id;
int numpartnew=0;
@@ -176,6 +176,7 @@ facetT *qh_findbest (pointT *point, facetT *startfacet,
while (facet) {
trace4((qh ferr, "qh_findbest: neighbors of f%d, bestdist %2.2g f%d\n",
facet->id, bestdist, getid_(bestfacet)));
+ lastfacet= facet;
FOREACHneighbor_(facet) {
if (!neighbor->newfacet && isnewfacets)
continue;
@@ -194,8 +195,11 @@ facetT *qh_findbest (pointT *point, facetT *startfacet,
if (!neighbor->upperdelaunay) {
bestfacet= neighbor;
bestdist= *dist;
+ break; /* switch to neighbor */
+ }else if (!bestfacet) {
+ bestdist= *dist;
+ break; /* switch to neighbor */
}
- break; /* switch to neighor */
} /* end of *dist>bestdist */
} /* end of !flipped */
} /* end of FOREACHneighbor */
@@ -217,13 +221,8 @@ facetT *qh_findbest (pointT *point, facetT *startfacet,
qh findbest_notsharp= True;
}
}
- if (!bestfacet) {
- fprintf(qh ferr, "\n\
-qh_findbest: all neighbors of facet %d are flipped or upper Delaunay.\n\
-Please report this error to qhull_bug@geom.umn.edu with the input and all of the output.\n",
- startfacet->id);
- qh_errexit (qh_ERRqhull, startfacet, NULL);
- }
+ if (!bestfacet)
+ bestfacet= qh_findbestlower (lastfacet, point, &bestdist, numpart);
if (testhorizon)
bestfacet= qh_findbesthorizon (!qh_IScheckmax, point, bestfacet, noupper, &bestdist, &numpartnew);
*dist= bestdist;
@@ -409,7 +408,7 @@ facetT *qh_findbesthorizon (boolT ischeckmax, pointT* point, facetT *startfacet,
*/
facetT *qh_findbestnew (pointT *point, facetT *startfacet,
realT *dist, boolT bestoutside, boolT *isoutside, int *numpart) {
- realT bestdist= -REALmax/2, minsearch= -REALmax/2;
+ realT bestdist= -REALmax/2;
facetT *bestfacet= NULL, *facet;
int oldtrace= qh IStracing, i;
unsigned int visitid= ++qh visit_id;
diff --git a/src/geom.h b/src/geom.h
index 32440cff56ff3154f728bb1c086f4566271f2bc2..6b8ee627884e9ef5e0d23f1fe6fc7bb3c1246113 100644
--- a/src/geom.h
+++ b/src/geom.h
@@ -6,7 +6,7 @@
see qh-geom.htm and geom.c
- copyright (c) 1993-2002 The Geometry Center
+ copyright (c) 1993-2003 The Geometry Center
*/
#ifndef qhDEFgeom
diff --git a/src/geom2.c b/src/geom2.c
index bd58ce1282b9cfad2f0f9048502a476c7dce86e8..55b6d80832e49d0fd6842e04a26bab0fd7bb268f 100644
--- a/src/geom2.c
+++ b/src/geom2.c
@@ -7,7 +7,7 @@
see qh-geom.htm and geom.h
- copyright (c) 1993-2002 The Geometry Center
+ copyright (c) 1993-2003 The Geometry Center
frequently used code goes into geom.c
*/
@@ -1466,7 +1466,7 @@ void qh_projectinput (void) {
infinity[k]= 0.0;
for (i=qh num_points; i--; ) {
paraboloid= 0.0;
- for (k=qh hull_dim-1; k--; ) {
+ for (k=0; k < qh hull_dim-1; k++) {
paraboloid += *coord * *coord;
infinity[k] += *coord;
coord++;
diff --git a/src/global.c b/src/global.c
index d3e141aa985dca8e15aa55c8294d9eda281417c2..ff0cafb5eb339f21fdda7f6b908e1f82b0044b62 100644
--- a/src/global.c
+++ b/src/global.c
@@ -10,12 +10,12 @@
see qhull_a.h for internal functions
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include "qhull_a.h"
-/*========= qh definition =======================*/
+/*========= qh definition (see qhull.h) =======================*/
#if qh_QHpointer
qhT *qh_qh= NULL; /* pointer to all global variables */
@@ -25,6 +25,25 @@ qhT qh_qh; /* all global variables.
Also qh_qhstat in stat.c and qhmem in mem.c. */
#endif
+/*-<a href ="qh-globa.htm#TOC"
+ >--------------------------------</a><a name="qh_version">-</a>
+
+ qh_version
+ version string by year and date
+
+ the revision increases on code changes only
+
+ notes:
+ change date: Changes.txt, Announce.txt, README.txt,
+ qhull.man, qhull.txt, qhull-news.html, Eudora signatures,
+ change version: README.txt, qh-get.htm, File_id.diz, Makefile.txt
+ change year: Copying.txt
+ check download size
+ recompile user_eg.c, rbox.c, qhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c
+*/
+
+char *qh_version = "2003.1 2003/12/30";
+
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="appendprint">-</a>
@@ -725,6 +744,10 @@ void qh_initflags(char *command) {
qh_option ("Fmerges", NULL, NULL);
qh_appendprint (qh_PRINTmerges);
break;
+ case 'M':
+ qh_option ("FMaple", NULL, NULL);
+ qh_appendprint (qh_PRINTmaple);
+ break;
case 'n':
qh_option ("Fneighbors", NULL, NULL);
qh_appendprint (qh_PRINTneighbors);
@@ -1585,7 +1608,7 @@ qhull configuration warning (qh_RANDOMmax in user.h):\n\
for (i= qh_PRINTEND; i--; ) {
if (qh PRINTout[i] == qh_PRINTgeom)
printgeom= True;
- else if (qh PRINTout[i] == qh_PRINTmathematica)
+ else if (qh PRINTout[i] == qh_PRINTmathematica || qh PRINTout[i] == qh_PRINTmaple)
printmath= True;
else if (qh PRINTout[i] == qh_PRINTcoplanars)
printcoplanar= True;
@@ -1618,7 +1641,7 @@ qhull configuration warning (qh_RANDOMmax in user.h):\n\
}
}
if (printmath && (qh hull_dim > 3 || qh VORONOI)) {
- fprintf (qh ferr, "qhull input error: Mathematica output is only available for 2-d and 3-d convex hulls and 2-d Delaunay triangulations\n");
+ fprintf (qh ferr, "qhull input error: Mathematica and Maple output is only available for 2-d and 3-d convex hulls and 2-d Delaunay triangulations\n");
qh_errexit (qh_ERRinput, NULL, NULL);
}
if (printgeom) {
diff --git a/src/index.htm b/src/index.htm
index ef8fe4fd517985e3c39778e8c89f2809a7c123a4..de1873e734bff94e7c8f7d36d44acb993a06c417 100644
--- a/src/index.htm
+++ b/src/index.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -34,9 +34,9 @@ href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<h1>Qhull functions, macros, and data structures</h1>
<blockquote>
<p>The following sections provide an overview and index to
-Qhull's functions, macros, and data structures. </p>
-
-<p>Each section starts with an introduction. </p>
+Qhull's functions, macros, and data structures. Each
+section starts with an introduction. Also see <a href=../html/qh-in.htm#library>Calling
+Qhull from your program</a>.</p>
<p>Qhull uses the following conventions:</p>
<blockquote>
@@ -80,13 +80,13 @@ change the MIME type of .c and .h files to "text/html".
Opera does not always work since it treats '<' characters as HTML tags.
<p>
Please report documentation and link errors
-to <a href="mailto:qhull-bug@geom.umn.edu">qhull-bug@geom.umn.edu</a>.
+to <a href="mailto:qhull-bug@qhull.org">qhull-bug@qhull.org</a>.
<p>
<i>Brad Barber, Cambridge MA, June 1, 2002</i>
</p>
</blockquote>
-<p><b>Copyright © 1997-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1997-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -206,7 +206,7 @@ the code with defined constants and specialized routines.
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -229,10 +229,10 @@ Qhull</a> <br>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/io.c b/src/io.c
index 79ca7995d1e15a383cfb12902f103056c45f2c64..2ef5b946a50789e68d2ebd7fdb79ecefc1b9144f 100644
--- a/src/io.c
+++ b/src/io.c
@@ -13,18 +13,11 @@
unix.c and user.c are the only callers of io.c functions
This allows the user to avoid loading io.o from qhull.a
- copyright (c) 1993-2002 The Geometry Center
+ copyright (c) 1993-2003 The Geometry Center
*/
#include "qhull_a.h"
-/*========= -prototypes for internal functions ========= */
-
-static int qh_compare_facetarea(const void *p1, const void *p2);
-static int qh_compare_facetmerge(const void *p1, const void *p2);
-static int qh_compare_facetvisit(const void *p1, const void *p2);
-int qh_compare_vertexpoint(const void *p1, const void *p2); /* not used */
-
/*========= -functions in alphabetical order after qh_produce_output() =====*/
/*-<a href="qh-io.htm#TOC"
@@ -142,7 +135,7 @@ int qh_compare_vertexpoint(const void *p1, const void *p2) {
qh_compare_facetarea( p1, p2 )
used by qsort() to order facets by area
*/
-static int qh_compare_facetarea(const void *p1, const void *p2) {
+int qh_compare_facetarea(const void *p1, const void *p2) {
facetT *a= *((facetT **)p1), *b= *((facetT **)p2);
if (!a->isarea)
@@ -162,7 +155,7 @@ static int qh_compare_facetarea(const void *p1, const void *p2) {
qh_compare_facetmerge( p1, p2 )
used by qsort() to order facets by number of merges
*/
-static int qh_compare_facetmerge(const void *p1, const void *p2) {
+int qh_compare_facetmerge(const void *p1, const void *p2) {
facetT *a= *((facetT **)p1), *b= *((facetT **)p2);
return (a->nummerge - b->nummerge);
@@ -174,7 +167,7 @@ static int qh_compare_facetmerge(const void *p1, const void *p2) {
qh_compare_facetvisit( p1, p2 )
used by qsort() to order facets by visit id or id
*/
-static int qh_compare_facetvisit(const void *p1, const void *p2) {
+int qh_compare_facetvisit(const void *p1, const void *p2) {
facetT *a= *((facetT **)p1), *b= *((facetT **)p2);
int i,j;
@@ -1156,10 +1149,11 @@ void qh_printafacet(FILE *fp, int format, facetT *facet, boolT printall) {
fprintf (fp, "\n");
break;
case qh_PRINTmathematica: /* either 2 or 3-d by qh_printbegin */
+ case qh_PRINTmaple:
if (qh hull_dim == 2)
- qh_printfacet2math (fp, facet, qh printoutvar++);
+ qh_printfacet2math (fp, facet, format, qh printoutvar++);
else
- qh_printfacet3math (fp, facet, qh printoutvar++);
+ qh_printfacet3math (fp, facet, format, qh printoutvar++);
break;
case qh_PRINTneighbors:
fprintf (fp, "%d", qh_setsize (facet->neighbors));
@@ -1427,11 +1421,18 @@ void qh_printbegin (FILE *fp, int format, facetT *facetlist, setT *facets, boolT
fprintf (fp, "%d\n%d\n", qh hull_dim+1, numfacets);
break;
case qh_PRINTmathematica:
+ case qh_PRINTmaple:
if (qh hull_dim > 3) /* qh_initbuffers also checks */
goto LABELnoformat;
if (qh VORONOI)
fprintf (qh ferr, "qhull warning: output is the Delaunay triangulation\n");
- fprintf(fp, "{\n");
+ if (format == qh_PRINTmaple) {
+ if (qh hull_dim == 2)
+ fprintf(fp, "PLOT(CURVES(\n");
+ else
+ fprintf(fp, "PLOT3D(POLYGONS(\n");
+ }else
+ fprintf(fp, "{\n");
qh printoutvar= 0; /* counts number of facets for notfirst */
break;
case qh_PRINTmerges:
@@ -1642,6 +1643,9 @@ void qh_printend (FILE *fp, int format, facetT *facetlist, setT *facets, boolT p
if (qh CDDoutput)
fprintf (fp, "end\n");
break;
+ case qh_PRINTmaple:
+ fprintf(fp, "));\n");
+ break;
case qh_PRINTmathematica:
fprintf(fp, "}\n");
break;
@@ -1930,22 +1934,27 @@ void qh_printfacet2geom_points(FILE *fp, pointT *point1, pointT *point2,
/*-<a href="qh-io.htm#TOC"
>-------------------------------</a><a name="printfacet2math">-</a>
- qh_printfacet2math( fp, facet, notfirst )
- print 2-d Mathematica output for a facet
+ qh_printfacet2math( fp, facet, format, notfirst )
+ print 2-d Maple or Mathematica output for a facet
may be non-simplicial
notes:
use %16.8f since Mathematica 2.2 does not handle exponential format
+ see qh_printfacet3math
*/
-void qh_printfacet2math(FILE *fp, facetT *facet, int notfirst) {
+void qh_printfacet2math(FILE *fp, facetT *facet, int format, int notfirst) {
pointT *point0, *point1;
realT mindist;
+ char *pointfmt;
qh_facet2point (facet, &point0, &point1, &mindist);
if (notfirst)
fprintf(fp, ",");
- fprintf(fp, "Line[{{%16.8f, %16.8f}, {%16.8f, %16.8f}}]\n",
- point0[0], point0[1], point1[0], point1[1]);
+ if (format == qh_PRINTmaple)
+ pointfmt= "[[%16.8f, %16.8f], [%16.8f, %16.8f]]\n";
+ else
+ pointfmt= "Line[{{%16.8f, %16.8f}, {%16.8f, %16.8f}}]\n";
+ fprintf(fp, pointfmt, point0[0], point0[1], point1[0], point1[1]);
qh_memfree (point1, qh normal_size);
qh_memfree (point0, qh normal_size);
} /* printfacet2math */
@@ -2112,18 +2121,20 @@ void qh_printfacet3geom_simplicial(FILE *fp, facetT *facet, realT color[3]) {
>-------------------------------</a><a name="printfacet3math">-</a>
qh_printfacet3math( fp, facet, notfirst )
- print 3-d Mathematica output for a facet
+ print 3-d Maple or Mathematica output for a facet
notes:
may be non-simplicial
use %16.8f since Mathematica 2.2 does not handle exponential format
+ see qh_printfacet2math
*/
-void qh_printfacet3math (FILE *fp, facetT *facet, int notfirst) {
+void qh_printfacet3math (FILE *fp, facetT *facet, int format, int notfirst) {
vertexT *vertex, **vertexp;
setT *points, *vertices;
pointT *point, **pointp;
boolT firstpoint= True;
realT dist;
+ char *pointfmt, *endfmt;
if (notfirst)
fprintf(fp, ",\n");
@@ -2135,19 +2146,27 @@ void qh_printfacet3math (FILE *fp, facetT *facet, int notfirst) {
point= qh_projectpoint(vertex->point, facet, dist);
qh_setappend (&points, point);
}
- fprintf(fp, "Polygon[{");
+ if (format == qh_PRINTmaple) {
+ fprintf(fp, "[");
+ pointfmt= "[%16.8f, %16.8f, %16.8f]";
+ endfmt= "]";
+ }else {
+ fprintf(fp, "Polygon[{");
+ pointfmt= "{%16.8f, %16.8f, %16.8f}";
+ endfmt= "}]";
+ }
FOREACHpoint_(points) {
if (firstpoint)
firstpoint= False;
else
fprintf(fp, ",\n");
- fprintf(fp, "{%16.8f, %16.8f, %16.8f}", point[0], point[1], point[2]);
+ fprintf(fp, pointfmt, point[0], point[1], point[2]);
}
FOREACHpoint_(points)
qh_memfree (point, qh normal_size);
qh_settempfree(&points);
qh_settempfree(&vertices);
- fprintf(fp, "}]");
+ fprintf(fp, endfmt);
} /* printfacet3math */
@@ -2573,7 +2592,7 @@ void qh_printfacets(FILE *fp, int format, facetT *facetlist, setT *facets, boolT
else
qh_printextremes (fp, facetlist, facets, printall);
}else if (format == qh_PRINToptions)
- fprintf(fp, "Options selected for Qhull %s:\n%s\n", qh_VERSION, qh qhull_options);
+ fprintf(fp, "Options selected for Qhull %s:\n%s\n", qh_version, qh qhull_options);
else if (format == qh_PRINTpoints && !qh VORONOI)
qh_printpoints_out (fp, facetlist, facets, printall);
else if (format == qh_PRINTqhull)
@@ -2634,7 +2653,7 @@ void qh_printhelp_degenerate(FILE *fp) {
fprintf(fp, "\n\
A Qhull error has occurred. Qhull should have corrected the above\n\
precision error. Please send the input and all of the output to\n\
-qhull_bug@geom.umn.edu\n");
+qhull_bug@qhull.org\n");
else if (!qh_QUICKhelp) {
fprintf(fp, "\n\
Precision problems were detected during construction of the convex hull.\n\
@@ -4002,7 +4021,7 @@ This is the qhull test case. If any errors or core dumps occur,\n\
recompile qhull with 'make new'. If errors still occur, there is\n\
an incompatibility. You should try a different compiler. You can also\n\
change the choices in user.h. If you discover the source of the problem,\n\
-please send mail to qhull_bug@geom.umn.edu.\n\
+please send mail to qhull_bug@qhull.org.\n\
\n\
Type 'qhull' for a short list of options.\n");
}
diff --git a/src/io.h b/src/io.h
index 351d56b37084a8b86bcf9aa85ea50bee8a93f4e8..77bb61d7de764d5c9b097809bd5d3fcecb74b0cb 100644
--- a/src/io.h
+++ b/src/io.h
@@ -6,7 +6,7 @@
see README, qhull.h and io.c
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#ifndef qhDEFio
@@ -75,6 +75,11 @@ typedef void (*printvridgeT)(FILE *fp, vertexT *vertex, vertexT *vertexA, setT *
void dfacet( unsigned id);
void dvertex( unsigned id);
+int qh_compare_facetarea(const void *p1, const void *p2);
+int qh_compare_facetmerge(const void *p1, const void *p2);
+int qh_compare_facetvisit(const void *p1, const void *p2);
+int qh_compare_vertexpoint(const void *p1, const void *p2); /* not used */
+
void qh_countfacets (facetT *facetlist, setT *facets, boolT printall,
int *numfacetsp, int *numsimplicialp, int *totneighborsp,
int *numridgesp, int *numcoplanarsp, int *numnumtricoplanarsp);
@@ -99,11 +104,11 @@ void qh_printextremes (FILE *fp, facetT *facetlist, setT *facets, int printal
void qh_printextremes_2d (FILE *fp, facetT *facetlist, setT *facets, int printall);
void qh_printextremes_d (FILE *fp, facetT *facetlist, setT *facets, int printall);
void qh_printfacet(FILE *fp, facetT *facet);
-void qh_printfacet2math(FILE *fp, facetT *facet, int notfirst);
+void qh_printfacet2math(FILE *fp, facetT *facet, int format, int notfirst);
void qh_printfacet2geom(FILE *fp, facetT *facet, realT color[3]);
void qh_printfacet2geom_points(FILE *fp, pointT *point1, pointT *point2,
facetT *facet, realT offset, realT color[3]);
-void qh_printfacet3math (FILE *fp, facetT *facet, int notfirst);
+void qh_printfacet3math (FILE *fp, facetT *facet, int format, int notfirst);
void qh_printfacet3geom_nonsimplicial(FILE *fp, facetT *facet, realT color[3]);
void qh_printfacet3geom_points(FILE *fp, setT *points, facetT *facet, realT offset, realT color[3]);
void qh_printfacet3geom_simplicial(FILE *fp, facetT *facet, realT color[3]);
diff --git a/src/mem.c b/src/mem.c
index 7293462668428e86e2930154c16ddfed4b7b2270..5d2f18b0ae1b2850b61c9ad16f49c8e51817bb93 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -29,7 +29,7 @@
qh-mem.htm and mem.h
global.c (qh_initbuffers) for an example of using mem.c
- copyright (c) 1993-2002 The Geometry Center
+ copyright (c) 1993-2003 The Geometry Center
*/
#include <stdio.h>
@@ -205,6 +205,7 @@ void qh_memfree(void *object, int size) {
*/
void qh_memfreeshort (int *curlong, int *totlong) {
void *buffer, *nextbuffer;
+ FILE *ferr;
*curlong= qhmem .cntlong - qhmem .freelong;
*totlong= qhmem .totlong;
@@ -218,7 +219,9 @@ void qh_memfreeshort (int *curlong, int *totlong) {
free (qhmem .freelists);
free (qhmem .sizetable);
}
+ ferr= qhmem.ferr;
memset((char *)&qhmem, 0, sizeof qhmem); /* every field is 0, FALSE, NULL */
+ qhmem.ferr= ferr;
} /* memfreeshort */
diff --git a/src/mem.h b/src/mem.h
index e9ebd1bb9bca3cda1982c336eac7ec9bb7ff77cf..fb141f0c4d717b358c1cecb63345f29f92919c03 100644
--- a/src/mem.h
+++ b/src/mem.h
@@ -11,7 +11,7 @@
and
qh_errexit (qhmem_ERRqhull, NULL, NULL) otherwise
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#ifndef qhDEFmem
@@ -26,7 +26,7 @@
notes:
mem.c implements Quickfit memory allocation for about 20% time
savings. If it fails on your machine, try to locate the
- problem, and send the answer to qhull@geom.umn.edu. If this can
+ problem, and send the answer to qhull@qhull.org. If this can
not be done, define qh_NOmem to use malloc/free instead.
#define qh_NOmem
diff --git a/src/merge.c b/src/merge.c
index 34ecda1865fc44f5b8bb0570ce2b332b2d4967dd..cb683dea1b28cd7944ff36ec15c192d4fb608d52 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -20,20 +20,13 @@
merges occur in qh_mergefacet and in qh_mergecycle
vertex->neighbors not set until the first merge occurs
- copyright (c) 1993-2002 The Geometry Center
+ copyright (c) 1993-2003 The Geometry Center
*/
#include "qhull_a.h"
#ifndef qh_NOmerge
-/*=========== internal prototypes =========*/
-
-static int qh_compareangle(const void *p1, const void *p2);
-static int qh_comparemerge(const void *p1, const void *p2);
-static int qh_comparevisit (const void *p1, const void *p2);
-
-
/*===== functions (alphabetical after premerge and postmerge) ======*/
/*-<a href="qh-merge.htm#TOC"
@@ -571,7 +564,7 @@ boolT qh_checkzero (boolT testall) {
qh_compareangle( angle1, angle2 )
used by qsort() to order merges by angle
*/
-static int qh_compareangle(const void *p1, const void *p2) {
+int qh_compareangle(const void *p1, const void *p2) {
mergeT *a= *((mergeT **)p1), *b= *((mergeT **)p2);
return ((a->angle > b->angle) ? 1 : -1);
@@ -583,7 +576,7 @@ static int qh_compareangle(const void *p1, const void *p2) {
qh_comparemerge( merge1, merge2 )
used by qsort() to order merges
*/
-static int qh_comparemerge(const void *p1, const void *p2) {
+int qh_comparemerge(const void *p1, const void *p2) {
mergeT *a= *((mergeT **)p1), *b= *((mergeT **)p2);
return (a->type - b->type);
@@ -595,7 +588,7 @@ static int qh_comparemerge(const void *p1, const void *p2) {
qh_comparevisit( vertex1, vertex2 )
used by qsort() to order vertices by their visitid
*/
-static int qh_comparevisit (const void *p1, const void *p2) {
+int qh_comparevisit (const void *p1, const void *p2) {
vertexT *a= *((vertexT **)p1), *b= *((vertexT **)p2);
return (a->visitid - b->visitid);
diff --git a/src/merge.h b/src/merge.h
index 7fc2afa596725152009bacb46654e1e5f650ec49..5dc8ac1f17e6a7d5226dfc0241f56e0d2bbdb70d 100644
--- a/src/merge.h
+++ b/src/merge.h
@@ -6,7 +6,7 @@
see qh-merge.htm and merge.c
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#ifndef qhDEFmerge
@@ -117,6 +117,9 @@ void qh_appendmergeset(facetT *facet, facetT *neighbor, mergeType mergetype,
setT *qh_basevertices( facetT *samecycle);
void qh_checkconnect (void /* qh new_facets */);
boolT qh_checkzero (boolT testall);
+int qh_compareangle(const void *p1, const void *p2);
+int qh_comparemerge(const void *p1, const void *p2);
+int qh_comparevisit (const void *p1, const void *p2);
void qh_copynonconvex (ridgeT *atridge);
void qh_degen_redundant_facet (facetT *facet);
void qh_degen_redundant_neighbors (facetT *facet, facetT *delfacet);
diff --git a/src/poly.c b/src/poly.c
index 6319e43d66af51981461dca18582917e2c893b26..3bacbf80cb05c62de335883f2784affe92fc8bfd 100644
--- a/src/poly.c
+++ b/src/poly.c
@@ -9,7 +9,7 @@
infrequent code is in poly2.c
(all but top 50 and their callers 12/3/95)
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include "qhull_a.h"
diff --git a/src/poly.h b/src/poly.h
index 294ec9527fc169469fdc06985ac9c57868e4bd7e..2d49c284ce2de41c09a85ac49f552dba5fce1777 100644
--- a/src/poly.h
+++ b/src/poly.h
@@ -6,7 +6,7 @@
see qh-poly.htm, qhull.h and poly.c
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#ifndef qhDEFpoly
@@ -248,6 +248,7 @@ void qh_delvertex (vertexT *vertex);
setT *qh_facet3vertex (facetT *facet);
facetT *qh_findbestfacet (pointT *point, boolT bestoutside,
realT *bestdist, boolT *isoutside);
+facetT *qh_findbestlower (facetT *upperfacet, pointT *point, realT *bestdistp, int *numpart);
facetT *qh_findfacet_all (pointT *point, realT *bestdist, boolT *isoutside,
int *numpart);
int qh_findgood (facetT *facetlist, int goodhorizon);
diff --git a/src/poly2.c b/src/poly2.c
index 713faab8bed18517a7e4b0ebae00ea24200f3cd1..79ce4afa83a92b4836101a782ecb417a4ce8c5df 100644
--- a/src/poly2.c
+++ b/src/poly2.c
@@ -8,7 +8,7 @@
frequently used code is in poly.c
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include "qhull_a.h"
@@ -1173,9 +1173,13 @@ setT *qh_facet3vertex (facetT *facet) {
isoutside set if outside of facet
notes:
- this works for all distributions
- if inside, qh_findbestfacet performs an exhaustive search
+ For tricoplanar facets, this finds one of the tricoplanar facets closest
+ to the point. For Delaunay triangulations, the point may be inside a
+ different tricoplanar facet. See <a href="../html/qh-in.htm#findfacet">locate a facet with qh_findbestfacet()</a>
+
+ If inside, qh_findbestfacet performs an exhaustive search
this may be too conservative. Sometimes it is clearly required.
+
qh_findbestfacet is not used by qhull.
uses qh.visit_id and qh.coplanarset
@@ -1205,7 +1209,68 @@ facetT *qh_findbestfacet (pointT *point, boolT bestoutside,
bestfacet->id, *bestdist, *isoutside, totpart));
return bestfacet;
} /* findbestfacet */
-
+
+/*-<a href="qh-poly.htm#TOC"
+ >-------------------------------</a><a name="findbestlower">-</a>
+
+ qh_findbestlower( facet, point, bestdist, numpart )
+ returns best non-upper, non-flipped neighbor of facet for point
+ if needed, searches vertex neighbors
+
+ returns:
+ returns bestdist and updates numpart
+
+ notes:
+ if Delaunay and inside, point is outside of circumsphere of bestfacet
+ called by qh_findbest() for points above an upperdelaunay facet
+
+*/
+facetT *qh_findbestlower (facetT *upperfacet, pointT *point, realT *bestdistp, int *numpart) {
+ facetT *neighbor, **neighborp, *bestfacet= NULL;
+ realT bestdist= -REALmax/2 /* avoid underflow */;
+ realT dist;
+ vertexT *vertex;
+
+ zinc_(Zbestlower);
+ FOREACHneighbor_(upperfacet) {
+ if (neighbor->upperdelaunay || neighbor->flipped)
+ continue;
+ (*numpart)++;
+ qh_distplane (point, neighbor, &dist);
+ if (dist > bestdist) {
+ bestfacet= neighbor;
+ bestdist= dist;
+ }
+ }
+ if (!bestfacet) {
+ zinc_(Zbestlowerv);
+ /* rarely called, numpart does not count nearvertex computations */
+ vertex= qh_nearvertex (upperfacet, point, &dist);
+ qh_vertexneighbors();
+ FOREACHneighbor_(vertex) {
+ if (neighbor->upperdelaunay || neighbor->flipped)
+ continue;
+ (*numpart)++;
+ qh_distplane (point, neighbor, &dist);
+ if (dist > bestdist) {
+ bestfacet= neighbor;
+ bestdist= dist;
+ }
+ }
+ }
+ if (!bestfacet) {
+ fprintf(qh ferr, "\n\
+qh_findbestlower: all neighbors of facet %d are flipped or upper Delaunay.\n\
+Please report this error to qhull_bug@qhull.org with the input and all of the output.\n",
+ upperfacet->id);
+ qh_errexit (qh_ERRqhull, upperfacet, NULL);
+ }
+ *bestdistp= bestdist;
+ trace3((qh ferr, "qh_findbestlower: f%d dist %2.2g for f%d p%d\n",
+ bestfacet->id, bestdist, upperfacet->id, qh_pointid(point)));
+ return bestfacet;
+} /* findbestlower */
+
/*-<a href="qh-poly.htm#TOC"
>-------------------------------</a><a name="findfacet_all">-</a>
@@ -1621,7 +1686,7 @@ void qh_initbuild( void) {
if (qh TRACElevel || qh IStracing)
fprintf (qh ferr, "\nTrace level %d for %s | %s\n",
qh IStracing ? qh IStracing : qh TRACElevel, qh rbox_command, qh qhull_command);
- fprintf (qh ferr, "Options selected for Qhull %s:\n%s\n", qh_VERSION, qh qhull_options);
+ fprintf (qh ferr, "Options selected for Qhull %s:\n%s\n", qh_version, qh qhull_options);
}
qh_resetlists (False, qh_RESETvisible /*qh visible_list newvertex_list newfacet_list */);
qh facet_next= qh facet_list;
@@ -2135,7 +2200,7 @@ vertexT *qh_nearvertex (facetT *facet, pointT *point, realT *bestdistp) {
if (facet->tricoplanar) {
if (!qh VERTEXneighbors || !facet->center) {
fprintf(qh ferr, "qhull internal error (qh_nearvertex): qh.VERTEXneighbors and facet->center required for tricoplanar facets\n");
- qh_errexit(qh_ERRqhull, NULL, NULL);
+ qh_errexit(qh_ERRqhull, facet, NULL);
}
vertices= qh_settemp (qh TEMPsize);
apex= SETfirst_(facet->vertices);
@@ -2158,6 +2223,8 @@ vertexT *qh_nearvertex (facetT *facet, pointT *point, realT *bestdistp) {
if (facet->tricoplanar)
qh_settempfree (&vertices);
*bestdistp= sqrt (bestdist);
+ trace3((qh ferr, "qh_nearvertex: v%d dist %2.2g for f%d p%d\n",
+ bestvertex->id, *bestdistp, facet->id, qh_pointid(point)));
return bestvertex;
} /* nearvertex */
diff --git a/src/qconvex.c b/src/qconvex.c
index 67b78646e5007a10d2e7a2781b73b8e65c52dbc6..dbd89339d9cbe86d931cefd6ab9ef1dc46978559 100644
--- a/src/qconvex.c
+++ b/src/qconvex.c
@@ -6,7 +6,7 @@
see unix.c for full interface
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include <stdio.h>
@@ -56,7 +56,7 @@ char hidden_options[]=" d v H Qbb Qf Qg Qm Qr Qu Qv Qx Qz TR E V Fp Gt Q0 Q1 Q2
char qh_prompta[]= "\n\
qconvex- compute the convex hull\n\
- http://www.geom.umn.edu/software/qhull %s\n\
+ http://www.qhull.org %s\n\
\n\
input (stdin):\n\
first lines: dimension and number of points (or vice-versa).\n\
@@ -236,7 +236,7 @@ Except for 'F.' and 'PG', upper-case options take an argument.\n\
FD_cdd_out FFacet_xridge Finner FIDs Fmerges\n\
Fneighbors FNeigh_vertex Fouter FOptions FPoint_near\n\
FQhull Fsummary FSize Fvertices FVertex_ave\n\
- Fxtremes\n\
+ Fxtremes FMaple\n\
\n\
Gvertices Gpoints Gall_points Gno_planes Ginner\n\
Gcentrums Ghyperplanes Gridges Gouter GDrop_dim\n\
@@ -289,16 +289,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_VERSION);
+ fprintf(stdout, qh_prompt2, qh_version);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_VERSION, qh_DEFAULTbox,
+ fprintf(stdout, qh_prompta, qh_version, qh_DEFAULTbox,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_VERSION);
+ fprintf(stdout, qh_prompt3, qh_version);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/qdelaun.c b/src/qdelaun.c
index 0e49d9c381eb69033e02fa6d0ca49fd32f8c5082..68620fa1a9704f494cb214a6e7898df822d54cd3 100644
--- a/src/qdelaun.c
+++ b/src/qdelaun.c
@@ -7,7 +7,7 @@
see unix.c for full interface
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include <stdio.h>
@@ -57,7 +57,7 @@ char hidden_options[]=" d n v H U Qb QB Qc Qf Qg Qi Qm Qr QR Qv Qx TR E V FC Fi
char qh_prompta[]= "\n\
qdelaunay- compute the Delaunay triangulation\n\
- http://www.geom.umn.edu/software/qhull %s\n\
+ http://www.qhull.org %s\n\
\n\
input (stdin):\n\
first lines: dimension and number of points (or vice-versa).\n\
@@ -122,6 +122,7 @@ More formats:\n\
FF - facet dump without ridges\n\
FI - ID of each Delaunay region\n\
Fm - merge count for each Delaunay region (511 max)\n\
+ FM - Maple output (2-d only, lifted to a paraboloid)\n\
Fn - count plus neighboring region for each Delaunay region\n\
FN - count plus neighboring region for each point\n\
FO - options and precision constants\n\
@@ -174,7 +175,7 @@ Print options:\n\
synopsis for qhull
*/
char qh_prompt2[]= "\n\
-qdelaunay- compute the Delaunay triangulation. Qhull %s\n\
+qdelaunay- compute the Delaunay triangulation. Qhull %s\n\
input (stdin): dimension, number of points, point coordinates\n\
comments start with a non-numeric character\n\
\n\
@@ -221,7 +222,7 @@ Except for 'F.' and 'PG', upper-case options take an argument.\n\
Farea FArea_total Fcoincident Fd_cdd_in FD_cdd_out\n\
FF_dump_xridge FIDs Fmerges Fneighbors FNeigh_vertex\n\
FOptions FPoint_near FQdelaun Fsummary FSize\n\
- Fvertices Fxtremes\n\
+ Fvertices Fxtremes FMaple\n\
\n\
Gvertices Gpoints Gall_points Gno_planes Ginner\n\
Gcentrums Ghyperplanes Gridges Gouter GDrop_dim\n\
@@ -274,16 +275,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_VERSION);
+ fprintf(stdout, qh_prompt2, qh_version);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_VERSION,
+ fprintf(stdout, qh_prompta, qh_version,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_VERSION);
+ fprintf(stdout, qh_prompt3, qh_version);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/qh-geom.htm b/src/qh-geom.htm
index 2869f774ac6e4418cbe1811c857b077ff96d708e..a2f100c5a1a3ad66803a0050585c66ab5c022a35 100644
--- a/src/qh-geom.htm
+++ b/src/qh-geom.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -54,7 +54,7 @@ computations is determined at initialization. The roundoff error
in halfspace computation is accounted for by computing the
distance from vertices to the halfspace. </p>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <b>Geom</b>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a> •
@@ -233,7 +233,7 @@ orient facet so that <tt>qh.interior_point</tt> is inside</li>
point onto a facet </li>
<li><a href="geom.c#setfacetplane">qh_setfacetplane</a> sets
the hyperplane for a facet </li>
-<li><a href="geom.c#sharpnewfacets">qh_sharpnewfacets</a> true
+<li><a href="geom2.c#sharpnewfacets">qh_sharpnewfacets</a> true
if new facets contains a sharp corner</li>
</ul>
@@ -257,7 +257,7 @@ outer and inner planes
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -281,10 +281,10 @@ Qhull</a> <br>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-globa.htm b/src/qh-globa.htm
index 1ed0e3a713dd94c4edbfc49c888c5225cb67893b..723912edc31c627db4683aacef9ff8dc6789408c 100644
--- a/src/qh-globa.htm
+++ b/src/qh-globa.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -42,7 +42,7 @@ dynamically allocated with malloc(). See
<a href="user.h#QHpointer">QHpointer</a>.
</p>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <b>Global</b> •
@@ -64,6 +64,7 @@ routines</a> </li>
variables</a></h3>
<ul>
+<li><a href=global.c#qh_version>qh_version</a> version string
<li><a href="qhull.h#qh">qh</a> all global variables for
qhull are in <tt>qh,qhmem</tt>, and <tt>qhstat</tt></li>
<li><a href="qhull.h#qh-const">qh constants</a> configuration
@@ -126,7 +127,7 @@ strtod() and strtol() </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -148,10 +149,10 @@ Qhull</a> <br>
• <a href="qh-user.htm">User</a><br>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-io.htm b/src/qh-io.htm
index 42f4518314a9167f0be80c558dd485c5983dbb9e..4218e99fd153fd2467e303f48c565e0d9978a2ab 100644
--- a/src/qh-io.htm
+++ b/src/qh-io.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -53,7 +53,7 @@ the same driver: </p>
qh_skipfacet() is tested. </p>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a> <a name="TOC">•</a>
<a href="qh-globa.htm#TOC">Global</a> • <b>Io</b> •
@@ -149,9 +149,9 @@ extreme points of input sites for Delaunay triangulations ('Fx')</li>
<li><a href="io.c#printfacet">qh_printfacet</a> print all
fields of a facet ('f')</li>
<li><a href="io.c#printfacet2math">qh_printfacet2math</a> print
-2-d Mathematica output for a facet ('m')</li>
+2-d Maple or Mathematica output for a facet ('FM' or 'm')</li>
<li><a href="io.c#printfacet3math">qh_printfacet3math</a>
-print 3-d Mathematica facet ('m')</li>
+print 3-d Maple or Mathematica facet ('FM' or 'm')</li>
<li><a href="io.c#printfacet3vertex">qh_printfacet3vertex</a>
print vertices for a 3-d facet ('i', 'o')</li>
<li><a href="io.c#printfacetheader">qh_printfacetheader</a>
@@ -262,7 +262,7 @@ vertices as OFF spheres </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -285,10 +285,10 @@ Qhull</a> <br>
</p>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-mem.htm b/src/qh-mem.htm
index 784395aa7e9ffdb97cbb6124dd3d97617346b30f..97c836bb3a0c9644e89512c7047a8939f6d40939 100644
--- a/src/qh-mem.htm
+++ b/src/qh-mem.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -40,7 +40,7 @@ from a reserved buffer. </p>
<p>Use 'T5' to trace memory allocations.</p>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a> •
@@ -107,7 +107,7 @@ print out memory statistics </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -130,10 +130,10 @@ Qhull</a> <br>
</p>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-merge.htm b/src/qh-merge.htm
index f27e07c29f1983241a6085f6f40e58047e8894ce..e14eb2fabd3ed798568f544007bb5c3d13221df9 100644
--- a/src/qh-merge.htm
+++ b/src/qh-merge.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -98,7 +98,7 @@ structure.This is called a <em>redundant vertex</em>.
</li>
</ul>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -331,7 +331,7 @@ print trace message during post-merging </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -354,10 +354,10 @@ Qhull</a> <br>
</p>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-poly.htm b/src/qh-poly.htm
index 3a34c94b970ab10888251f78e2323c2ecd0224b4..7d8a1c706d36a010c8798910e40d12e64f385cd7 100644
--- a/src/qh-poly.htm
+++ b/src/qh-poly.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -110,7 +110,7 @@ plane is defined by <tt>facet->maxoutside</tt> while
the inner plane is computed from the facet's vertices.</p>
<p>Qhull 3.1 includes triangulation of non-simplicial facets
-('<A href="/software/qhull/html/qh-optq.htm#Qt">Qt</A>').
+('<A href="../html/qh-optq.htm#Qt">Qt</A>').
These facets,
called <i>tricoplanar</i>, share the same normal. centrum, and Voronoi center.
One facet (keepcentrum) owns these data structures.
@@ -119,7 +119,7 @@ joggled input, they
may have zero area or flipped orientation.
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -292,6 +292,8 @@ functions</a></h3>
<li><a href="poly2.c#createsimplex">qh_createsimplex</a>
create a simplex of facets from a set of vertices
</li>
+<li><a href="poly2.c#findbestlower">qh_findbestlower</a> find best
+non-upper, non-flipped facet for point at upperfacet</li>
<li><a href="poly2.c#furthestout">qh_furthestout</a>
make furthest outside point the last point of a
facet's outside set </li>
@@ -446,7 +448,7 @@ print out facet list for debugging </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -469,10 +471,10 @@ Qhull</a> <br>
</p>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-qhull.htm b/src/qh-qhull.htm
index 5f20cb61fc6cd63e428ab7a358398df75212baab..037b93b8f518418820bbab2c36868f9a7936b487 100644
--- a/src/qh-qhull.htm
+++ b/src/qh-qhull.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -41,7 +41,7 @@ the n-d beneath-beyond algorithm. See
functions and base data types. The top-level header file, <tt>qhull.h</tt>,
contains prototypes for these functions.</p>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -83,7 +83,7 @@ codes for indicating errors </li>
<li><a href="unix.c#prompt">qh_prompt</a> version and long prompt for Qhull</li>
<li><a href="unix.c#prompt2">qh_prompt2</a> synopsis for Qhull</li>
<li><a href="unix.c#prompt3">qh_prompt3</a> concise prompt for Qhull</li>
-<li><a href="qhull.h#qh_VERSION">qh_VERSION</a> version stamp</li>
+<li><a href="global.c#qh_version">qh_version</a> version stamp</li>
</ul>
<h3><a href="qh-qhull.htm#TOC">»</a><a name="qmacro">qhull.h other
@@ -238,7 +238,7 @@ print all fields for a list of facets </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -261,10 +261,10 @@ Qhull</a> <br>
</p>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-set.htm b/src/qh-set.htm
index 84b3b16744b8344ad78c9017ea59fc96bc0f6d2f..4a7dc21b0ee9194a782235f13d6341e4a8823f7d 100644
--- a/src/qh-set.htm
+++ b/src/qh-set.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -60,7 +60,7 @@ If a set is full, appending an element copies the set to
a larger array. </p>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a> •
@@ -271,7 +271,7 @@ temporary) </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -294,10 +294,10 @@ Qhull</a> <br>
</p>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-stat.htm b/src/qh-stat.htm
index b5b2b2df3ebc4dab5f32ed632de216423681c94a..0b7858df8f34e7a2aa3be323dbd9ba0b3d10fe44 100644
--- a/src/qh-stat.htm
+++ b/src/qh-stat.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -41,7 +41,7 @@ Statistics
may be turned off in user.h. If so, all but the 'zz'
statistics are ignored.</p>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -128,7 +128,7 @@ standard deviation and average from statistics </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -151,10 +151,10 @@ Qhull</a> <br>
</p>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-user.htm b/src/qh-user.htm
index 195a697300b86e93f6172c73420ade6ae3d8dbf9..cde5ae0b34876c1ea245c54b349c1f667784b673 100644
--- a/src/qh-user.htm
+++ b/src/qh-user.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
+href="http://www.qhull.org">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -35,7 +35,7 @@ href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
user may want to change. </p>
</blockquote>
-<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -201,7 +201,7 @@ print all fields of all facets </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/software/qhull">Home page for
+<a href="http://www.qhull.org">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -224,10 +224,10 @@ Qhull</a> <br>
</p>
<p><!-- GC common information --> </p>
<hr>
-<p><a href="http://www.geom.umn.edu/"><img
+<p><a href="http://www.geom.uiuc.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@qhull.org>qhull@qhull.org</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qhalf.c b/src/qhalf.c
index a2b3875dd7fdb64170c954e7ae7e4642fb1887b1..0996c545e1263b4263f0b3d61c74620507383844 100644
--- a/src/qhalf.c
+++ b/src/qhalf.c
@@ -6,7 +6,7 @@
see unix.c for full interface
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include <stdio.h>
@@ -56,7 +56,7 @@ char hidden_options[]=" d n v Qbb QbB Qf Qg Qm Qr QR Qv Qx Qz TR E V Fa FA FC FD
char qh_prompta[]= "\n\
qhalf- compute the intersection of halfspaces about a point\n\
- http://www.geom.umn.edu/software/qhull %s\n\
+ http://www.qhull.org %s\n\
\n\
input (stdin):\n\
optional interior point: dimension, 1, coordinates\n\
@@ -123,6 +123,7 @@ More formats:\n\
FF - facet dump without ridges\n\
FI - ID of each intersection\n\
Fm - merge count for each intersection (511 max)\n\
+ FM - Maple output (dual convex hull)\n\
Fn - count plus neighboring intersections for each intersection\n\
FN - count plus intersections for each non-redundant halfspace\n\
FO - options and precision constants\n\
@@ -173,7 +174,7 @@ Print options:\n\
synopsis for qhull
*/
char qh_prompt2[]= "\n\
-qhalf- halfspace intersection about a point. Qhull %s\n\
+qhalf- halfspace intersection about a point. Qhull %s\n\
input (stdin): [dim, 1, interior point], dim+1, n, coefficients+offset\n\
comments start with a non-numeric character\n\
\n\
@@ -219,7 +220,7 @@ Except for 'F.' and 'PG', upper_case options take an argument.\n\
\n\
Fc_redundant Fd_cdd_in FF_dump_xridge FIDs Fmerges\n\
Fneighbors FN_intersect FOptions Fp_coordinates FP_nearest\n\
- FQhalf Fsummary Fv_halfspace Fx_non_redundant\n\
+ FQhalf Fsummary Fv_halfspace FMaple Fx_non_redundant\n\
\n\
Gvertices Gpoints Gall_points Gno_planes Ginner\n\
Gcentrums Ghyperplanes Gridges Gouter GDrop_dim\n\
@@ -271,16 +272,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_VERSION);
+ fprintf(stdout, qh_prompt2, qh_version);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_VERSION,
+ fprintf(stdout, qh_prompta, qh_version,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_VERSION);
+ fprintf(stdout, qh_prompt3, qh_version);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/qhull.c b/src/qhull.c
index dc835bb4f28a2a7b89ddcf30b290046c9b692636..55a152103227f4827db814905e7275f68ae0b92d 100644
--- a/src/qhull.c
+++ b/src/qhull.c
@@ -10,7 +10,7 @@
see qhull_a.h for internal functions
- copyright (c) 1993-2002 The Geometry Center
+ copyright (c) 1993-2003 The Geometry Center
*/
#include "qhull_a.h"
@@ -54,6 +54,7 @@
error if temporary sets exist
record end time
*/
+
void qh_qhull (void) {
int numoutside;
diff --git a/src/qhull.h b/src/qhull.h
index 896ec1e9c18597e5fd77fa0f08f8348189658f7c..657f5e44d1657c294ebd86db6e134cbbd8a06c1e 100644
--- a/src/qhull.h
+++ b/src/qhull.h
@@ -6,7 +6,7 @@
see qh-qhull.htm, qhull_a.h
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
NOTE: access to qh_qh is via the 'qh' macro. This allows
qh_qh to be either a pointer or a structure. An example
@@ -53,25 +53,7 @@
/*============ constants and basic types ====================*/
-/*-<a href="qh-qhull.htm#TOC"
- >--------------------------------</a><a name="qh_VERSION">-</a>
-
- qh_VERSION
- version string by year and date
-
- the revision increases on code changes only
-
- notes:
- change date: Changes.txt, Announce.txt, README.txt, qhull.man
- qhull-news.html, Eudora signatures,
- change version: README.txt, qhull.html, file_id.diz, Makefile
- change year: Copying.txt
- check download size
- recompile user_eg.c, rbox.c, qhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c
- make copy of qhull-news.html as qh-news.htm
-*/
-
-#define qh_VERSION "2002.1 2002/8/20"
+extern char *qh_version; /* defined in global.c */
/*-<a href="qh-geom.htm#TOC"
>--------------------------------</a><a name="coordT">-</a>
@@ -150,7 +132,7 @@ typedef enum {qh_PRINTnone= 0,
qh_PRINTcoplanars, qh_PRINTcentrums,
qh_PRINTfacets, qh_PRINTfacets_xridge, /* 'f' 'FF' 'G' 'FI' 'Fi' 'Fn' */
qh_PRINTgeom, qh_PRINTids, qh_PRINTinner, qh_PRINTneighbors,
- qh_PRINTnormals, qh_PRINTouter, /* 'n' 'Fo' 'i' 'm' 'Fm' 'o' */
+ qh_PRINTnormals, qh_PRINTouter, qh_PRINTmaple, /* 'n' 'Fo' 'i' 'm' 'Fm' 'FM', 'o' */
qh_PRINTincidences, qh_PRINTmathematica, qh_PRINTmerges, qh_PRINToff,
qh_PRINToptions, qh_PRINTpointintersect, /* 'FO' 'Fp' 'FP' 'p' 'FQ' 'FS' */
qh_PRINTpointnearest, qh_PRINTpoints, qh_PRINTqhull, qh_PRINTsize,
@@ -389,7 +371,7 @@ struct vertexT {
notes:
qhmem is defined in mem.h and qhstat is defined in stat.h
- access to qh_qh is via the "qh" macro. See qh_QHpointer in user.h
+ Access to qh_qh is via the "qh" macro. See qh_QHpointer in user.h
*/
typedef struct qhT qhT;
#if qh_QHpointer
diff --git a/src/qhull_a.h b/src/qhull_a.h
index d4e69b071bed6099ab4d4ce04a77d61b12303645..027cafa78380c60f8d170dec25628df6c88b484c 100644
--- a/src/qhull_a.h
+++ b/src/qhull_a.h
@@ -12,7 +12,7 @@
defines internal functions for qhull.c global.c
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
Notes: grep for ((" and (" to catch fprintf("lkasdjf");
full parens around (x?y:z)
diff --git a/src/qset.c b/src/qset.c
index 9e78464c07e4fda7aa6baa5a6f9cbb27bee5d8ce..f902ea7a6cc7cf0c3f064471d9d83564f9008f6c 100644
--- a/src/qset.c
+++ b/src/qset.c
@@ -6,7 +6,7 @@
see qh-set.htm and qset.h
- copyright (c) 1993-2002 The Geometry Center
+ copyright (c) 1993-2003 The Geometry Center
*/
#include <stdio.h>
diff --git a/src/qset.h b/src/qset.h
index 6c0ff758de4c7500c9fe93eabaac8915c6593f38..57524984e2b81840920475f2567ec4c0e0f6456b 100644
--- a/src/qset.h
+++ b/src/qset.h
@@ -16,7 +16,7 @@
- every set is NULL terminated
- sets may be sorted or unsorted, the caller must distinguish this
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#ifndef qhDEFset
diff --git a/src/qvoronoi.c b/src/qvoronoi.c
index ebeb7367b87fcf53c2e1b6bc11316e8af4851913..1a3aeb4cef437b6d6ff92228e063cfb5280200f1 100644
--- a/src/qvoronoi.c
+++ b/src/qvoronoi.c
@@ -7,7 +7,7 @@
see unix.c for full interface
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include <stdio.h>
@@ -39,7 +39,7 @@ int isatty (int); /* returns 1 if stdin is a tty
if "Undefined symbol" this can be deleted along with call in main() */
#endif
-/*-<a href="qh-qhull.c#TOC"
+/*-<a href="qh-qhull.htm#TOC"
>-------------------------------</a><a name="prompt">-</a>
qh_prompt
@@ -57,7 +57,7 @@ char hidden_options[]=" d n m v H U Qb QB Qc Qf Qg Qi Qm Qr QR Qv Qx TR E V Fa F
char qh_prompta[]= "\n\
qvoronoi- compute the Voronoi diagram\n\
- http://www.geom.umn.edu/software/qhull %s\n\
+ http://www.qhull.org %s\n\
\n\
input (stdin):\n\
first lines: dimension and number of points (or vice-versa).\n\
@@ -169,7 +169,7 @@ Print options:\n\
synopsis for qhull
*/
char qh_prompt2[]= "\n\
-qvoronoi- compute the Voronoi diagram. Qhull %s\n\
+qvoronoi- compute the Voronoi diagram. Qhull %s\n\
input (stdin): dimension, number of points, point coordinates\n\
comments start with a non-numeric character\n\
\n\
@@ -269,16 +269,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_VERSION);
+ fprintf(stdout, qh_prompt2, qh_version);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_VERSION,
+ fprintf(stdout, qh_prompta, qh_version,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_VERSION);
+ fprintf(stdout, qh_prompt3, qh_version);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/stat.c b/src/stat.c
index e8d21fe69dba669c6e7b75025862df1eb20f396d..3a1aa051ff21225c498744003e4c3becc9eebc4c 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -6,7 +6,7 @@
see qh-stat.htm and stat.h
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include "qhull_a.h"
@@ -137,12 +137,14 @@ void qh_allstatD(void) {
zdef_(zinc, Zparthorizon, " horizon facets better than bestfacet", -1);
zdef_(zinc, Zpartangle, "angle tests for repartitioned coplanar points", -1);
zdef_(zinc, Zpartflip, " repartitioned coplanar points for flipped orientation", -1);
+}
+void qh_allstatE(void) {
zdef_(zinc, Zpartinside, "inside points", -1);
zdef_(zinc, Zpartnear, " inside points kept with a facet", -1);
zdef_(zinc, Zcoplanarinside, " inside points that were coplanar with a facet", -1);
+ zdef_(zinc, Zbestlower, "calls to findbestlower", -1);
+ zdef_(zinc, Zbestlowerv, " with search of vertex neighbors", -1);
zdef_(wadd, Wmaxout, "difference in max_outside at final check", -1);
-}
-void qh_allstatE(void) {
zzdef_(zinc, Zpartitionall, "distance tests for initial partition", -1);
zdef_(zinc, Ztotpartition, "partitions of a point", -1);
zzdef_(zinc, Zpartition, "distance tests for partitioning", -1);
@@ -572,7 +574,7 @@ void qh_printstatistics (FILE *fp, char *string) {
fprintf (fp, "\n\
%s\n\
qhull invoked by: %s | %s\n%s with options:\n%s\n", string, qh rbox_command,
- qh qhull_command, qh_VERSION, qh qhull_options);
+ qh qhull_command, qh_version, qh qhull_options);
fprintf (fp, "\nprecision constants:\n\
%6.2g max. abs. coordinate in the (transformed) input ('Qbd:n')\n\
%6.2g max. roundoff error for distance computation ('En')\n\
diff --git a/src/stat.h b/src/stat.h
index 1dae54ed21d77375eaf5560fb2e2dd1fe2a27097..96c4e6035992bfe6205862b16269a4402f6ffe87 100644
--- a/src/stat.h
+++ b/src/stat.h
@@ -6,7 +6,7 @@
see qh-stat.htm and stat.c
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
recompile qhull if you change this file
@@ -62,6 +62,8 @@ enum statistics { /* alphabetical after Z/W */
Zback0,
Zbestcentrum,
Zbestdist,
+ Zbestlower,
+ Zbestlowerv,
Zcentrumtests,
Zcheckpart,
Zcomputefurthest,
diff --git a/src/unix.c b/src/unix.c
index 5ec5feab16c87b413fcc33de5540868dbd0a6ba7..9f06fcefb3ab432ac50b502ba0624ec61e2b61de 100644
--- a/src/unix.c
+++ b/src/unix.c
@@ -7,7 +7,7 @@
see qh-qhull.htm
- copyright (c) 1993-2002, The Geometry Center
+ copyright (c) 1993-2003, The Geometry Center
*/
#include <stdio.h>
@@ -50,7 +50,7 @@ int isatty (int); /* returns 1 if stdin is a tty
*/
char qh_prompta[]= "\n\
qhull- compute convex hulls and related structures.\n\
- http://www.geom.umn.edu/software/qhull %s\n\
+ http://www.qhull.org %s\n\
\n\
input (stdin):\n\
first lines: dimension and number of points (or vice-versa).\n\
@@ -158,6 +158,7 @@ More formats:\n\
for 'v', separating hyperplanes for bounded Voronoi regions\n\
FI - ID of each facet\n\
Fm - merge count for each facet (511 max)\n\
+ FM - Maple output (2-d and 3-d)\n\
Fn - count plus neighboring facets for each facet\n\
FN - count plus neighboring facets for each point\n\
Fo - outer plane (or max_outside) for each facet\n\
@@ -215,7 +216,7 @@ Print options:\n\
synopsis for qhull
*/
char qh_prompt2[]= "\n\
-qhull- compute convex hulls and related structures. %s\n\
+qhull- compute convex hulls and related structures. Qhull %s\n\
input (stdin): dimension, n, point coordinates\n\
comments start with a non-numeric character\n\
halfspace: use dim+1 and put offsets after coefficients\n\
@@ -249,7 +250,7 @@ Output options (subset):\n\
\n\
examples:\n\
rbox c d D2 | qhull Qc s f Fx | more rbox 1000 s | qhull Tv s FA\n\
- rbox 10 D2 | qhull d QJ s i TO result rbox 10 D2 | qhull v QJ p\n\
+ rbox 10 D2 | qhull d QJ s i TO result rbox 10 D2 | qhull v Qbb Qt p\n\
rbox 10 D2 | qhull d Qu QJ m rbox 10 D2 | qhull v Qu QJ o\n\
rbox c | qhull n rbox c | qhull FV n | qhull H Fp\n\
rbox d D12 | qhull QR0 FA rbox c D7 | qhull FA TF1000\n\
@@ -276,7 +277,7 @@ Except for 'F.' and 'PG', upper-case options take an argument.\n\
FD-cdd-out FF-dump-xridge Finner FIDs Fmerges\n\
Fneighbors FNeigh-vertex Fouter FOptions Fpoint-intersect\n\
FPoint_near FQhull Fsummary FSize Ftriangles\n\
- Fvertices Fvoronoi FVertex-ave Fxtremes\n\
+ Fvertices Fvoronoi FVertex-ave Fxtremes FMaple\n\
\n\
Gvertices Gpoints Gall_points Gno_planes Ginner\n\
Gcentrums Ghyperplanes Gridges Gouter GDrop_dim\n\
@@ -336,16 +337,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_VERSION);
+ fprintf(stdout, qh_prompt2, qh_version);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_VERSION, qh_DEFAULTbox,
+ fprintf(stdout, qh_prompta, qh_version, qh_DEFAULTbox,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_VERSION);
+ fprintf(stdout, qh_prompt3, qh_version);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/user.c b/src/user.c
index 94b31aaf99f7533a9b2f2142f4486f5d0a74dc9d..b9a75a0b15c3d3786dff33afefe3b3d81301a6c7 100644
--- a/src/user.c
+++ b/src/user.c
@@ -23,7 +23,7 @@
the last point added to the hull, e.g., 102. You can then trace
the execution of qhull with "T4P102".
- Please report any errors that you fix to qhull@geom.umn.edu
+ Please report any errors that you fix to qhull@qhull.org
call_qhull is a template for calling qhull from within your application
@@ -197,7 +197,7 @@ void qh_errexit(int exitcode, facetT *facet, ridgeT *ridge) {
qh hulltime= qh_CPUclock - qh hulltime;
qh_errprint("ERRONEOUS", facet, NULL, ridge, NULL);
fprintf (qh ferr, "\nWhile executing: %s | %s\n", qh rbox_command, qh qhull_command);
- fprintf(qh ferr, "Options selected for Qhull %s:\n%s\n", qh_VERSION, qh qhull_options);
+ fprintf(qh ferr, "Options selected for Qhull %s:\n%s\n", qh_version, qh qhull_options);
if (qh furthest_id >= 0) {
fprintf(qh ferr, "Last point added to hull was p%d.", qh furthest_id);
if (zzval_(Ztotmerge))
diff --git a/src/user_eg.c b/src/user_eg.c
index 97e4aa7a89aba23b2554408d228a2ee6b0d8a33f..9f2ac81d781955721a83f4762bac571e6f13d7a8 100644
--- a/src/user_eg.c
+++ b/src/user_eg.c
@@ -101,7 +101,6 @@ void makeDelaunay (coordT *points, int numpoints, int dim, int seed) {
int j,k;
coordT *point, realr;
-
printf ("seed: %d\n", seed);
qh_RANDOMseed_( seed);
for (j=0; j<numpoints; j++) {
@@ -118,6 +117,9 @@ void makeDelaunay (coordT *points, int numpoints, int dim, int seed) {
assumes dim < 100
notes:
calls qh_setdelaunay() to project the point to a parabaloid
+warning:
+ This is not implemented for tricoplanar facets ('Qt'),
+ See <a href="../html/qh-in.htm#findfacet">locate a facet with qh_findbestfacet()</a>
*/
void findDelaunay (int dim) {
int k;
@@ -131,6 +133,11 @@ void findDelaunay (int dim) {
point[k]= 0.5;
qh_setdelaunay (dim+1, 1, point);
facet= qh_findbestfacet (point, qh_ALL, &bestdist, &isoutside);
+ if (facet->tricoplanar) {
+ fprintf(stderr, "findDelaunay: not implemented for triangulated, non-simplicial Delaunay regions (tricoplanar facet, f%d).\n",
+ facet->id);
+ qh_errexit (qh_ERRqhull, facet, NULL);
+ }
FOREACHvertex_(facet->vertices) {
for (k=0; k < dim; k++)
printf ("%5.2f ", vertex->point[k]);
@@ -222,7 +229,7 @@ your project.\n\n");
Run 2: Delaunay triangulation
*/
- printf( "\ncompute 3-d Delaunay triangulation\n");
+ printf( "\ncompute %d-d Delaunay triangulation\n", dim);
sprintf (flags, "qhull s d Tcv %s", argc >= 3 ? argv[2] : "");
numpoints= SIZEcube;
makeDelaunay (points, numpoints, dim, time(NULL));
@@ -239,7 +246,7 @@ your project.\n\n");
FORALLfacets {
/* ... your code ... */
}
- printf( "\nfind 3-d Delaunay triangle closest to [0.5, 0.5, ...]\n");
+ printf( "\nfind %d-d Delaunay triangle closest to [0.5, 0.5, ...]\n", dim);
exitcode= setjmp (qh errexit);
if (!exitcode) {
/* Trap Qhull errors in findDelaunay(). Without the setjmp(), Qhull
diff --git a/src/user_eg2.c b/src/user_eg2.c
index 1eb42ccfe8add0ada8063d635ac3aa3013592d14..28ecbce467423160cd933c0165683c1c09108e36 100644
--- a/src/user_eg2.c
+++ b/src/user_eg2.c
@@ -218,6 +218,11 @@ void addDelaunay (coordT *points, int numpoints, int numnew, int dim) {
/*--------------------------------------------------
-findDelaunay- find Delaunay triangle for [0.5,0.5,...]
assumes dim < 100
+notes:
+ calls qh_setdelaunay() to project the point to a parabaloid
+warning:
+ This is not implemented for tricoplanar facets ('Qt'),
+ See <a href="../html/qh-in.htm#findfacet">locate a facet with qh_findbestfacet()</a>
*/
void findDelaunay (int dim) {
int k;
@@ -231,6 +236,11 @@ void findDelaunay (int dim) {
point[k]= 0.5;
qh_setdelaunay (dim, 1, point);
facet= qh_findbestfacet (point, qh_ALL, &bestdist, &isoutside);
+ if (facet->tricoplanar) {
+ fprintf(stderr, "findDelaunay: not implemented for triangulated, non-simplicial Delaunay regions (tricoplanar facet, f%d).\n",
+ facet->id);
+ qh_errexit (qh_ERRqhull, facet, NULL);
+ }
FOREACHvertex_(facet->vertices) {
for (k=0; k < dim-1; k++)
printf ("%5.2f ", vertex->point[k]);
@@ -383,7 +393,7 @@ your project.\n\n");
strcat (qh rbox_command, "user_eg Delaunay");
sprintf (options, "qhull s d Tcv %s", argc >= 3 ? argv[2] : "");
qh_initflags (options);
- printf( "\ncompute 2-d Delaunay triangulation\n");
+ printf( "\ncompute %d-d Delaunay triangulation\n", DIM-1);
makeDelaunay (array[0], SIZEcube, DIM);
/* Instead of makeDelaunay with qh_setdelaunay, you may
produce a 2-d array of points, set DIM to 2, and set