diff --git a/Announce.txt b/Announce.txt
index 5813e25f9b6f9cb9edee1a84a7f08a420653b15f..d8a0c3582e9983d0e85b0f7c45d7f5ec3b31f5e6 100644
--- a/Announce.txt
+++ b/Announce.txt
@@ -1,8 +1,8 @@
- Qhull 2003.1 2003/12/30
+ Qhull 2009.1 2009/06/11
http://www.qhull.org
- http://savannah.gnu.org/projects/qhull/
+ http://savannah.nongnu.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
@@ -24,9 +24,9 @@ To download Qhull:
Download qhull-96.ps for:
- Barber, C. B., D.P. Dobkin, and H.T. Huhdanpaa,
- "The Quickhull Algorithm for Convex Hulls," ACM
- Trans. on Mathematical Software, Dec. 1996.
+ Barber, C. B., D.P. Dobkin, and H.T. Huhdanpaa, "The
+ Quickhull Algorithm for Convex Hulls," ACM Trans. on
+ Mathematical Software, 22(4):469-483, Dec. 1996.
http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/
http://citeseer.nj.nec.com/83502.html
diff --git a/File_id.diz b/File_id.diz
index 21120bdc3976c1da0dbc4e89d76e3e5519ba059a..b1b66d65abd8b702e31ff06ca32b2d855c4a2719 100644
--- a/File_id.diz
+++ b/File_id.diz
@@ -1,4 +1,4 @@
-Qhull 2003.1 - Qhull computes convex hulls,
+Qhull 2009.1 - Qhull computes convex hulls,
Delaunay triangulations, halfspace inter-
sections about a point, Voronoi diagrams,
furthest-site Delaunay triangulations, and
diff --git a/README.txt b/README.txt
index 4cbbdde6123dbf79dba3b3bd66b13ae149c9639d..5d9407efabc3fa7488484f81347bdc3edd950c3c 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
Name
- qhull, rbox 2003.1 2003/12/30
+ qhull, rbox 2009.1 2009/06/11
Convex hull, Delaunay triangulation, Voronoi diagrams, Halfspace intersection
@@ -9,7 +9,7 @@ Convex hull, Delaunay triangulation, Voronoi diagrams, Halfspace intersection
Available from:
<http://www.qhull.org>
- <http://savannah.gnu.org/projects/qhull>
+ <http://savannah.nongnu.org/projects/qhull>
Version 1 (simplicial only):
<http://www.qhull.org/download/qhull-1.0.tar.gz>
@@ -44,9 +44,15 @@ Environment requirements
Qhull is copyrighted software. Please read COPYING.txt and REGISTER.txt
before using or distributing Qhull.
+To cite Qhull, please use
+
+ Barber, C.B., Dobkin, D.P., and Huhdanpaa, H.T., "The Quickhull
+ algorithm for convex hulls," ACM Trans. on Mathematical Software,
+ 22(4):469-483, Dec 1996, http://www.qhull.org.
+
To contribute to Qhull
- Qhull is on Savannah at http://savannah.gnu.org/projects/qhull/
+ Qhull is on Savannah at http://savannah.nongnu.org/projects/qhull/
Qhull on Windows 95, 98, ME, NT, 2000, XP
@@ -312,11 +318,11 @@ src/
Authors:
C. Bradford Barber Hannu Huhdanpaa
- bradb@qhull.org hannu@qhull.org
+ bradb@qhull.org hannu@qhull.org
The Geometry Center
University of Minnesota
- Qhull 1.0 was developed under NSF grants NSF/DMS-8920161 and
- NSF-CCR-91-15793 750-7504 at the Geometry Center and Harvard
+ Qhull 1.0 and 2.0 were 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 4682e02669f1da0583867cdc91f2c82f1a07c676..ee196543955e25ec1189e582ccf9a6cd91e362ab 100644
--- a/REGISTER.txt
+++ b/REGISTER.txt
@@ -24,11 +24,11 @@ We need to know:
We encourage you to cite the use of any Geometry Center software you
have used in your publications.
-To cite Qhull, use
+To cite Qhull, please use
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.qhull.org
+ 22(4):469-483, Dec 1996, http://www.qhull.org.
Please send e-mail to
diff --git a/config/Makefile-am-eg b/config/Makefile-am-eg
new file mode 100644
index 0000000000000000000000000000000000000000..515e370c3c0790720ca5ff7da925273ec41828fb
--- /dev/null
+++ b/config/Makefile-am-eg
@@ -0,0 +1,21 @@
+### Makefile.am for the qhull package (eg)
+### Author: Rafael Laboissiere <rafael@debian.org>
+### Created: Mon Dec 3 21:36:21 CET 2001
+
+### Documentation files
+
+# to:
+docdir = $(prefix)/share/doc/$(PACKAGE)
+examplesdir = $(docdir)/examples
+
+# which:
+examples_DATA = \
+ q_eg \
+ q_egtest \
+ q_test \
+ Qhull-go.bat \
+ q_test.bat
+
+### Extra files to be included in the tarball
+
+EXTRA_DIST = $(examples_DATA)
diff --git a/config/Makefile-am-html b/config/Makefile-am-html
new file mode 100644
index 0000000000000000000000000000000000000000..0da6a3fe828259880457d849cafa7204bc41ca32
--- /dev/null
+++ b/config/Makefile-am-html
@@ -0,0 +1,56 @@
+### Makefile.am for the qhull package (html)
+### Author: Rafael Laboissiere <rafael@debian.org>
+### Created: Mon Dec 3 21:36:21 CET 2001
+
+### Man pages (trick to get around .man extension)
+
+%.1: %.man
+ cp $< $@
+CLEANFILES = *.1
+man_MANS = rbox.1 qhull.1
+
+### Documentation files
+
+# to:
+docdir = $(prefix)/share/doc/$(PACKAGE)
+htmldir = $(docdir)/html
+
+# which:
+html_DATA = \
+ index.htm \
+ qconvex.htm \
+ qdelau_f.htm \
+ qdelaun.htm \
+ qh--4d.gif \
+ qh--cone.gif \
+ qh--dt.gif \
+ qh--geom.gif \
+ qh--half.gif \
+ qh--rand.gif \
+ qh-eg.htm \
+ qh-faq.htm \
+ qh-get.htm \
+ qh-impre.htm \
+ qh-in.htm \
+ qh-optc.htm \
+ qh-optf.htm \
+ qh-optg.htm \
+ qh-opto.htm \
+ qh-optp.htm \
+ qh-optq.htm \
+ qh-optt.htm \
+ qh-quick.htm \
+ qhalf.htm \
+ qhull.htm \
+ qvoron_f.htm \
+ qvoronoi.htm \
+ rbox.htm
+
+### Extra files to be included in the tarball
+
+EXTRA_DIST = \
+ $(html_DATA) \
+ qhull.man \
+ qhull.txt \
+ rbox.man \
+ rbox.txt
diff --git a/config/Makefile-am-main b/config/Makefile-am-main
new file mode 100644
index 0000000000000000000000000000000000000000..a33d7f056b8725dae7c1d1a24ab7bb0d9e92ae4c
--- /dev/null
+++ b/config/Makefile-am-main
@@ -0,0 +1,27 @@
+### Makefile.am for the qhull package (main)
+### Author: Rafael Laboissiere <rafael@debian.org>
+### Created: Mon Dec 3 21:36:21 CET 2001
+
+### Documentation files
+
+# to:
+docdir = $(prefix)/share/doc/$(PACKAGE)
+
+# which:
+doc_DATA = \
+ index.htm \
+ Announce.txt \
+ COPYING.txt \
+ README.txt \
+ REGISTER.txt
+
+### Extra files to be included in the tarball
+
+EXTRA_DIST = \
+ $(doc_DATA) \
+ File_id.diz \
+ QHULL-GO.pif
+
+### Subdirectories for Automaking
+
+SUBDIRS = src html eg config
diff --git a/config/Makefile-am-src b/config/Makefile-am-src
new file mode 100644
index 0000000000000000000000000000000000000000..47d8dcde765bb771d56148b137660b44e8ae5ced
--- /dev/null
+++ b/config/Makefile-am-src
@@ -0,0 +1,97 @@
+### Makefile.am for the qhull package (src)
+### Author: Rafael Laboissiere <rafael@debian.org>
+### Created: Mon Dec 3 21:36:21 CET 2001
+
+### Shared Library
+
+# to:
+lib_LTLIBRARIES = libqhull.la
+
+# from:
+libqhull_la_SOURCES = \
+ user.c \
+ global.c \
+ stat.c \
+ io.c \
+ geom2.c \
+ poly2.c \
+ merge.c \
+ qhull.c \
+ geom.c \
+ poly.c \
+ qset.c \
+ mem.c
+
+# how:
+libqhull_la_LDFLAGS = -version-info 5:0:0 -lm
+
+### Utility programs
+
+# to:
+bin_PROGRAMS = qhull rbox qconvex qdelaunay qvoronoi qhalf
+
+# from:
+qhull_SOURCES = unix.c
+rbox_SOURCES = rbox.c
+qconvex_SOURCES = qconvex.c
+qdelaunay_SOURCES = qdelaun.c
+qvoronoi_SOURCES = qvoronoi.c
+qhalf_SOURCES = qhalf.c
+
+# how:
+qhull_LDADD = libqhull.la
+rbox_LDADD = libqhull.la
+qconvex_LDADD = libqhull.la
+qdelaunay_LDADD = libqhull.la
+qvoronoi_LDADD = libqhull.la
+qhalf_LDADD = libqhull.la
+
+### Include files
+
+pkginclude_HEADERS = \
+ geom.h \
+ mem.h \
+ poly.h \
+ qhull_a.h \
+ stat.h \
+ io.h \
+ merge.h \
+ qhull.h \
+ qset.h \
+ user.h
+
+
+### Example programs
+
+# to:
+docdir = $(prefix)/share/doc/$(PACKAGE)
+examplesdir = $(docdir)/examples
+
+# which:
+examples_DATA = \
+ user_eg.c \
+ user_eg2.c \
+ qhull_interface.cpp \
+ Makefile.txt \
+ Mborland
+
+doc_DATA = \
+ Changes.txt \
+ index.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
+
+
+### Extra files to be included in the tarball
+
+EXTRA_DIST = \
+ $(doc_DATA) \
+ $(examples_DATA)
diff --git a/config/Makefile.am b/config/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..f4792ca9be5714e0fb8ff312deb0d01f97d183d5
--- /dev/null
+++ b/config/Makefile.am
@@ -0,0 +1,14 @@
+### Makefile.am for the qhull package (config)
+### Author: Rafael Laboissiere <rafael@debian.org>
+### Created: Mon Dec 3 21:36:21 CET 2001
+
+### Extra files to be included in the tarball
+
+EXTRA_DIST = \
+ README \
+ bootstrap.sh \
+ Makefile-am-main \
+ Makefile-am-eg \
+ Makefile-am-html \
+ Makefile-am-src
+
diff --git a/config/README b/config/README
new file mode 100644
index 0000000000000000000000000000000000000000..18e698e08b00679133e91f0fc1dfe4766f3d9c61
--- /dev/null
+++ b/config/README
@@ -0,0 +1,19 @@
+Autotools configuration for Qhull
+---------------------------------
+
+This directory contains all the files needed to bootstrap the Qhull package
+for using Autoconf, Automake, and Libtool.
+
+Go to the top source dir and type:
+
+ config/bootstrap.sh
+
+And then the usual:
+
+ ./configure --prefix=/your/preferred/path/here
+ make
+ make install
+
+
+ -- Rafael Laboissiere <rafael@debian.org>, Sun Feb 1 13:43:54 CET 2004
+
diff --git a/config/bootstrap.sh b/config/bootstrap.sh
new file mode 100644
index 0000000000000000000000000000000000000000..8273529a678e075d6772d7fc6a8a7ed984f1cd0d
--- /dev/null
+++ b/config/bootstrap.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+run () {
+ echo -n Running `$1 --version | sed q`...
+ $* > /dev/null
+ echo " done"
+}
+
+
+if test ! -f config/configure.ac ; then
+ echo "$0: This script must be run from the Qhull top directory."
+ exit 1
+fi
+
+echo -n Copying autoconf and automake files...
+cp config/configure.ac .
+cp config/Makefile-am-main Makefile.am
+for d in src html eg ; do
+ cp config/Makefile-am-$d $d/Makefile.am
+done
+echo " done"
+
+run aclocal \
+ && run libtoolize --force --copy \
+ && run automake --foreign --add-missing --force-missing --copy \
+ && run autoconf
diff --git a/config/configure.ac b/config/configure.ac
new file mode 100644
index 0000000000000000000000000000000000000000..96726884586bcd9991eb7d54a53c5e897439cc48
--- /dev/null
+++ b/config/configure.ac
@@ -0,0 +1,24 @@
+dnl configure.ac for the qhull package
+dnl Author: Rafael Laboissiere <rafael@debian.org>
+dnl Created: Mon Dec 3 21:36:21 CET 2001
+
+AC_INIT(qhull, 2009.1)
+AC_CONFIG_SRCDIR(src/qhull.c)
+
+AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
+
+AM_INIT_AUTOMAKE
+
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ html/Makefile
+ eg/Makefile
+ config/Makefile
+])
+
+AC_OUTPUT
diff --git a/html/index.htm b/html/index.htm
index 8b721617a91a41c3d1b0bb3ff9ca6ebf5037658e..174c84784007102f9d51ea5e6d46074cf1523475 100644
--- a/html/index.htm
+++ b/html/index.htm
@@ -86,7 +86,7 @@ reports the maximum outer and inner plane.
<p><i>Brad Barber, Cambridge MA, 2003/12/30</i></p>
-<p><b>Copyright © 1995-2003 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2003, 2009 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -664,7 +664,7 @@ 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>Qhull 1.0 was developed under National Science Foundation
+<p>Qhull 1.0 and 2.0 were 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>
@@ -683,8 +683,8 @@ Computing Surveys</i>, 1991, 23:345-405. </p>
<p><a name="bar-dob96">Barber</a>, C. B., D.P. Dobkin, and H.T.
Huhdanpaa, "The Quickhull Algorithm for Convex Hulls," <i>ACM
-Transactions on Mathematical Software</i>, Vol. 22, No. 4 (Dec.
-1996), p. 469-483 [<a
+Transactions on Mathematical Software</i>, 22(4):469-483, www.qhull.org
+[<a
href="http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/">http://www.acm.org</a>;
<a href="http://citeseer.nj.nec.com/83502.html">http://citeseer.nj.nec.com</a>].
</p>
diff --git a/html/qh-faq.htm b/html/qh-faq.htm
index a6c507eae64ddc5697c31f9b8cdb2f93d4b02ad9..99ed8d60eff9866042a1c40f1f9f8fdd986bc70d 100644
--- a/html/qh-faq.htm
+++ b/html/qh-faq.htm
@@ -73,7 +73,7 @@ using joggled input ('<A href="qh-optq.htm#QJn">QJ</A>').
2003/12/30 <!--
--> </i></p>
-<p><b>Copyright © 1998-2003 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1998-2003, 2009 The Geometry Center, Minneapolis MN</b></p>
<hr>
diff --git a/html/qh-get.htm b/html/qh-get.htm
index dfcb374f1b707df1bfc1243a387b3b24eab2c6cb..6470417cfad70f5129a38c970f17ac3002f70499 100644
--- a/html/qh-get.htm
+++ b/html/qh-get.htm
@@ -38,6 +38,11 @@ width="100" height="100"></a> Qhull Downloads</h1>
<p>Includes executables, documentation, sources files, and a cygwin Makefile. It runs in a
DOS window.</p>
</li>
+ <li><a href="http://mirrors.linhub.com/savannah/qhull/qhull-2009.1.tar.gz">Download:
+ source for Qhull 2009.1</a> (600K) <p>Type: C source code for
+ 32-bit and 64-bit architectures </p>
+ <p>Includes documentation, source files, and Autotools-based build system.</p>
+ </li>
<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>
@@ -63,7 +68,7 @@ and upgraded it to 2002.1.
<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>
+ <li><a href=http://savannah.nongnu.org/projects/qhull/>Qhull@Savannah</a>
<p>Type: CVS repository</b>
<p>CVS repositiory of Qhull sources, documentation, and Makefiles.
@@ -79,8 +84,7 @@ and upgraded it to 2002.1.
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.
- 469-483, Dec 1996 [<a
+ Transactions on Mathematical Software</i>, 22(4):469-483, Dec 1996 [<a
href="http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/">abstract</a>].</p>
</li>
<li><a
diff --git a/html/qhull.man b/html/qhull.man
index a65d0823222970d54c471ed79b0f975a6f252284..7523b1b26bd86e4a339406034aba238a69021685 100644
--- a/html/qhull.man
+++ b/html/qhull.man
@@ -1,18 +1,18 @@
-./" This is the Unix manual page for qhull, written in nroff, the standard
-./" manual formatter for Unix systems. To format it, type
-./"
-./" nroff -man qhull.man
-./"
-./" This will print a formatted copy to standard output. If you want
-./" to ensure that the output is plain ASCII, free of any control
-./" characters that nroff uses for underlining etc, pipe the output
-./" through "col -b":
-./"
-./" nroff -man qhull.man | col -b
-./"
-./" Warning: a leading quote "'" or dot "." will not format correctly
-./"
-.TH qhull 1 "2003/12/30" "Geometry Center"
+.\" This is the Unix manual page for qhull, written in nroff, the standard
+.\" manual formatter for Unix systems. To format it, type
+.\"
+.\" nroff -man qhull.man
+.\"
+.\" This will print a formatted copy to standard output. If you want
+.\" to ensure that the output is plain ASCII, free of any control
+.\" characters that nroff uses for underlining etc, pipe the output
+.\" through "col -b":
+.\"
+.\" nroff -man qhull.man | col -b
+.\"
+.\" Warning: a leading quote "'" or dot "." will not format correctly
+.\"
+.TH qhull 1 "2009/06/11" "Geometry Center"
.SH NAME
qhull \- convex hull, Delaunay triangulation, Voronoi diagram,
halfspace intersection about a point, hull volume, facet area
@@ -57,7 +57,7 @@ example:
- installation: README.txt
- see also: COPYING.txt, REGISTER.txt, Changes.txt
- WWW: <http://www.qhull.org>
- - CVS: <http://savannah.gnu.org/projects/qhull/>
+ - CVS: <http://savannah.nongnu.org/projects/qhull/>
- mirror: <http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html>
- news: <http://www.qhull.org/news>
- Geomview: <http://www.geomview.org>
@@ -90,16 +90,16 @@ any mismatches with Qhull's html manual (index.htm).
.PP
.SH INTRODUCTION
Qhull is a general dimension code for computing convex hulls, Delaunay
-triangulations, Voronoi diagram, furthest-site Voronoi diagram,
-furthest-site Delaunay triangulations, and
+triangulations, Voronoi diagram, furthest\[hy]site Voronoi diagram,
+furthest\[hy]site Delaunay triangulations, and
halfspace intersections about a point. It implements the Quickhull algorithm for
-computing the convex hull. Qhull handles round-off errors from floating
+computing the convex hull. Qhull handles round\[hy]off errors from floating
point arithmetic. It can approximate a convex hull.
The program includes options for hull volume, facet area, partial hulls,
input transformations, randomization, tracing, multiple output formats, and
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.
+You can view the results in 2\[hy]d, 3\[hy]d and 4\[hy]d with Geomview.
.PP
.SH DESCRIPTION
.PP
@@ -107,7 +107,7 @@ The format of input is the following: first line contains the dimension,
second line contains the number of input points, and point coordinates follow.
The dimension and number of points can be reversed.
Comments and line breaks are ignored. A comment starts with a
-non-numeric character and continues to the end of line. The first comment
+non\[hy]numeric character and continues to the end of line. The first comment
is reported in summaries and statistics.
Error reporting is
better if there is one point per line.
@@ -116,7 +116,7 @@ The default printout option is a short summary. There are many
other output formats.
.PP
Qhull implements the Quickhull algorithm for convex hull. This algorithm combines
-the 2-d Quickhull algorithm with the n-d beneath-beyond algorithm
+the 2\[hy]d Quickhull algorithm with the n\[hy]d beneath\[hy]beyond algorithm
[c.f., Preparata & Shamos '85].
It is similar to the randomized algorithms of Clarkson and
others [Clarkson et al. '93]. The main
@@ -125,12 +125,12 @@ space requirements, and automatic handling of precision problems.
.PP
The data structure produced by Qhull consists of vertices, ridges, and facets.
A vertex is a point of the input set. A ridge is a set of d vertices
-and two neighboring facets. For example in 3-d, a ridge is an edge of the
+and two neighboring facets. For example in 3\[hy]d, a ridge is an edge of the
polyhedron. A facet is a set of ridges, a set of neighboring facets, a set
of incident vertices, and a hyperplane equation. For simplicial facets, the
ridges are defined by the vertices and neighboring facets. When Qhull
-merges two facets, it produces a non-simplicial
-facet. A non-simplicial facet has more than d neighbors and may share more than
+merges two facets, it produces a non\[hy]simplicial
+facet. A non\[hy]simplicial facet has more than d neighbors and may share more than
one ridge with a neighbor.
.PP
.SH IMPRECISION
@@ -139,12 +139,12 @@ Since Qhull uses floating point arithmetic, roundoff error may occur for each
calculation. This causes problems
for most geometric algorithms.
.PP
-Qhull automatically sets option 'C-0' in 2-d, 3-d, and 4-d, or
-option 'Qx' in 5-d and higher. These options handle precision problems
+Qhull automatically sets option 'C\-0' in 2\[hy]d, 3\[hy]d, and 4\[hy]d, or
+option 'Qx' in 5\[hy]d and higher. These options handle precision problems
by merging facets. Alternatively, use option 'QJ' to joggle the
input.
.PP
-With 'C-0', Qhull merges non-convex
+With 'C\-0', Qhull merges non\[hy]convex
facets while constructing the hull. The remaining facets are
clearly convex. With 'Qx', Qhull merges
coplanar horizon facets, flipped facets, concave facets and
@@ -159,7 +159,7 @@ merging will not occur.
.PP
To get a list of the most important options, execute 'qhull' by itself.
To get a complete list of options,
-execute 'qhull -'.
+execute 'qhull \-'.
To get a complete, concise list of options, execute 'qhull .'.
Options can be in any order.
@@ -179,7 +179,7 @@ d
Compute the Delaunay triangulation by lifting the input points to a
paraboloid. The 'o' option prints the input points and facets.
The 'QJ' option guarantees triangular output. The 'Ft'
-option prints a triangulation. It adds points (the centrums) to non-simplicial
+option prints a triangulation. It adds points (the centrums) to non\[hy]simplicial
facets.
.TP
v
@@ -191,7 +191,7 @@ site ID order.
The 'Fv' option prints each ridge of the Voronoi diagram.
The first or zero'th vertex
indicates the infinity vertex. Its coordinates are
-qh_INFINITE (-10.101). It indicates unbounded Voronoi
+qh_INFINITE (\-10.101). It indicates unbounded Voronoi
regions or degenerate Delaunay triangles.
.TP
Hn,n,...
@@ -212,21 +212,21 @@ the second number is "1", and the coordinates complete a line. The 'FV'
option produces a feasible point for a convex hull.
.TP
d Qu
-Compute the furthest-site Delaunay triangulation from the upper
+Compute the furthest\[hy]site Delaunay triangulation from the upper
convex hull. The 'o' option prints the input points and facets.
-The 'QJ' option guarantees triangular otuput. You can also use
-'Ft' to triangulate via the centrums of non-simplicial
+The 'QJ' option guarantees triangular otuput. You can also use 'Ft'
+to triangulate via the centrums of non\[hy]simplicial
facets.
.TP
v Qu
-Compute the furthest-site Voronoi diagram.
+Compute the furthest\[hy]site Voronoi diagram.
The 'p' option prints the Voronoi vertices.
The 'o' option prints the Voronoi vertices and the
vertices in each Voronoi region.
The 'Fv' option prints each ridge of the Voronoi diagram.
The first or zero'th vertex
indicates the infinity vertex at infinity. Its coordinates are
-qh_INFINITE (-10.101). It indicates unbounded Voronoi regions
+qh_INFINITE (\-10.101). It indicates unbounded Voronoi regions
and degenerate Delaunay triangles.
.PP
.TP
@@ -249,23 +249,23 @@ i
Output the incident vertices for each facet.
Qhull prints the number of facets followed by the
vertices of each facet. One facet is printed per line. The numbers
-are the 0-relative indices of the corresponding input points.
+are the 0\[hy]relative indices of the corresponding input points.
The facets
are oriented.
-In 4-d and higher,
-Qhull triangulates non-simplicial facets. Each apex (the first vertex) is
+In 4d and higher,
+Qhull triangulates non\[hy]simplicial facets. Each apex (the first vertex) is
a created point that corresponds to the facet's centrum. Its index is greater
than the indices of the input points. Each base
corresponds to a simplicial ridge between two facets.
To print the vertices without triangulation, use option 'Fv'.
.TP
m
-Output the hull in Mathematica format. Qhull writes a Mathematica file for 2-d and 3-d
-convex hulls and for 2-d Delaunay triangulations. Qhull produces a list of objects
+Output the hull in Mathematica format. Qhull writes a Mathematica file for 2\[hy]d and 3\[hy]d
+convex hulls and for 2\[hy]d Delaunay triangulations. Qhull produces a list of objects
that you can assign to a variable in Mathematica, for example:
-"list= << <outputfilename> ". If the object is 2-d, it can be
-visualized by "Show[Graphics[list]] ". For 3-d objects the command is
+"list= << <outputfilename> ". If the object is 2\[hy]d, it can be
+visualized by "Show[Graphics[list]] ". For 3\[hy]d objects the command is
"Show[Graphics3D[list]]".
.TP
n
@@ -281,10 +281,10 @@ of facets, and number of ridges. Then it prints the coordinates of
the input points and the vertices for each facet. Each facet is on
a separate line. The first number is the number of vertices. The
remainder are the indices of the corresponding points. The vertices are
-oriented in 2-d, 3-d, and in simplicial facets.
+oriented in 2\[hy]d, 3\[hy]d, and in simplicial facets.
-For 2-d Voronoi diagrams,
-the vertices are sorted by adjacency, but not oriented. In 3-d and higher,
+For 2\[hy]d Voronoi diagrams,
+the vertices are sorted by adjacency, but not oriented. In 3\[hy]d and higher,
the Voronoi vertices are sorted by index.
See the 'v' option for more information.
.TP
@@ -306,7 +306,7 @@ number of good facets (if 'Pg'), and statistics.
The last two statistics (if needed) measure the maximum distance
from a point or vertex to a
facet. The number in parenthesis (e.g., 2.1x) is the ratio between the
-maximum distance and the worst-case distance due to merging
+maximum distance and the worst\[hy]case distance due to merging
two simplicial facets.
.PP
.TP
@@ -317,45 +317,45 @@ Maximum angle given as a cosine. If the angle between a pair of facet
normals
is greater than n, Qhull merges one of the facets into a neighbor.
If 'n' is negative, Qhull tests angles after adding
-each point to the hull (pre-merging).
+each point to the hull (pre\[hy]merging).
If 'n' is positive, Qhull tests angles after
-constructing the hull (post-merging).
-Both pre- and post-merging can be defined.
+constructing the hull (post\[hy]merging).
+Both pre\[hy] and post\[hy]merging can be defined.
-Option 'C0' or 'C-0' is set if the corresponding 'Cn' or 'C-n'
+Option 'C0' or 'C\-0' is set if the corresponding 'Cn' or 'C\-n'
is not set. If 'Qx'
-is set, then 'A-n' and 'C-n' are checked after the hull is constructed
+is set, then 'A\-n' and 'C\-n' are checked after the hull is constructed
and before 'An' and 'Cn' are checked.
.TP
Cn
Centrum radius.
If a centrum is less than n below a neighboring facet, Qhull merges one
of the facets.
-If 'n' is negative or '-0', Qhull tests and merges facets after adding
-each point to the hull. This is called "pre-merging". If 'n' is positive,
-Qhull tests for convexity after constructing the hull ("post-merging").
-Both pre- and post-merging can be defined.
+If 'n' is negative or '\-0', Qhull tests and merges facets after adding
+each point to the hull. This is called "pre\[hy]merging". If 'n' is positive,
+Qhull tests for convexity after constructing the hull ("post\[hy]merging").
+Both pre\[hy] and post\[hy]merging can be defined.
-For 5-d and higher, 'Qx' should be used
-instead of 'C-n'. Otherwise, most or all facets may be merged
+For 5\[hy]d and higher, 'Qx' should be used
+instead of 'C\-n'. Otherwise, most or all facets may be merged
together.
.TP
En
Maximum roundoff error for distance computations.
.TP
Rn
-Randomly perturb distance computations up to +/- n * max_coord.
+Randomly perturb distance computations up to +/\- n * max_coord.
This option perturbs every distance, hyperplane, and angle computation.
-To use time as the random number seed, use option 'QR-1'.
+To use time as the random number seed, use option 'QR\-1'.
.TP
Vn
Minimum distance for a facet to be visible.
A facet is visible if the distance from the point to the
facet is greater than 'Vn'.
-Without merging, the default value for 'Vn' is the round-off error ('En').
-With merging, the default value is the pre-merge centrum ('C-n') in 2-d or
-3--d, or three times that in other dimensions. If the outside width
+Without merging, the default value for 'Vn' is the round\[hy]off error ('En').
+With merging, the default value is the pre\[hy]merge centrum ('C\-n') in 2\[hy]d or
+3\[hy]d, or three times that in other dimensions. If the outside width
is specified ('Wn'), the maximum, default value for 'Vn' is 'Wn'.
.TP
Un
@@ -366,9 +366,9 @@ Wn
Minimum outside width of the hull. Points are added to the convex hull
only if they are clearly outside of a facet. A point is outside of a
facet if its distance to the facet is greater than 'Wn'. The normal
-value for 'Wn' is 'En'. If the user specifies pre-merging and
+value for 'Wn' is 'En'. If the user specifies pre\[hy]merging and
does not set 'Wn', than 'Wn' is set
-to the premerge 'Cn' and maxcoord*(1-An).
+to the premerge 'Cn' and maxcoord*(1\-An).
.PP
.TP
Additional input/output formats
@@ -380,14 +380,14 @@ For Voronoi diagrams, the area is the area of the dual facet.
Use 'PAn' for printing the n largest facets, and option 'PFn' for
printing facets larger than 'n'.
-The area for non-simplicial facets is the sum of the
+The area for non\[hy]simplicial facets is the sum of the
areas for each ridge to the centrum. Vertices far below
the facet's hyperplane are ignored.
The reported area may be significantly less than the actual area.
.TP
FA
Compute the total area and volume for option 's'. It is an approximation
-for non-simplicial facets (see 'Fa').
+for non\[hy]simplicial facets (see 'Fa').
.TP
Fc
Print coplanar points for each facet. The output starts with the
@@ -435,8 +435,8 @@ of ridges. Then each hyperplane is printed, one per line. A line starts
with the number of indices and floats. The first pair lists
adjacent input
sites, the next d floats are the normalized coefficients for the hyperplane,
-and the last float is the offset. The hyperplane is oriented toward
-'QVn' (if defined), or the first input site of the pair. Use 'Tv' to
+and the last float is the offset. The hyperplane is oriented toward 'QVn'
+(if defined), or the first input site of the pair. Use 'Tv' to
verify that the hyperplanes are perpendicular bisectors. Use 'Fo' for
unbounded regions, and 'Fv' for the corresponding Voronoi vertices.
.TP
@@ -449,8 +449,8 @@ 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 2\[hy]d and 3\[hy]d
+convex hulls and for 2\[hy]d Delaunay triangulations. Qhull produces a '.mpl'
file for displaying with display3d().
.TP
Fn
@@ -486,8 +486,8 @@ of ridges. Then each hyperplane is printed, one per line. A line starts
with the number of indices and floats. The first pair lists
adjacent input
sites, the next d floats are the normalized coefficients for the hyperplane,
-and the last float is the offset. The hyperplane is oriented toward
-'QVn' (if defined), or the first input site of the pair. Use 'Tv' to
+and the last float is the offset. The hyperplane is oriented toward 'QVn'
+(if defined), or the first input site of the pair. Use 'Tv' to
verify that the hyperplanes are perpendicular bisectors. Use 'Fi' for
bounded regions, and 'Fv' for the corresponding Voronoi vertices.
.TP
@@ -498,7 +498,7 @@ are printed to stdout.
Fp
Print points for halfspace intersections (option 'Hn,n,...'). Each
intersection corresponds to a facet of the dual polytope.
-The "infinity" point [-10.101,-10.101,...]
+The "infinity" point [\-10.101,\-10.101,...]
indicates an unbounded intersection.
.TP
FP
@@ -530,15 +530,14 @@ versions of Qhull may produce additional integers or reals.
The total volume measures the volume
of the intersection of the halfspaces defined by each facet.
Both area and volume are
-approximations for non-simplicial facets. See option 'Fa'.
+approximations for non\[hy]simplicial facets. See option 'Fa'.
.TP
Ft
-Print a triangulation with added points for non-simplicial
+Print a triangulation with added points for non\[hy]simplicial
facets. The first line is the dimension and the second line is the
number of points and the number of facets. The points follow, one
-per line, then the facets follow as a list of point indices. With option
-'Qz', the
-points include the point-at-infinity.
+per line, then the facets follow as a list of point indices. With option 'Qz', the
+points include the point\[hy]at\[hy]infinity.
.TP
Fv
Print vertices for each facet. The first line is the number
@@ -551,7 +550,7 @@ Print all ridges of a Voronoi diagram. The first line is the number
of ridges. Then each ridge is printed, one per line. A line starts
with the number of indices. The first pair lists adjacent input
sites, the remaining indices list Voronoi vertices. Vertex '0' indicates
-the vertex-at-infinity (i.e., an unbounded ray). In 3-d, the vertices
+the vertex\[hy]at\[hy]infinity (i.e., an unbounded ray). In 3\[hy]d, the vertices
are listed in order. See 'Fi' and 'Fo' for separating hyperplanes.
.TP
FV
@@ -561,8 +560,8 @@ for halfspace intersection.
Fx
List extreme points (vertices) of the convex hull. The first line
is the number of points. The other lines give the indices of the
-corresponding points. The first point is '0'. In 2-d, the points
-occur in counter-clockwise order; otherwise they occur in input order.
+corresponding points. The first point is '0'. In 2\[hy]d, the points
+occur in counter\[hy]clockwise order; otherwise they occur in input order.
For Delaunay triangulations, 'Fx' lists the extreme points of the
input sites. The points are unordered.
.PP
@@ -571,12 +570,12 @@ Geomview options
.TP
G
Produce a file for viewing with Geomview. Without other options,
-Qhull displays edges in 2-d, outer planes in 3-d, and ridges in 4-d.
+Qhull displays edges in 2\[hy]d, outer planes in 3\[hy]d, and ridges in 4\[hy]d.
A ridge can be
-explicit or implicit. An explicit ridge is a dim-1 dimensional simplex
+explicit or implicit. An explicit ridge is a dim\-1 dimensional simplex
between two facets.
-In 4-d, the explicit ridges are triangles.
-When displaying a ridge in 4-d, Qhull projects the ridge's vertices to
+In 4\[hy]d, the explicit ridges are triangles.
+When displaying a ridge in 4\[hy]d, Qhull projects the ridge's vertices to
one of its facets' hyperplanes.
Use 'Gh' to
project ridges to the intersection of both hyperplanes.
@@ -585,24 +584,24 @@ Ga
Display all input points as dots.
.TP
Gc
-Display the centrum for each facet in 3-d. The centrum is defined by a
+Display the centrum for each facet in 3\[hy]d. The centrum is defined by a
green radius sitting on a blue plane. The plane corresponds to the
facet's hyperplane.
-The radius is defined by 'C-n' or 'Cn'.
+The radius is defined by 'C\-n' or 'Cn'.
.TP
GDn
-Drop dimension n in 3-d or 4-d. The result is a 2-d or 3-d object.
+Drop dimension n in 3\[hy]d or 4\[hy]d. The result is a 2\[hy]d or 3\[hy]d object.
.TP
Gh
-Display hyperplane intersections in 3-d and 4-d. In 3-d, the
+Display hyperplane intersections in 3\[hy]d and 4\[hy]d. In 3\[hy]d, the
intersection is a black line. It lies on two neighboring hyperplanes
-(c.f., the blue squares associated with centrums ('Gc')). In 4-d,
+(c.f., the blue squares associated with centrums ('Gc')). In 4\[hy]d,
the ridges are projected to the intersection of both hyperplanes.
.TP
Gi
-Display inner planes in 2-d and 3-d. The inner plane of a facet
+Display inner planes in 2\[hy]d and 3\[hy]d. The inner plane of a facet
is below all of its vertices. It is parallel to the facet's hyperplane.
-The inner plane's color is the opposite (1-r,1-g,1-b) of the outer
+The inner plane's color is the opposite (1\-r,1\-g,1\-b) of the outer
plane. Its edges are determined by the vertices.
.TP
Gn
@@ -613,7 +612,7 @@ not display the inner plane if the
the difference between inner and outer is too small.
.TP
Go
-Display outer planes in 2-d and 3-d. The outer plane of a facet
+Display outer planes in 2\[hy]d and 3\[hy]d. The outer plane of a facet
is above all input points. It is parallel to the facet's hyperplane.
Its color is determined by the facet's normal, and its
edges are determined by the vertices.
@@ -622,15 +621,15 @@ Gp
Display coplanar points and vertices as radii. A radius defines a ball
which corresponds to the imprecision of the point. The imprecision is
the maximum of the roundoff error, the centrum radius, and maxcoord *
-(1-An). It is at least 1/20'th of the maximum coordinate,
-and ignores post-merging if pre-merging is done.
+(1\-An). It is at least 1/20'th of the maximum coordinate,
+and ignores post\[hy]merging if pre\[hy]merging is done.
.TP
Gr
-Display ridges in 3-d. A ridge connects the two vertices that are shared
-by neighboring facets. Ridges are always displayed in 4-d.
+Display ridges in 3\[hy]d. A ridge connects the two vertices that are shared
+by neighboring facets. Ridges are always displayed in 4\[hy]d.
.TP
Gt
-A 3-d Delaunay triangulation looks like a convex hull with interior
+A 3\[hy]d Delaunay triangulation looks like a convex hull with interior
facets. Option 'Gt' removes the outside ridges to reveal the outermost
facets. It automatically sets options 'Gr' and 'GDn'.
.TP
@@ -689,12 +688,12 @@ Qhull control options
.TP
Qbk:0Bk:0
Drop dimension k from the input points. This allows the user to
-take convex hulls of sub-dimensional objects. It happens before
+take convex hulls of sub\[hy]dimensional objects. It happens before
the Delaunay and Voronoi transformation.
.TP
QbB
Scale the input points to fit the unit cube. After scaling, the lower
-bound will be -0.5 and the upper bound +0.5 in all dimensions.
+bound will be \-0.5 and the upper bound +0.5 in all dimensions.
For Delaunay and
Voronoi diagrams, scaling happens after projection to the paraboloid.
Under precise
@@ -710,7 +709,7 @@ arithmetic, scaling does not change the topology of the convex hull.
.TP
Qbk:n
Scale the k'th coordinate of the input points. After scaling, the lower
-bound of the input points will be n. 'Qbk' scales to -0.5.
+bound of the input points will be n. 'Qbk' scales to \-0.5.
.TP
QBk:n
Scale the k'th coordinate of the input points. After scaling, the upper
@@ -741,7 +740,7 @@ Keep interior points with the nearest facet.
Output formats 'p', 'f', 'Gp', 'FN', 'FP', and 'Fc' will print the points.
.TP
QJn
-Joggle each input coordinate by adding a random number in [-n,n]. If a
+Joggle each input coordinate by adding a random number in [\-n,n]. If a
precision error occurs, then qhull increases n and tries again. It does
not increase n beyond a certain value, and it stops after a certain number
of attempts [see user.h]. Option 'QJ'
@@ -760,7 +759,7 @@ is not reported since the randomization is inefficient.
.TP
QRn
Randomly rotate the input points. If n=0, use time as the random number seed.
-If n>0, use n as the random number seed. If n=-1, don't rotate but use
+If n>0, use n as the random number seed. If n=\-1, don't rotate but use
time as the random number seed. For Delaunay triangulations ('d' and 'v'),
rotate about the last axis.
.TP
@@ -768,12 +767,12 @@ Qs
Search all points for the initial simplex.
.TP
Qt
-Triangulated output. Triangulate all non-simplicial facets. See also 'QJ'.
+Triangulated output. Triangulate all non\[hy]simplicial facets. See also 'QJ'.
.TP
Qv
-Test vertex neighbors for convexity after post-merging.
+Test vertex neighbors for convexity after post\[hy]merging.
To use the 'Qv' option, you also need to set a merge option
-(e.g., 'Qx' or 'C-0').
+(e.g., 'Qx' or 'C\-0').
.TP
QVn
A good facet (see 'Qg' and 'Pg') includes point n. If n<0, then a good facet does not
@@ -783,13 +782,13 @@ is the first point added to the hull. Option 'QVn' may not be used with merging
Qx
Perform exact merges while building the hull. The "exact" merges
are merging a point into a coplanar facet (defined by 'Vn', 'Un',
-and 'C-n'), merging concave facets, merging duplicate ridges, and
-merging flipped facets. Coplanar merges and angle coplanar merges ('A-n')
+and 'C\-n'), merging concave facets, merging duplicate ridges, and
+merging flipped facets. Coplanar merges and angle coplanar merges ('A\-n')
are not performed. Concavity testing is delayed until a merge occurs.
After
-the hull is built, all coplanar merges are performed (defined by 'C-n'
-and 'A-n'), then post-merges are performed
+the hull is built, all coplanar merges are performed (defined by 'C\-n'
+and 'A\-n'), then post\[hy]merges are performed
(defined by 'Cn' and 'An').
.TP
Qz
@@ -801,8 +800,8 @@ of cospherical points.
Qhull experiments and speedups
.TP
Q0
-Turn off pre-merging as a default option.
-With 'Q0'/'Qx' and without explicit pre-merge options, Qhull
+Turn off pre\[hy]merging as a default option.
+With 'Q0'/'Qx' and without explicit pre\[hy]merge options, Qhull
ignores precision issues while constructing the convex hull. This
may lead to precision errors. If so, a descriptive warning is
generated.
@@ -826,14 +825,14 @@ With 'Q5', Qhull does not correct outer planes at the end. The
maximum outer plane is used instead.
.TP
Q6
-With 'Q6', Qhull does not pre-merge concave or coplanar facets.
+With 'Q6', Qhull does not pre\[hy]merge concave or coplanar facets.
.TP
Q7
-With 'Q7', Qhull processes facets in depth-first order instead of
-breadth-first order.
+With 'Q7', Qhull processes facets in depth\[hy]first order instead of
+breadth\[hy]first order.
.TP
Q8
-With 'Q8' and merging, Qhull does not retain near-interior points for adjusting
+With 'Q8' and merging, Qhull does not retain near\[hy]interior points for adjusting
outer planes. 'Qc' will probably retain
all points that adjust outer planes.
.TP
@@ -850,7 +849,7 @@ With 'Q11', Qhull copies normals and recompute centrums for tricoplanar facets.
Trace options
.TP
Tn
-Trace at level n. Qhull includes full execution tracing. 'T-1'
+Trace at level n. Qhull includes full execution tracing. 'T\-1'
traces events. 'T1' traces
the overall execution of the program. 'T2' and 'T3' trace overall
execution and geometric and topological events. 'T4' traces the
@@ -868,7 +867,7 @@ See also 'TVn'.
.TP
TFn
Report progress whenever more than n facets are created
-During post-merging, 'TFn'
+During post\[hy]merging, 'TFn'
reports progress after more than n/2 merges.
.TP
TI file
@@ -900,8 +899,8 @@ Option 'Tv' does not check point inclusion if forcing output with 'Po',
or if 'Q5' is set.
For point inclusion testing, Qhull verifies that all points are below
-all outer planes (facet->maxoutside). Point inclusion is exhaustive
-if merging or if the facet-point product is small enough;
+all outer planes (facet\->maxoutside). Point inclusion is exhaustive
+if merging or if the facet\[hy]point product is small enough;
otherwise Qhull verifies each point with a directed
search (qh_findbest).
@@ -945,9 +944,9 @@ incorporating Qhull into your own program.
When you do report an error, please attach a data set to the
end of your message. This allows us to see the error for ourselves.
-Qhull is maintained part-time.
+Qhull is maintained part\[hy]time.
.PP
-.SH E-MAIL
+.SH E\[hy]MAIL
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.
@@ -957,23 +956,23 @@ and news (any bugs that get fixed, etc.), let us know and we will add you to
our mailing list. If you would like to communicate with other
Qhull users, we 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
+comp.graphics.algorithms and sci.math.num\-analysis
.SH SEE ALSO
rbox(1)
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/
+Trans. on Mathematical Software, 22(4):469\[en]483, Dec. 1996.
+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 Geometry: Theory and Applications,
-vol. 3, p. 185-211, 1993.
+vol. 3, p. 185\[en]211, 1993.
Preparata, F. and M. Shamos, Computational
-Geometry, Springer-Verlag, New York, 1985.
+Geometry, Springer\[hy]Verlag, New York, 1985.
.PP
.SH AUTHORS
@@ -994,13 +993,13 @@ Geometry, Springer-Verlag, New York, 1985.
A special thanks to Albert Marden, Victor Milenkovic, the Geometry Center,
Harvard University, and Endocardial Solutions, Inc. for supporting this work.
-The software was developed under National Science Foundation grants
-NSF/DMS-8920161 and NSF-CCR-91-15793 750-7504. David Dobkin guided
-the original work at Princeton University.
+Qhull 1.0 and 2.0 were developed under National Science Foundation
+grants NSF/DMS\[hy]8920161 and NSF\[hy]CCR\[hy]91\[hy]15793 750\[hy]7504. David Dobkin
+guided the original work at Princeton University.
If you find it useful, please let us know.
-The Geometry Center is supported by grant DMS-8920161 from the National
-Science Foundation, by grant DOE/DE-FG02-92ER25137 from the Department
+The Geometry Center is supported by grant DMS\[hy]8920161 from the National
+Science Foundation, by grant DOE/DE\[hy]FG02\[hy]92ER25137 from the Department
of Energy, by the University of Minnesota, and by Minnesota Technology, Inc.
Qhull is available from http://www.qhull.org
diff --git a/html/qhull.txt b/html/qhull.txt
index f3b2f88f7db800a691935555888372bc4bb8e059..847f3c7313b025a8d3e037af1b9f43fb3ecc176c 100644
--- a/html/qhull.txt
+++ b/html/qhull.txt
@@ -46,7 +46,7 @@ SYNOPSIS
- installation: README.txt
- see also: COPYING.txt, REGISTER.txt, Changes.txt
- WWW: <http://www.qhull.org>
- - CVS: <http://savannah.gnu.org/projects/qhull/>
+ - CVS: <http://savannah.nongnu.org/projects/qhull/>
- mirror: <http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html>
- news: <http://www.qhull.org/news>
- Geomview: <http://www.geomview.org>
@@ -1158,7 +1158,7 @@ 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.
+ ematical Software, 22(4):469-483, Dec. 1996.
http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/
http://citeseer.nj.nec.com/83502.html
@@ -1190,8 +1190,8 @@ ACKNOWLEDGEMENTS
Geometry Center, Harvard University, and Endocardial Solu-
tions, Inc. for supporting this work.
- The software was developed under National Science Founda-
- tion grants NSF/DMS-8920161 and NSF-CCR-91-15793 750-7504.
+ Qhull 1.0 and 2.0 were developed under National Science Foundation
+ grants NSF/DMS-8920161 and NSF-CCR-91-15793 750-7504. David Dobkin
@@ -1204,15 +1204,13 @@ Geometry Center 2003/12/30 18
qhull(1) qhull(1)
- David Dobkin guided the original work at Princeton Univer-
- sity. If you find it useful, please let us know.
+ guided the original work at Princeton University.
- 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 Uni-
- versity of Minnesota, and by Minnesota Technology, Inc.
+ 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 at http://www.qhull.org
+ Qhull is available from http://www.qhull.org
diff --git a/html/rbox.man b/html/rbox.man
index 13ad4a38cfbacceb44926b595a389516c66b3900..84b0ffbe733e637c504e5d2aec62aa11e86e05fc 100644
--- a/html/rbox.man
+++ b/html/rbox.man
@@ -1,15 +1,15 @@
-./" This is the Unix manual page for rbox, written in nroff, the standard
-./" manual formatter for Unix systems. To format it, type
-./"
-./" nroff -man rbox.man
-./"
-./" This will print a formatted copy to standard output. If you want
-./" to ensure that the output is plain ascii, free of any control
-./" characters that nroff uses for underlining etc, pipe the output
-./" through "col -b":
-./"
-./" nroff -man rbox.man | col -b
-./"
+.\" This is the Unix manual page for rbox, written in nroff, the standard
+.\" manual formatter for Unix systems. To format it, type
+.\"
+.\" nroff -man rbox.man
+.\"
+.\" This will print a formatted copy to standard output. If you want
+.\" to ensure that the output is plain ascii, free of any control
+.\" characters that nroff uses for underlining etc, pipe the output
+.\" through "col -b":
+.\"
+.\" nroff -man rbox.man | col -b
+.\"
.TH rbox 1 "August 10, 1998" "Geometry Center"
.SH NAME
rbox \- generate point distributions for qhull
@@ -19,8 +19,8 @@ Command "rbox" (w/o arguments) lists the options.
.PP
rbox generates random or regular points according to the options given, and
outputs
-the points to stdout. The points are generated in a cube, unless 's' or
-'k' option is
+the points to stdout. The points are generated in a cube, unless 's' or 'k'
+option is
given. The format of the output is the following: first line
contains the dimension and a comment,
second line contains the number of points, and the
@@ -32,25 +32,25 @@ rbox 10
10 random points in the unit cube centered at the origin.
.TP
rbox 10 s D2
-10 random points on a 2-d circle.
+10 random points on a 2\[hy]d circle.
.TP
rbox 100 W0
100 random points on the surface of a cube.
.TP
rbox 1000 s D4
-1000 random points on a 4-d sphere.
+1000 random points on a 4\[hy]d sphere.
.TP
rbox c D5 O0.5
-a 5-d hypercube with one corner at the origin.
+a 5\[hy]d hypercube with one corner at the origin.
.TP
rbox d D10
-a 10-d diamond.
+a 10\[hy]d diamond.
.TP
rbox x 1000 r W0
100 random points on the surface of a fixed simplex
.TP
rbox y D12
-a 12-d simplex.
+a 12\[hy]d simplex.
.TP
rbox l 10
10 random points along a spiral
@@ -62,22 +62,22 @@ rbox 1000 L10000 D4 s
1000 random points on the surface of a narrow lens.
.TP
rbox c G2 d G3
-a cube with coordinates +2/-2 and a diamond with coordinates +3/-3.
+a cube with coordinates +2/\-2 and a diamond with coordinates +3/\-3.
.TP
rbox 64 M3,4 z
-a rotated, {0,1,2,3} x {0,1,2,3} x {0,1,2,3} lattice (Mesh) of integer points.
-'rbox 64 M1,0' is orthogonal.
+a rotated, {0,1,2,3} x {0,1,2,3} x {0,1,2,3} lattice (Mesh) of integer
+points. 'rbox 64 M1,0' is orthogonal.
.TP
rbox P0 P0 P0 P0 P0
-5 copies of the origin in 3-d. Try 'rbox P0 P0 P0 P0 P0 | qhull QJ'.
+5 copies of the origin in 3\-d. Try 'rbox P0 P0 P0 P0 P0 | qhull QJ'.
.TP
r 100 s Z1 G0.1
-two cospherical 100-gons plus another cospherical point.
+two cospherical 100\-gons plus another cospherical point.
.TP
100 s Z1
a cone of points.
.TP
-100 s Z1e-7
+100 s Z1e\-7
a narrow cone of points with many precision errors.
.SH OPTIONS
.TP
@@ -85,22 +85,22 @@ n
number of points
.TP
Dn
-dimension n-d (default 3-d)
+dimension n\[hy]d (default 3\[hy]d)
.TP
Bn
bounding box coordinates (default 0.5)
.TP
l
-spiral distribution, available only in 3-d
+spiral distribution, available only in 3\[hy]d
.TP
Ln
lens distribution of radius n. May be used with 's', 'r', 'G', and 'W'.
.TP
Mn,m,r
-lattice (Mesh) rotated by {[n,-m,0], [m,n,0], [0,0,r], ...}.
+lattice (Mesh) rotated by {[n,\-m,0], [m,n,0], [0,0,r], ...}.
Use 'Mm,n' for a rigid rotation with r = sqrt(n^2+m^2). 'M1,0' is an
-orthogonal lattice. For example, '27 M1,0' is {0,1,2} x {0,1,2} x {0,1,2}.
-'27 M3,4 z' is a rotated integer lattice.
+orthogonal lattice. For example, '27 M1,0' is {0,1,2} x {0,1,2} x
+{0,1,2}. '27 M3,4 z' is a rotated integer lattice.
.TP
s
cospherical points randomly generated in a cube and projected to the unit sphere
@@ -118,13 +118,13 @@ c
add a unit cube to the output
.TP
c Gm
-add a cube with all combinations of +m and -m to the output
+add a cube with all combinations of +m and \-m to the output
.TP
d
add a unit diamond to the output.
.TP
d Gm
-add a diamond made of 0, +m and -m to the output
+add a diamond made of 0, +m and \-m to the output
.TP
Pn,m,r
add point [n,m,r] to the output first. Pad coordinates with 0.0.
@@ -143,12 +143,12 @@ set the random number seed to n.
.TP
z
generate integer coordinates. Use 'Bn' to change the range.
-The default is 'B1e6' for six-digit coordinates. In R^4, seven-digit
+The default is 'B1e6' for six\[hy]digit coordinates. In R^4, seven\[hy]digit
coordinates will overflow hyperplane normalization.
.TP
Zn s
restrict points to a disk about the z+ axis and the sphere (default Z1.0).
-Includes the opposite pole. 'Z1e-6' generates degenerate points under
+Includes the opposite pole. 'Z1e\-6' generates degenerate points under
single precision.
.TP
Zn Gm s
diff --git a/index.htm b/index.htm
index 9cb22f91bb3905c473b2e997f61f28cc9e69c341..34b82e23629e520956227bbe20d4ac4dd51e9032 100644
--- a/index.htm
+++ b/index.htm
@@ -45,19 +45,25 @@ and higher. </p>
</td></tr></table>
<hr>
+<form method=get action=http://www.google.com/search>
+<input type=hidden name=as_q value=site:www.qhull.org>
+<input type=hidden name=num value=100>
<ul>
- <li><a href="http://www.qhull.org/news">News</a> about Qhull </li>
+ <li><a href="http://www.qhull.org/news">News</a> and
+ <a href="http://www.qhull.org/news/qhull-news.html#bugs">Bugs</a>
+ about Qhull 2009.1 2009/06/11</li>
<li><a href="http://www.qhull.org/download">Download</a>
Qhull</li>
<li><a
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=http://savannah.nongnu.org/projects/qhull/>Development</a> at Savannah
+ <li><input name=as_q size=10> search www.qhull.org
<p>
- <li><a href="http://www.qhull.org/news/qhull-news.html#use">How</a> is Qhull used?</li>
+ <li><a href="http://www.qhull.org/news/qhull-news.html#users">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,
+ <li><a href=http://www.google.com/search?as_q=qhull+-debian+-cvs+-gentoo+-pool+-mirrors&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?
@@ -78,6 +84,7 @@ and higher. </p>
<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>
+</form>
<p><b>Introduction</b>
<ul>
@@ -184,15 +191,14 @@ 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 from <a
-href="http://citeseer.nj.nec.com/83502.html">CiteSeer</a>:
+href="http://citeseer.nj.nec.com/83502.html">CiteSeer</a> or <a
+ href="http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/">www.acm.org</a>:
</p>
<blockquote>
<p>Barber, C.B., Dobkin, D.P., and Huhdanpaa, H.T., "The
Quickhull algorithm for convex hulls," <i>ACM Trans. on
- Mathematical Software</i>, Dec 1996. <a
- href="http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/">http://www.acm.org</a>;
- </p>
+ Mathematical Software</i>, 22(4):469-483, Dec 1996, http://www.qhull.org. </p>
</blockquote>
<p>Abstract: </p>
diff --git a/project/debian/README.Debian b/project/debian/README.Debian
new file mode 100644
index 0000000000000000000000000000000000000000..8ba1170d40ec26218c00b07995334eac4c800236
--- /dev/null
+++ b/project/debian/README.Debian
@@ -0,0 +1,30 @@
+qhull for Debian
+================
+
+Usage
+-----
+
+The library's functionality can be accessed from the command line
+using the executable "qhull". Random distributions of points can be
+drawn for testing and experimentation using "rbox".
+
+
+Registering
+-----------
+
+The upstream authors would like to find out how you are using their
+software. Look at /usr/share/doc/qhull/REGISTER.txt to know how to send
+them feedback.
+
+
+Documentation
+-------------
+
+Documentation in HTML format is available starting in the file
+/usr/share/doc/qhull/qh-man.htm. There are also some exemples in the
+directory /usr/share/doc/qhull/examples.
+
+
+
+ -- Rafael Laboissiere <rafael@debian.org>, Mon Dec 3 20:20:07 CET 2001
+
diff --git a/project/debian/TODO b/project/debian/TODO
new file mode 100644
index 0000000000000000000000000000000000000000..912892fc5ad7da128c1ef661b6c7ae077a91338b
--- /dev/null
+++ b/project/debian/TODO
@@ -0,0 +1,14 @@
+[This file was originally written by Barak Pearlmutter <bap@cs.unm.edu>]
+
+The random number generator in src/geom2.c makes me suspicious.
+Maybe it would be better to switch to random(3).
+
+The include files used in user code have lots of stuff in them that
+really only the library needs. These could be split out.
+
+Hook into that debian library-switches gizmo.
+
+Separate versions of all functions for various floating point
+precisions. Perhaps via multiple #include's.
+
+Convert executables to getopt and --help, and stop using isatty.
diff --git a/project/debian/changelog b/project/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..d2b75d13b918096af705bb6b8b3237c04ac05745
--- /dev/null
+++ b/project/debian/changelog
@@ -0,0 +1,92 @@
+qhull (2003.1-1) unstable; urgency=low
+
+ * New upstream release. There are backward incompatibilities in the code
+ and the soversion was bumped to libqhull5.
+ * debian/rules:
+ - Major rewrite of build and install rules, since we are using now the
+ upstream tarball generated with "make dist".
+ - Added config rule.
+ - Use dpatch to patch src/user.h (enable qh_QHpointer).
+ * debian/control:
+ - Removed build-dependencies on autoconf, automake, and libtool.
+ - Build-depends on dpatch.
+ - Changed section of libqhull-dev package to libdevel.
+ * debian/libqhull-dev.files: Added usr/share/doc/libqhull5/src
+ directory.
+
+ -- Rafael Laboissiere <rafael@debian.org> Sun, 1 Feb 2004 01:14:13 +0100
+
+qhull (2002.1-4) unstable; urgency=low
+
+ * src/Make-config.sh: Patched upstream file for proper initialization of
+ the Autotools.
+ * debian/install-src-html.sh: Added script for including src/*.htm
+ source documentation files into html doc dir.
+ * debian/control:
+ - Bumped Standards-Version to 3.6.1 (no changes needed).
+ - Changed build-dependencies to autoconf and automake1.7 (instead of
+ autoconf2.13 and automake1.6). Added eperl.
+ * debian/libqhull-dev.files: Added dir usr/share/doc/libqhull4/src.
+ * debian/manpage.in: Added template for missing man pages.
+ * debian/rules:
+ - Call debian/install-src-html.sh.
+ - Generate manpages for qconvex, qdelaunay, qhalf, and qvoronoi
+ commands. Lintian is happy now.
+
+ -- Rafael Laboissiere <rafael@debian.org> Thu, 18 Dec 2003 21:20:14 +0100
+
+qhull (2002.1-3) unstable; urgency=low
+
+ * New maintainer (as per http://lists.debian.org/debian-devel/1999
+ /debian-devel-199911/msg01061.html).
+ * debian/rules: Use the upstream script Make-config.sh, which sets up
+ the autoconf/automake/libtool files. Also, clean up all the generated
+ files in the clean rule.
+ * debian/control: Bumped Standards-Version to 3.5.7. Added
+ Build-Dependencies to autoconf/automake/libtool.
+
+ -- Rafael Laboissiere <rafael@debian.org> Wed, 25 Sep 2002 10:39:30 +0200
+
+qhull (2002.1-2) unstable; urgency=low
+
+ * use shared char* qh_version in library
+
+ -- Barak Pearlmutter <bap@cs.unm.edu> Sat, 7 Sep 2002 10:34:13 -0600
+
+qhull (2002.1-1) unstable; urgency=low
+
+ * new upstream source
+
+ -- Barak Pearlmutter <bap@cs.unm.edu> Thu, 5 Sep 2002 20:51:10 -0600
+
+qhull (3.1-5) unstable; urgency=low
+
+ * rephrase descriptions (closes: #141027)
+
+ -- Barak Pearlmutter <bap@cs.unm.edu> Thu, 11 Apr 2002 22:12:33 -0600
+
+qhull (3.1-4) unstable; urgency=low
+
+ * include executables qconvex, qhalf, qvoronoi, qdelaunay
+ * break executables out into separate package qhull-bin
+
+ -- Barak Pearlmutter <bap@cs.unm.edu> Wed, 27 Mar 2002 20:26:44 -0700
+
+qhull (3.1-3) unstable; urgency=low
+
+ * rename executable qhull-rbox back to rbox
+
+ -- Barak Pearlmutter <bap@cs.unm.edu> Mon, 25 Mar 2002 09:13:57 -0700
+
+qhull (3.1-2) unstable; urgency=low
+
+ * src/qconvex.c did not belong in the library
+ * qh_version was multiply defined, now defined only in qhull.c
+
+ -- Barak Pearlmutter <bap@cs.unm.edu> Mon, 25 Mar 2002 08:55:45 -0700
+
+qhull (3.1-1) unstable; urgency=low
+
+ * Initial Release. (closes: #108115)
+
+ -- Barak Pearlmutter <bap@cs.unm.edu> Sun, 24 Mar 2002 21:53:13 -0700
diff --git a/project/debian/control b/project/debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..462bbe3f45443e920b6090903bdcdaba4782dff8
--- /dev/null
+++ b/project/debian/control
@@ -0,0 +1,56 @@
+Source: qhull
+Section: math
+Priority: optional
+Maintainer: Rafael Laboissiere <rafael@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4), docbook-utils, eperl, dpatch
+
+Package: libqhull5
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Calculate convex hulls and related structures (shared library)
+ 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.
+ .
+ This package contain the shared C library.
+ .
+ Homepage: http://www.qhull.org
+
+Package: libqhull-dev
+Section: libdevel
+Architecture: any
+Depends: libqhull5 (= ${Source-Version}), libc6-dev
+Description: Calculate convex hulls and related structures (development files)
+ 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.
+ .
+ This package contains the files necessary for development (headers and
+ libraries), as well as the library documentation in HTML format.
+ .
+ Homepage: http://www.qhull.org
+
+Package: qhull-bin
+Section: math
+Architecture: any
+Depends: libqhull5 (= ${Source-Version})
+Suggests: geomview
+Description: Calculate convex hulls and related structures (utilities)
+ 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.
+ .
+ This package contains the qhull executable that gives a pipe interface to
+ some of the functionality of the library. Also included is rbox is a
+ useful tool in generating input for Qhull; it generates hypercubes,
+ diamonds, cones, circles, simplices, spirals, lattices, and random points.
+ .
+ Qhull produces graphical output for Geomview. This helps with
+ understanding the output (http://www.geomview.org).
+ .
+ Homepage: http://www.qhull.org
diff --git a/project/debian/copyright b/project/debian/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..03c6b3c2aa0d8b0051160d6025d76ed745c4544b
--- /dev/null
+++ b/project/debian/copyright
@@ -0,0 +1,56 @@
+This package was debianized by Rafael Laboissiere <rafael@debian.org> on
+Mon Mar 1 00:28:18 CET 2004
+
+It was downloaded from:
+
+ http://www.qhull.org/download/qhull-2003.1.tar.gz
+
+Upstream Authors:
+
+ C. Bradford Barber <bradb@qhull.org>
+ Hannu Huhdanpaa <hannu@qhull.org>
+
+ c/o The Geometry Center
+ University of Minnesota
+ 400 Lind Hall
+ 207 Church Street S.E.
+ Minneapolis, MN 55455
+
+Copyright:
+
+ The formal license is in the source file COPYING.txt
+
+ 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
+
+ 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.qhull.org. It may be freely copied, modified,
+and redistributed under the following conditions:
+
+1. All copyright notices must remain intact in all files.
+
+2. A copy of this text file must be distributed along with any copies
+ of Qhull that you redistribute; this includes copies that you have
+ modified, or copies of programs or other software products that
+ include Qhull.
+
+3. If you modify Qhull, you must include a notice giving the
+ name of the person performing the modification, the date of
+ modification, and the reason for such modification.
+
+4. When distributing modified versions of Qhull, or other software
+ products that include Qhull, you must provide notice that the original
+ source code may be obtained as noted above.
+
+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@qhull.org; the authors may or may not act on them as
+ they desire.
+
diff --git a/project/debian/install-src-html.sh b/project/debian/install-src-html.sh
new file mode 100644
index 0000000000000000000000000000000000000000..1633c7d834655dcc1743bb83719de046288d2b20
--- /dev/null
+++ b/project/debian/install-src-html.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+html=htm
+dir=$1
+mkdir -p $1
+src= \
+
+for i in geom.h \
+ mem.h \
+ merge.h \
+ poly.h \
+ io.h \
+ qhull_a.h \
+ qhull.h \
+ qset.h \
+ stat.h \
+ user.h \
+ geom2.c \
+ geom.c \
+ global.c \
+ io.c \
+ mem.c \
+ merge.c \
+ poly2.c \
+ poly.c \
+ qconvex.c \
+ qdelaun.c \
+ qhalf.c \
+ qhull.c \
+ qset.c \
+ qvoronoi.c \
+ stat.c \
+ unix.c \
+ user.c \
+ user_eg.c ; do
+
+ cp src/$i $dir/$i.$html
+ perl -pi -e 'BEGIN{$f=1} if ($f) {s:^/\*::; $f=0}' $dir/$i.$html
+
+done
+
+for i in index.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 ; do
+
+ cp src/$i $dir
+
+done
+
+for i in $dir/*.htm ; do
+
+ perl -pi -e 's/(href="[a-z2_]+.)(c|h)/$1$2.'$html'/' $i
+
+done
diff --git a/project/debian/libqhull-dev.doc-base b/project/debian/libqhull-dev.doc-base
new file mode 100644
index 0000000000000000000000000000000000000000..cbd01a3855bdc5270728d1a598e8a971fcbe7c4d
--- /dev/null
+++ b/project/debian/libqhull-dev.doc-base
@@ -0,0 +1,13 @@
+Document: qhull
+Title: QHull Manual
+Author: C. Bradford Barber
+Abstract: This manual describes Qhull, a general dimension convex hull
+ program that reads a set of points from stdin, and outputs the smallest
+ convex set that contains the points to stdout. It also generates Delaunay
+ triangulations, Voronoi diagrams, furthest-site Voronoi diagrams, and
+ halfspace intersections about a point.
+Section: math
+
+Format: HTML
+Index: /usr/share/doc/libqhull5/html/qh-man.htm
+Files: /usr/share/doc/libqhull5/html/*.htm
diff --git a/project/debian/libqhull-dev.files b/project/debian/libqhull-dev.files
new file mode 100644
index 0000000000000000000000000000000000000000..71158c426c90c881d99daafc6a2f0946acddcec5
--- /dev/null
+++ b/project/debian/libqhull-dev.files
@@ -0,0 +1,8 @@
+usr/lib/libqhull.a
+usr/lib/libqhull.la
+usr/lib/libqhull.so
+usr/include
+usr/share/doc/libqhull5/examples
+usr/share/doc/libqhull5/*htm*
+usr/share/doc/libqhull5/src
+usr/share/doc/libqhull5/*.txt
diff --git a/project/debian/libqhull5.files b/project/debian/libqhull5.files
new file mode 100644
index 0000000000000000000000000000000000000000..73752c9aeaacb6161fbc5c9c9db90d67cb8b19a8
--- /dev/null
+++ b/project/debian/libqhull5.files
@@ -0,0 +1 @@
+usr
diff --git a/project/debian/manpage.in b/project/debian/manpage.in
new file mode 100644
index 0000000000000000000000000000000000000000..bb5155ef315684f427e4895620582e680dbbc585
--- /dev/null
+++ b/project/debian/manpage.in
@@ -0,0 +1,109 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+
+
+ The docbook-to-man binary is found in the docbook-to-man package.
+ Please remember that if you create the nroff version in one of the
+ debian/rules file targets (such as build), you will need to include
+ docbook-to-man in your Build-Depends control field.
+
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Rafael</firstname>">
+ <!ENTITY dhsurname "<surname>Laboissiere</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>2004-02-06</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhemail "<email>rafael@debian.org</email>">
+ <!ENTITY dhusername "Rafael Laboissiere">
+ <!ENTITY dhucpackage "<refentrytitle><:=$command:></refentrytitle>">
+ <!ENTITY dhpackage "<:=$command:>">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2003</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose><:=$purpose:></refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+ <arg><option><replaceable>options</replaceable></option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>
+ This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.
+ </para>
+
+ <para>
+ This program is documented fully in <ulink
+ url="file:///usr/share/doc/<:=$soname:>/html/<:=$command:>.htm">HTML
+ format</ulink>, available in the <:=$soname:>-dev package.
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>
+ This manual page was written by &dhusername; &dhemail; for the
+ &debian; system (but may be used by others withouth any
+ restrictions).
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
diff --git a/project/debian/patches/00list b/project/debian/patches/00list
new file mode 100644
index 0000000000000000000000000000000000000000..895e71430a0cc99da8dabb04cb397961d14ebadd
--- /dev/null
+++ b/project/debian/patches/00list
@@ -0,0 +1,2 @@
+QHpointer.dpatch
+make-new-msg.dpatch
diff --git a/project/debian/patches/QHpointer.dpatch b/project/debian/patches/QHpointer.dpatch
new file mode 100644
index 0000000000000000000000000000000000000000..16f04f5eaf0dc232040625f8fc2b2772bbb101da
--- /dev/null
+++ b/project/debian/patches/QHpointer.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh -e
+## QHpointer.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Access Qhull globals via a pointer to allocated memory
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p1 < $0;;
+ -unpatch)
+ patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+--- qhull-orig/src/user.h 2002-04-29 11:01:46.000000000 +0200
++++ qhull/src/user.h 2004-02-02 11:04:47.000000000 +0100
+@@ -509,7 +509,7 @@
+ see:
+ user_eg.c for an example
+ */
+-#define qh_QHpointer 0
++#define qh_QHpointer 1
+ #if 0 /* sample code */
+ qhT *oldqhA, *oldqhB;
+
diff --git a/project/debian/patches/make-new-msg.dpatch b/project/debian/patches/make-new-msg.dpatch
new file mode 100644
index 0000000000000000000000000000000000000000..8cb77cccdf91edb09d22efbe5644078e6e325b00
--- /dev/null
+++ b/project/debian/patches/make-new-msg.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+## QHpointer.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Access Qhull globals via a pointer to allocated memory
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p1 < $0;;
+ -unpatch)
+ patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+--- qhull-orig/src/io.c 2004-01-31 12:00:15.000000000 +0100
++++ qhull/src/io.c 2004-02-06 09:54:18.000000000 +0100
+@@ -4017,11 +4017,8 @@
+ qh rbox_command[strlen(qh rbox_command)-1]= '\0';
+ if (!strcmp (qh rbox_command, "./rbox D4"))
+ fprintf (qh ferr, "\n\
+-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@qhull.org.\n\
++This is the qhull test case. If any errors or core dumps occur,\n\
++fill a bug report against the libqhull<soversion> Debian package.\n\
+ \n\
+ Type 'qhull' for a short list of options.\n");
+ }
diff --git a/project/debian/qhull-bin.files b/project/debian/qhull-bin.files
new file mode 100644
index 0000000000000000000000000000000000000000..a65408f7ad114e94d1a0ba87ae557e5ccc5896ed
--- /dev/null
+++ b/project/debian/qhull-bin.files
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man
diff --git a/project/debian/rules b/project/debian/rules
new file mode 100644
index 0000000000000000000000000000000000000000..1bee78bb39f8c854d3ca9e175c263014ce3aeb81
--- /dev/null
+++ b/project/debian/rules
@@ -0,0 +1,104 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+PACKAGE := qhull
+
+soversion := 5
+soname := libqhull$(soversion)
+instdir := debian/$(soname)
+destdir := $(shell pwd)/debian/tmp
+debdoc := $(destdir)/usr/share/doc
+debdoclib := $(destdir)/usr/share/doc/$(soname)
+
+include /usr/share/dpatch/dpatch.make
+
+config: config-stamp
+config-stamp:
+ dh_testdir
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ touch config-stamp
+
+build: build-stamp
+build-stamp: patch config
+ dh_testdir
+
+ $(MAKE)
+
+ ( cd debian ; \
+ for info in "qconvex:compute the convex hull" \
+ "qdelaunay:compute the Delaunay triangulation" \
+ "qhalf:halfspace intersection about a point" \
+ "qvoronoi:compute the Voronoi diagram" ; do \
+ comm=`echo $$info | cut -d: -f1` ; \
+ purp=`echo $$info | cut -d: -f2` ; \
+ eperl -d command=$$comm -d purpose="$$purp" -d soname=$(soname) \
+ manpage.in > $$comm.sgml ; \
+ docbook2man $$comm.sgml ; \
+ done )
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+
+ -$(MAKE) distclean
+ ( cd debian ; rm -rf *.sgml *.1 manpage.links manpage.refs )
+
+ rm -f install-stamp build-stamp config-stamp patch-stamp
+
+ dh_clean
+
+install: install-stamp
+install-stamp: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install DESTDIR=$(destdir)
+ rm -f $(debdoc)/qhull/COPYING.txt
+ mv $(debdoc)/qhull/Changes.txt $(debdoc)/qhull/changelog
+
+ mv $(debdoc)/qhull $(debdoclib)
+ for i in libqhull-dev qhull-bin ; do \
+ mkdir -p debian/$$i/usr/share/doc ; \
+ ln -s $(soname) debian/$$i/usr/share/doc/$$i ; \
+ done
+
+ chmod +x debian/install-src-html.sh
+ debian/install-src-html.sh $(debdoclib)/src
+
+ dh_movefiles --no-package=$(soname)
+ dh_movefiles --package=$(soname)
+
+ dh_installman --package=qhull-bin debian/*.1
+
+ touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep:
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs -p$(soname) debian/copyright
+ dh_installchangelogs -p$(soname)
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install config \
+ patch unpatch
diff --git a/src/Changes.txt b/src/Changes.txt
index 626008a6068791b2cd340deb97977bcaf2741094..c71571ab3b9db29970430bcfad3512f1780d23c8 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -1,14 +1,36 @@
.............This file lists all changes to qhull and rbox.....................
+qhull 2009.1 2009/06/11
+
+This is a maintenance release done by Rafael Laboissiere <rafael@debian.org>.
+
+ - src/rbox.c (main): Avoid problems of evaluation order when
+ pre-incrementing arguments of strtod
+ - src/io.c (qh_produce_output), src/stat.c (qh_initstatistics): Use %lu
+ instead of %d in the format string for arguments of type size_t
+ - html/qhull.man, html/rbox.man: Fix several syntax, macros, and hyphen
+ problems in man pages
+ - The Autotools files have been generated with modern version of autoconf (2.63),
+ automake/aclocal (1.10.2), and libtool (2.2.6)
+ - Some character issues in the man pages are fixed
+
qhull 2003.1 2003/12/30
+ - Updated Qhull citation with page numbers.
+ - Project: constructing Voronoi diagram
+ - Project: computing Voronoi volumes
+ - identity function may drop points. The following lens distribution drops 52 of 102 points of its points
+ rbox 100 L1e5 | tee r | qconvex FV n | qhalf Fp | cat - r | /bin/sort -n > x
+ - offsetted points will add intersection points
+ rbox 1000 s O2 t | tee r | qconvex FV n | qhalf Fp | cat - r | /bin/sort -n | tail
+
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]
+ 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]
@@ -22,9 +44,9 @@ 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
+ 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]
@@ -58,7 +80,7 @@ Changes to examples
qhull 2002.1 2002/8/20
Changes to distribution:
- - Set up savannah.gnu.org/projects/qhull/ [R. Laboissiere]
+ - Set up savannah.nongnu.org/projects/qhull/ [R. Laboissiere]
- 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]
@@ -76,7 +98,7 @@ Changes to code:
Changes to build
- Makefile.txt works under cygwin
- Added Make-config.sh to create a Debian build [R. Laboissiere]
- - Added .exe to Makefile.txt#clean.
+ - Added .exe to Makefile.txt#clean.
- In README, use -fno-strict-aliasing with gcc-2.95.1 [Karas, Krishnaswami]
- Fixed chmod in Makefile.txt [B. Karas]
@@ -115,16 +137,16 @@ Changes to options
For non-simplicial regions, 'Ft' does not satisify the Delaunay property.
- If 'Po' or 'TVn', qhull checks outer planes. Use 'Q5' to turn off.
- If 'T4', print facet lists and check polygon after adding each point
-
+
Corrections to code
- rbox: allow 'c' and 'd' with 's r', meshes, etc.
- qh_findbest: redesigned as directed search. qh_findbesthorizon for coplanar
qh_findbest is faster for many distributions
- qh_findbestnew: redesigned to search horizon of coplanar best newfacets
- needed for distributions with a sharp edge,
+ needed for distributions with a sharp edge,
e.g., rbox 1000 s Z1 G1e-13 | qhull Tv
- qh_findbest/qh_findbestnew: search neighbors of better horizon facets
- was needed for RBOX 1000 s Z1 G1e-13 t996564279 | qhull Tv
+ was needed for RBOX 1000 s Z1 G1e-13 t996564279 | qhull Tv
and RBOX 1000 s W1e-13 P0 t996547055 | QHULL d Qbb Qc Tv
- qh_findbest with noupper: could return an upperdelaunay facet if dist>qh.MINoutside.
- qh_findbestnew: allow facet->upperdelaunay if dist > qh.MINoutside
@@ -138,7 +160,7 @@ Changes to prompts, warnings, and statistics
- For Delaunay & Voronoi, 's' reports deleted vertices due to facet merging.
They were incorrectly reported as nearly incident points.
- Warn if recompute centrum after constructing hull
- - Simplified narrow hull warning and print all digits of cosine.
+ - Simplified narrow hull warning and print all digits of cosine.
A narrow hull may lead to a point outside of the hull.
- Print total vertices deleted instead of ave. per iteration (Zdelvertextot)
- Improved tracing for qh_partitionpoint and qh_partitioncoplanar
@@ -150,7 +172,7 @@ Changes to documentation
- README.txt: Added quickstart instructions for Visual C++
- rbox: Added example of edge of narrow lens, rbox 1000 L100000 s G1e-6
- Added cross references between options 'o' and 'p'.
- - qh-eg.html: added examples comparing 'Qt', 'QJ', and neither 'Qt' nor 'QJ'
+ - qh-eg.html: added examples comparing 'Qt', 'QJ', and neither 'Qt' nor 'QJ'
eg.15a.surface, eg.15b.triangle, eg.17a.delaunay.2, etc.
- Reorganized and enhanced discussion of precision problems in qh_impre.htm
- Fixed spelling errors [K. Briggs]
@@ -171,10 +193,10 @@ Changes to code
- qh_checkpolygon: report qh.facet_next error if NARROWhull & dist>MINoutside
- qh_findbest: renamed "newfacets" parameter to "isnewfacets" since it is boolT
- qh_findbest/qh_findbestnew: testhorizon even if !MERGING
- Otherwise qhull c D6 | qhull Q0 Tv assigns coplanar points
+ Otherwise qhull c D6 | qhull Q0 Tv assigns coplanar points
- qh_resetlists: add qh_RESETvisible for qh_triangulate
- qh_findbest: search better facets first. Rewritten.
- - qh_findbest: increased minminsearch, always check coplanar facets.
+ - qh_findbest: increased minminsearch, always check coplanar facets.
See: RBOX 1000 s Z1 G1e-13 t996564279 | QHULL Tv
- qh_findbestnew: report precision error for deleted cones [rare event]
e.g.: RBOX 1000 s W1e-13 P0 t1001034076 | QHULL d Qbb Qc Tv
@@ -183,14 +205,14 @@ Changes to code
- qh_partitionpoint, Delaunay sites can not be inside. Otherwise points may
be outside upperDelaunay facets yet not near-inside Delaunay facets
See: RBOX s 1000 t993602376 | QHULL C-1e-3 d Qbb FA Tv
- - qh_partitioncoplanar: call qh_findbest/qh_findbestnew with qh DELAUNAY
- - qh_printlists: format long lines
+ - qh_partitioncoplanar: call qh_findbest/qh_findbestnew with qh DELAUNAY
+ - qh_printlists: format long lines
- qh_printvertex: format long lines
- - user.h: tightened qh_WARNnarrow and qh_MAXnarrow. Do not see problems
+ - user.h: tightened qh_WARNnarrow and qh_MAXnarrow. Do not see problems
until they are -1.0.
- - user.h: defined qh_DISToutside, qh_SEARCHdist, and qh_USEfindbestnew
+ - user.h: defined qh_DISToutside, qh_SEARCHdist, and qh_USEfindbestnew
- qh_checkfacet: in 3-d, allow #ridges > #vertices. Can get a vertex twice
- in a ridge list, e.g, RBOX 1000 s W1e-13 t995849315 D2 | QHULL d Tc Tv
+ in a ridge list, e.g, RBOX 1000 s W1e-13 t995849315 D2 | QHULL d Tc Tv
Changes to FAQ
- Recommended use of triangulated output ('Qt')
@@ -201,7 +223,7 @@ Changes to distribution
Changes to Qhull library
- Added qh_triangulate() to poly2.c. It triangulates the output.
- - Added option 'Q11' to copy normals and recompute centrums for tricoplanar facets
+ - Added option 'Q11' to copy normals and recompute centrums for tricoplanar facets
'FP' may not print the nearest vertex for coplanar points
Use option 'Q11' when adding points after qh_triangulate()
@@ -210,8 +232,8 @@ qhull 3.0 2001/02/11
Changes to distribution
- added qconvex, qdelaunay, qhalf, and qvoronoi
- added qhull-interface.cpp on calling Qhull from C++ [K. Erleben]
- - renamed to qhull3.0/.
- - added eg/, html/, and src/ directories
+ - renamed to qhull3.0/.
+ - added eg/, html/, and src/ directories
Changes to URLs
- MathLab6 qhull: convhulln, delaunayn, griddatan, tsearchn, vororoin [Z. You]
@@ -229,7 +251,7 @@ Changes to documentation
Corrections to code
- fixed type of arg for error message in qh_initqhull_globals [N. Max]
- fixed incorrect initialization of qh MINdenom_1 for scalepoints
- - fixed drop dim for 'H Qbk:0Bk:0'. Added qh.feasible_point to qh_projectinput
+ - fixed drop dim for 'H Qbk:0Bk:0'. Added qh.feasible_point to qh_projectinput
- qh_WARNnarrow is angle between facet normals. Negate for warning message.
- statistics for Wangle/etc. concerns facet normals. Reworded [E. Voth]
- fixed error message for 'FC v'
@@ -254,8 +276,8 @@ Changes to prompts and warnings
- ignore warning if options 'v i Pp'. qvoronoi users may need Delaunay tri.
- reworded warning if 'Pg' and 'QVn' is not a vertex.
- reworded warning for 'Qx Tv', qh_check_points() in poly2.c
- - if 'Pp', turn off warning for 'Qbb' without 'd' or 'v'
- - in qh_printsummary() of Voronoi and Delaunay, distinguish QVn, QGn, Pdn, PDn
+ - if 'Pp', turn off warning for 'Qbb' without 'd' or 'v'
+ - in qh_printsummary() of Voronoi and Delaunay, distinguish QVn, QGn, Pdn, PDn
Changes to FAQ
- added FAQ item for nearly flat Delaunay triangles [Z. You]
@@ -275,8 +297,8 @@ qhull 2.6 1999/04/19
- added zdoc11 to qh-stat.h#ZZdef for !qh_KEEPstatistics [K. Ford]
- enhanced qh_initqhull_globals() test of qh_RANDOMint and qh_RANDOMmax
- added debugging option to always return qh_RANDOMmax from qh_rand()
- - fixed option 'Qr', qh_initialvertices(), to allow a broken qh_rand()
- fixed option 'Qr', qh_nextfurthest(), to allow narrow hulls
+ - fixed option 'Qr', qh_initialvertices(), to allow a broken qh_rand()
+ fixed option 'Qr', qh_nextfurthest(), to allow narrow hulls
Option 'Qr' simulates the random incremental algorithm for convex hulls
- added note that qh.num_outside includes coplanar points for narrow hulls
- added FAQ items for triangles/ridges of 3-d Delaunay triangulation[P. Kumar]
@@ -311,7 +333,7 @@ qhull 2.6 1998/8/12
- added qh_new_qhull() to user.c for calling qhull() from a program [D. Zwick]
rewrote user_eg.c to use qh_new_qhull(). Added qh_QHpointer example.
- added qh_CLOCKtype 2 in user.h to call times() for CPU time [B. Hemkemeier]
- - renamed set.c/set.h to avoid conflict with STL's set.h [G. van den Bergen]
+ - renamed set.c/set.h to avoid conflict with STL's set.h [G. van den Bergen]
can also use '#include <qhull/qhull_a.h>' for Qhull library
fixed errors
@@ -332,7 +354,7 @@ qhull 2.6 1998/8/12
- added .c and .h source files to web distribution and qh-c.htm [J. Sands]
- documented qh_ZEROdelaunay. Delaunay and Voronoi diagrams do not include
facets that are coplanar with the convex hull of the input sites.
-
+
modified code
- replaced computed minnorm in qh_sethyperplane_det with distance test
- removed 'qh rand_seed' since random number generator is independent of qhull
@@ -354,7 +376,7 @@ qhull 2.5 1998/5/4
- to browse qh-c.htm, set MIME type of .c and .h files to text/html
- added example of 3-d Delaunay triangulation to q-faq.htm
- added Delaunay and Voronoi examples to qh-optv.htm
-
+
qhull 2.5 1998/2/4
- added option 'v Fi' for separating hyperplanes of bounded Voronoi regions
- added option 'v Fo' for separating hyperplanes of unbounded Voronoi regions
@@ -363,12 +385,12 @@ qhull 2.5 1998/2/4
- fixed missing statistics in qh_allstat* [T. Johnson]
- rearranged qh_printvdiagram. Use qh_eachvoronoi to iterate Voronoi ridges.
- added qh_check_points to qh-math.c
-
+
qhull 2.5 1998/1/28
- added option 'Fv' to print the Voronoi diagram
- added rbox option 'x' to generate random points in a simplex
- added rbox option 'y' to generate a simplex and random points
- - added rbox option 'On' to offset the output
+ - added rbox option 'On' to offset the output
- add unpacking instructions to README.txt
- updated discussion of forced output, 'Po'
- sorted the options alphabetically
@@ -377,10 +399,10 @@ qhull 2.5 1998/1/28
- added facet->seen2 flag for 'Fv'
qhull 2.5 1998/1/16
- - fixed initialization of qh.last_low on restart of 'd QJ'
+ - fixed initialization of qh.last_low on restart of 'd QJ'
- renamed qh_JOGGLEmax to qh_JOGGLEmaxincrease
- updated URL for Fukuda's cdd program
-
+
qhull 2.5 1998/1/12
New or modified features
@@ -396,14 +418,14 @@ Corrections
- for Mathematica 2.2 ('m') changed %10.8g to %16.8f [A. Zhaxybayev]
- fixed incorrect warning for 'QV0 Qg' in qh_initbuild [B. Wythoff]
- fixed unaccessible statistic if !qh_KEEPstatistics for Wnewvertexmax
- - fixed overestimate of qh ONEmerge for point sets outside of
+ - fixed overestimate of qh ONEmerge for point sets outside of
first quadrant and far from the origin
- fixed overestimate of 'Qbb' for point sets far from the origin
- fixed potential overestimate of qh DISTround under 'Qbb'
- fixed 'p' printing coplanar points of unselected facets
- fixed 'Ft' printing centrums unnecessarily in 2-d
-
-Changes to documentation
+
+Changes to documentation
- wrote internal design documentation (qh-c.htm)
- started frequently asked questions (qh-faq.htm)
- added a section on joggled input to qh-impre.htm
@@ -416,7 +438,7 @@ Changes to documentation
- added code for printing Delaunay triangles to qh-in.htm [A. Tsui]
- options 'Pdk' and 'PDk' do not drop on equality
-Improvements to the code
+Improvements to the code
- reviewed warning messages for Qhull options in qh_initflags
- added warning to 's' if premature exit from 'TCn' or 'TVn'
- 's' prints max distance above/below only if qh.MERGING
@@ -426,7 +448,7 @@ Improvements to the code
- removed qh_check_maxout for 'Wn Q0'
- reset tracing after 'TPn' adds point in 4-d and higher
-Changes for the Qhull library
+Changes for the Qhull library
- changed qh_setdelaunay to call qh_scalelast if used with 'Qbb' or 'QJ'
Delaunay callers to qh_findbestfacet, qh_addpoint, or qh_findfacet_all
should always use qh_setdelaunay as in user_eg.c
@@ -442,7 +464,7 @@ Changes for the Qhull library
Other changes to Qhull functions
- report error for !bestfacet in qh_findbest (it shouldn't happen) [H. Meuret]
- - set newbest in qh_findbest only if bestfacet updated
+ - set newbest in qh_findbest only if bestfacet updated
- renamed facet parameter for qh_findbest
- added maxdist argument to qh_checkpoint
- moved 'FO' output after qh_partitionall
@@ -460,7 +482,7 @@ qhull 2.4 97/4/2
New or modified features
- made 'C-0' and 'Qx' default options. Use 'Q0' to not handle roundoff errors
- - removed point-at-infinity from Delaunay/Voronoi.
+ - removed point-at-infinity from Delaunay/Voronoi.
you no longer need to use 'Qu PDk'
- added 'Qz' to add a point-at-infinity to Delaunay and Voronoi constructions
- added published version of qhull article in ACM Trans Math Software
@@ -470,7 +492,7 @@ New or modified features
- changed definition of coplanar point in output to qh min_vertex (see 'Qc')
it was qh MAXcoplanar ('Un') [could make vertices non-coplanar]
- automatically set 'Qi' for options 'd Qc' and 'v Qc'.
- - reworded summary ('s') for Delaunay/Voronoi/halfspace.
+ - reworded summary ('s') for Delaunay/Voronoi/halfspace.
use 'Fs' and 'FS' for summary statistics.
- for summary 's' of Delaunay/Voronoi, display number of coplanars for facets
if none, display total number of coplanars (i.e., non-vertices)
@@ -482,8 +504,8 @@ Corrections
- fixed qh_partitioncoplanar() to not drop interior points if 'Qi' is used
- fixed 'FP d' to report distance in point set instead of paraboloid
- fixed qh_findbest() to search all coplanar facets for qh_check_maxout()
-
-Changes to documentation
+
+Changes to documentation
- added example eg.17f.delaunay.3 to show a triangulation of cospherical sites
- split up qh-opt.htm into multiple pieces
- split off qh-in.htm for Qhull internals
@@ -493,12 +515,12 @@ Changes to documentation
- removed 'txt' versions of html files
- added note to 'PDk' about avoiding a 'd' option immediately after a float
- under option 'd', display the triangulation with 'GrD3', not 'GnrD3'
-
+
Changes to the Qhull library
- added 'format' argument to qh_printfacetNvertex_nonsimplicial() in io.c
- removed C++ type errors [J. Stern, S. Marino]
- - created SETelemt, SETfirstt, etc. for specifying data types.
- - use SETelem,etc. for assignments.
+ - created SETelemt, SETfirstt, etc. for specifying data types.
+ - use SETelem,etc. for assignments.
- changed setT.maxsize to 'int' to prevent type conversion warnings
- changed FOREACH.. to a comma expression for better code and less warning
- changed qh.vertex_visit and .visit_id to unsigned int to prevent warnings
@@ -516,10 +538,10 @@ Changes to the Qhull library
please let me know if you try this
qhull V2.3 96/6/5
- - fixed total area of Delaunay triangulation. [A. Enge]
+ - fixed total area of Delaunay triangulation. [A. Enge]
It should ignore facets on the upper-envelope.
- if 'd Qu FA', the total area is summed over the upper-Delaunay triangles
- - fixed sign of area for Delaunay triangulations.
+ - fixed sign of area for Delaunay triangulations.
- fixed cdd input format for Delaunay triangulation. [A. Enge]
- for cdd input, allow feasible point for halfspaces.
- warning if cdd output format for centrums, halfspace intersections, or OFF.
@@ -527,7 +549,7 @@ qhull V2.3 96/6/5
- option 'QR-n' sets random number seed to n without rotating input
- fixed qh_findbest() to retest coplanar and flipped facets after a restart
- for 'd Qu Ts' collects angle statistics for upper Delaunay facets
-
+
Changes to the Qhull library
- expanded user_eg.c for incremental constructions and Delaunay triangulation
- added discussion of incremental construction to qh_man.html#library
@@ -536,9 +558,9 @@ qhull V2.3 96/6/5
Please set qh ATinfinity if you explicitly add the point "at-infinity"
Please set qh ATinfinity if you explicitly call qh_projectinput.
Please set qh UPPERdelaunay if you explicitly cleared qh ATinfinity.
- Other users do not need to change their code.
- Now you can build a Delaunay triangulation without creating a point
- "at-infinity". This removes a potential, hard-to-understand error.
+ Other users do not need to change their code.
+ Now you can build a Delaunay triangulation without creating a point
+ "at-infinity". This removes a potential, hard-to-understand error.
qh_readpoints sets qh ATinfinity for options 'd' or 'v' without 'Qu'.
qh_initB sets qh ATinfinity for qh PROJECTdelaunay w/o qh UPPERdelaunay.
qh_projectinput adds a point "at-infinity" only if qh ATinfinity is set.
@@ -571,7 +593,7 @@ qhull V2.3 96/3/25
qhull V2.2 96/2/15
- detect narrow initial hulls (cosine of min angle < qh_MAXnarrow in user.h).
- Write warning if cosine < qh_WARNnarrow in user.h. If narrow (qh NARROWhull),
+ Write warning if cosine < qh_WARNnarrow in user.h. If narrow (qh NARROWhull),
partition coplanar points as outside points and delay coplanar test to end.
Needed for RBOX 1000 L100000 s G1e-6 t995127886 | QHULL Tv
See 'limitations' in qh-impre.html for further discussion.
@@ -593,7 +615,7 @@ qhull V2.2 95/12/28
This reduces roundoff errors for Delaunay triangulations with integer coordinates.
- changed option 'Qu d' to print out the furthest-site Delaunay triangulation
Use options 'Qu d PD2' to compute the normal 2-d Delaunay triangulation without
- the point at infinity.
+ the point at infinity.
- added notes to the documentation of option 'd'
- added notes to limitations of how Qhull handles imprecision
- added warning if options 'FP', 'Fc', or 'Gp' without option 'Qc' or 'Qi'
@@ -604,7 +626,7 @@ qhull V2.2 95/12/28
- fixed option 'QbB' (qh SCALEpoints was not set)
- fixed minor confusion between 'Gc' (print centrums) and 'Gp' (print points)
- rewrote qh_findbestnew for upper convex hull, Delaunay facets
- - changed option name for 'Gp' from 'Gcoplanar' to 'Gpoints'
+ - changed option name for 'Gp' from 'Gcoplanar' to 'Gpoints'
- changed "nearest" facet for 'Pdk' to threshold - normal
- reworked qh GOODclosest for 'Qg'
- added note that 'Qg' does not always work
@@ -612,26 +634,26 @@ qhull V2.2 95/12/28
- refined qh DISTround in qh_maxmin/geom2.c for Delaunay triangulations
qhull V2.2 95/12/4
- - Version 2.2 fixes an important bug in computing Delaunay triangulations
- and convex hulls with edges sharper than ninety degrees. The problem
- occurs when processing a point at a sharp edge. A directed search can
- not be used for partitioning because one side may hide facets from the
- other side. The new lens-shaped distribution for rbox demonstrates the
+ - Version 2.2 fixes an important bug in computing Delaunay triangulations
+ and convex hulls with edges sharper than ninety degrees. The problem
+ occurs when processing a point at a sharp edge. A directed search can
+ not be used for partitioning because one side may hide facets from the
+ other side. The new lens-shaped distribution for rbox demonstrates the
problem. For example, 'rbox 100 L3 G0.5 s | qhull Tv' fails for Version 2.1.
O. Schramm found the bug when computing the Delaunay triangulation of points
- near an outside edge.
+ near an outside edge.
- I rewrote qh_findbest and related functions. Qh_findbest
- uses an exhaustive test for sharp edges (qh_findbest_sharp).
+ I rewrote qh_findbest and related functions. Qh_findbest
+ uses an exhaustive test for sharp edges (qh_findbest_sharp).
Qh_findbest avoids the upper convex hull of Delaunay triangulations.
Options 'd' and 'v' no longer assign coplanar points to the upper convex hull.
-
+
Qh_check_maxout tests near-inside points. It ignores fully inside points.
When done, it removes near-inside points from the coplanar sets.
- If you use qh_addpoint or qh_findbest, please review the function headers.
- They do not work for lens-shaped hulls for arbitrary facets. They do work for
+ If you use qh_addpoint or qh_findbest, please review the function headers.
+ They do not work for lens-shaped hulls for arbitrary facets. They do work for
Delaunay triangulations.
Changes to options for V2.2
@@ -640,7 +662,7 @@ qhull V2.2 95/12/4
- added 'FP' to print nearest vertex for coplanar points
- added coplanar count to 'Fs' and 's'
- added number of similar points to summary for Delaunay/Voronoi
- - Option 'Qc' is no longer necessary when merging.
+ - Option 'Qc' is no longer necessary when merging.
- 'o' format for Voronoi vertices ('v') generates "0" lines for similar points
- 'QRn' for Delaunay ('d' or 'v') now rotates about the Z axis (see qh_init_B).
Otherwise Qhull does not identify the upper hull
@@ -648,7 +670,7 @@ qhull V2.2 95/12/4
set for 'd'. Even though it was a bad idea, it revealed the above bug.
- for option list ('FO'), added version, values for one-merge, maxpos, maxneg,
and near-inside, and flags for zero-centrum
- - optimized 'C-0' and 'Qx'. These options ("zero-centrum") test vertices
+ - optimized 'C-0' and 'Qx'. These options ("zero-centrum") test vertices
instead of centrums for adjacent simplicial facets.
- if 'Tv', report number of points that are not verified due to qh_findbest
- Option 'Q8' ignores near-inside points.
@@ -663,9 +685,9 @@ qhull V2.2 95/12/4
and renumbered the examples for q_eg
- described facet orientation in 'data structure' section [P. Soikkonen]
- added notes to qh-man.html/"What to do if something goes wrong"
- - added note about using 'Tv' to verify the results [O. Schramm]
+ - added note about using 'Tv' to verify the results [O. Schramm]
- expanded definition of f_r in Performance section [S. Grundmann]
- - noted that Geomview display of a Voronoi diagram adds extra edges
+ - noted that Geomview display of a Voronoi diagram adds extra edges
for unbounded Voronoi cells
- rewrote error "convexity constraints may be too strong" [D. Newland]
- added limitations section to "Imprecision in Qhull"
@@ -688,7 +710,7 @@ qhull V2.2 95/12/4
Changes for users of the Qhull library
- user code needs to define qh_version (see user_eg.c)
- - merged initialization code into qh_init_A and qh_init_B [M. Mazzario]
+ - merged initialization code into qh_init_A and qh_init_B [M. Mazzario]
old code works as before.
qh_initflags also sets qh qhull_command for qh_initthresholds
redid initialization for user_eg.c
@@ -728,7 +750,7 @@ qhull V2.2 95/12/4
qhull V2.1 95/9/25
- converted qhull.man to html format, many edits
- referenced Shewchuk's triangle program and Schneiders' Mesh Generation page
- - added option 'Qa' to force all points outside
+ - added option 'Qa' to force all points outside
automatically set for "precise" Delaunay or Voronoi [Salazar & Velez]
it is turned off by merging, 'Wn', 'Qc' or 'Qi'
- added coplanar points to option 'FN'
@@ -756,7 +778,7 @@ qhull V2.1 95/9/25
- added note about locating Delaunay triangles to option 'd' [A. Curtis]
- added note that coplanar vertices correspond to duplicate points for 'd'
- added note about option 'd' automatically setting 'PDk' (lower convex hull)
- - added note about precision errors to option 'd' [many users]
+ - added note about precision errors to option 'd' [many users]
- added note about qh_findbest() to the Qhull library section [L. Lai]
- 'make install' renames qhull.man to qhull.1 for Unix [M. Phillips]
- renamed README, etc. to *.txt to match WWW conventions [D. Cervone]
@@ -784,7 +806,7 @@ qhull V2.1 6/7/95
- fixed cast in qh_point and qh_pointid for 64-bit architectures
- fixed URL for Amenta's list of computational geometry software
- fixed cast in qh_meminitbuffers for qhmem.freelists
- - added test for !qh half_space in qh readpoints
+ - added test for !qh half_space in qh readpoints
- clarified options for qh_printhelp_singular()
- discussed non-simplicial facet area under option 'Fa' in qhull.1
@@ -799,7 +821,7 @@ qhull V2.1 beta 5/15/95
======= main changes ========
- added halfspace intersection ('Hn,n,n')
- - facet merging is better, especially for high dimensions
+ - facet merging is better, especially for high dimensions
- added 'Qx' for exact merges of coplanar points and precision faults
- facet merging is faster, especially for high dimensions.
e.g., convex hull of the 8-d hypercube is seven times faster
@@ -819,12 +841,12 @@ qhull V2.1 beta 5/15/95
- added 'Un' option to set width of facet for coplanar points.
This replaces the previous rules for determining coplanar points.
- changed default MINoutside ('Wn') to twice MINvisible ('Vn')
- - Geomview output adjusts point radii for MINvisible 'Vn'
+ - Geomview output adjusts point radii for MINvisible 'Vn'
- the input format allows the number of points to precede the dimension
- options 'v' 'd' 'FAn' and 'FMn' record good facets ('Pg')
- added 'Fd' and 'FD' options for homogeneous coordinates in cdd format
- in rbox, added 'h' flag to generate homogeneous coordinates in cdd format
- - option 'PAn' prints out the n facets with the largest area
+ - option 'PAn' prints out the n facets with the largest area
- option 'PMn' prints out the n facets with the most merges
- option 'Po' under tracing ('Tn') no longer tries to write erroneous facets
- option 'TCn' only prints the old 'visible' facets for 'f'
@@ -838,12 +860,12 @@ qhull V2.1 beta 5/15/95
- added 'Q4' to avoid merges of old facets into new facets (does worse)
- added 'Q5' to skip qh_check_maxout (faster, but less accurate)
- added 'Q6' to skip pre-merge of concave and coplanar facets
- - added 'Qv' for testing vertex neighbors for convexity (needs merge option)
+ - added 'Qv' for testing vertex neighbors for convexity (needs merge option)
- added warning if mix Geomview output with other outputs ('Po' turns off)
- options 'o v' for 3-d and higher sort the Voronoi vertices by index
======= documentation =======
- - rewrote the introduction and precision sections
+ - rewrote the introduction and precision sections
- added a section on performance
- added an example on halfspace intersection
- installed examples of Qhull in
@@ -860,7 +882,7 @@ qhull V2.1 beta 5/15/95
- option in user.h (qh_NOmerge) to turn off merging in qhull.
- use this instead of redefining qh_merge_nonconvex in user.c
- simplified user_eg.c. See qh_call_qhull() in user.c for the full version
-
+
======== bug fixes ============
- fixed error in number of points for 'rbox 100 r' (odd distribution)
- fixed performance error in qh_degen_redundant_neighbors
@@ -883,7 +905,7 @@ qhull V2.1 beta 5/15/95
- added facet->f for facet pointers while merging and for facet area
- added dfacet/dvertex for printing facets/vertices while debugging
- added qh_produce_output and qh_printsummary
-
+
======== changes to code ==========
- moved qh_setfacetplane from qh_makenewfacets to qh_makenewplanes
- added qh_setfree2, qh_setcompact, and qh_setduplicate to set.c
@@ -915,7 +937,7 @@ qhull V2.1 beta 5/15/95
- removed angle argument from qh_merge_degenredundant and qh_mergefacet
only used for tracing
- getmergeset_initial had extra test of neighbor->simplicial
- - ridge->nonconvex is now set on only one ridge between non-convex facets
+ - ridge->nonconvex is now set on only one ridge between non-convex facets
- moved centrum deletion to qh_updatetested
- qh_isnewmerge(facet) changed to facet->newmerge (removed NEWmerges)
- qh_findbestneighbor reports correct distance even if testcentrum
@@ -950,21 +972,21 @@ qhull V2.01 6/17/94
- added an input warning to qh_check_points ('Tv') if coplanars and no 'Qc'
- qh_partitionpoint: always counts coplanar partitions (Zcoplanarpart)
- rewrote qh_printhelp_degenerate to emphasize option 'C-0'
- - For Geomview output, roundoff is not needed when printing the inner and
+ - For Geomview output, roundoff is not needed when printing the inner and
outer planes. This improves Geomview output for the 'Rn' option.
- - For Geomview output without coplanar points or vertices, qh_GEOMepislon
+ - For Geomview output without coplanar points or vertices, qh_GEOMepislon
is not needed. This removes the edge gap when displaying a Voronoi cell.
- - For Geomview output 'Gp', direct vertices to the interior point
+ - For Geomview output 'Gp', direct vertices to the interior point
instead of the arithmetic center of the displayed vertices.
-
+
qhull V2.01 6/11/94
- - if pre-merge, 'Qf' is automatically set. Otherwise an outside point may
+ - if pre-merge, 'Qf' is automatically set. Otherwise an outside point may
be dropt by qh_findbest(). This slows down partitioning.
- always use 'Qc' if merging and all facet->maxoutside's must be right.
Otherwise distributions with many coplanar points may occassionally
- miss a coplanar point for a facet. This is because qh_findbest, when
- called by qh_check_maxout, can become stuck at a local maximum if
- the search is started at an arbitrary facet. With 'Qc', the search
+ miss a coplanar point for a facet. This is because qh_findbest, when
+ called by qh_check_maxout, can become stuck at a local maximum if
+ the search is started at an arbitrary facet. With 'Qc', the search
is started from a coplanar facet. For example,
rbox 1000 W8e-6 t | qhull C-0 Tv
will (rarely) report that a facet->minoutside is incorrect
@@ -974,7 +996,7 @@ qhull V2.01 6/11/94
- 'rbox t' reports random seed in comment line
- qh_errexit reports rbox_command | qhull_command and 'QR' random seed
- added additional tracing to bestdist and setfacetplane
- - in qh_checkconvex, need to test coplanar against 0 instead of -DISTround
+ - in qh_checkconvex, need to test coplanar against 0 instead of -DISTround
- in qh_checkconvex, always test centrums if merging. The opposite
vertex of a simplicial facet may be coplanar since a vertex of
a simplicial facet may be above the facet's hyperplane.
@@ -985,7 +1007,7 @@ qhull V2.01 6/11/94
qhull V2.01 6/2/94
- 's' prints summary to stderr
- multiple output formats printed in order to stdout
- - added statistic for worst-case distance for merging simplicial facets
+ - added statistic for worst-case distance for merging simplicial facets
can not hope for a better "max distance above/below facet"
print factor for "max distance.."/"merge simplicial" in printsummary
- fixed error in scaling input with min/max reversed ('Qb0:1B0:-1')
@@ -1021,7 +1043,7 @@ Converting from qhull 1.01 to qhull 2.00
- all rbox distributions are now scaled to a 0.5 box (use 'Bn' to change)
- rbox now adds a comment line. This may be removed by 'rbox n'
- 'rbox r s Z G' no longer includes the positive pole
- - no changes to the Macintosh version
+ - no changes to the Macintosh version
qhull V2.00 5/23/94
- if force output ('Po'), facet->maxoutside= 'Wn' since coplanars not updated
diff --git a/src/Make-config.sh b/src/Make-config.sh
deleted file mode 100644
index cc247865257de3b26f6c1665b9f85d243812c62a..0000000000000000000000000000000000000000
--- a/src/Make-config.sh
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/bin/sh -e
-#
-# Make-config.sh
-#
-# Setup for Debian build
-#
-# Writes configure.in and Makefile.am files
-# and runs automake and autoconfig
-#
-# Use 'make dist' to build Unix distribution.
-# Use 'configure; make' to build Qhull
-#
-#note:
-# 'configure; make' does not work under cygwin.
-# src/unix.c:354: variable 'qh_qh' can't be auto-imported.
-# Please read the documentation for ld's --enable-auto-import for details.
-
-###################################################
-########### ../configure.in ######################
-###################################################
-
-echo Create ../configure.in
-cat >../configure.in <<\HERE-CONFIGURE
-dnl configure.in for the qhull package
-dnl Author: Rafael Laboissiere <rafael@debian.org>
-dnl Created: Mon Dec 3 21:36:21 CET 2001
-
-AC_INIT(src/qhull.c)
-AM_INIT_AUTOMAKE(qhull, 2002.1)
-
-AC_PROG_CC
-AC_PROG_LIBTOOL
-
-AC_OUTPUT([Makefile src/Makefile html/Makefile eg/Makefile])
-
-HERE-CONFIGURE
-
-###################################################
-########### ../Makefile.am #######################
-###################################################
-
-echo Create ../Makefile.am
-cat >../Makefile.am <<\HERE-TOP
-### Makefile.am for the qhull package (main)
-### Author: Rafael Laboissiere <rafael@debian.org>
-### Created: Mon Dec 3 21:36:21 CET 2001
-
-### Documentation files
-
-# to:
-docdir = $(prefix)/share/doc/$(PACKAGE)
-
-# which:
-doc_DATA = \
- index.htm \
- Announce.txt \
- COPYING.txt \
- README.txt \
- REGISTER.txt
-
-### Extra files to be included in the tarball
-
-EXTRA_DIST = \
- $(doc_DATA) \
- File_id.diz \
- QHULL-GO.pif
-
-### Subdirectories for Automaking
-
-SUBDIRS = src html eg
-
-HERE-TOP
-
-###################################################
-########### ../eg/Makefile.am ####################
-###################################################
-
-echo Create ../eg/Makefile.am
-cat >../eg/Makefile.am <<\HERE-AM
-### Makefile.am for the qhull package (eg)
-### Author: Rafael Laboissiere <rafael@debian.org>
-### Created: Mon Dec 3 21:36:21 CET 2001
-
-### Documentation files
-
-# to:
-docdir = $(prefix)/share/doc/$(PACKAGE)
-examplesdir = $(docdir)/examples
-
-# which:
-examples_DATA = \
- q_eg \
- q_egtest \
- q_test \
- Qhull-go.bat \
- q_test.bat
-
-### Extra files to be included in the tarball
-
-EXTRA_DIST = $(examples_DATA)
-
-HERE-AM
-
-###################################################
-########### ../html/Makefile.am ##################
-###################################################
-
-echo Create ../html/Makefile.am
-cat >../html/Makefile.am <<\HERE-HTML
-### Makefile.am for the qhull package (html)
-### Author: Rafael Laboissiere <rafael@debian.org>
-### Created: Mon Dec 3 21:36:21 CET 2001
-
-### Man pages (trick to get around .man extension)
-
-%.1: %.man
- cp $< $@
-CLEANFILES = *.1
-man_MANS = rbox.1 qhull.1
-
-### Documentation files
-
-# to:
-docdir = $(prefix)/share/doc/$(PACKAGE)
-htmldir = $(docdir)/html
-
-# which:
-html_DATA = \
- index.htm \
- qconvex.htm \
- qdelau_f.htm \
- qdelaun.htm \
- qh--4d.gif \
- qh--cone.gif \
- qh--dt.gif \
- qh--geom.gif \
- qh--half.gif \
- qh--rand.gif \
- qh-eg.htm \
- qh-faq.htm \
- qh-get.htm \
- qh-impre.htm \
- qh-in.htm \
- qh-optc.htm \
- qh-optf.htm \
- qh-optg.htm \
- qh-opto.htm \
- qh-optp.htm \
- qh-optq.htm \
- qh-optt.htm \
- qh-quick.htm \
- qhalf.htm \
- qhull.htm \
- qvoron_f.htm \
- qvoronoi.htm \
- rbox.htm
-
-### Extra files to be included in the tarball
-
-EXTRA_DIST = \
- $(html_DATA) \
- qhull.man \
- qhull.txt \
- rbox.man \
- rbox.txt
-
-HERE-HTML
-
-###################################################
-########### ../src/Makefile.am ###################
-###################################################
-
-echo Create ../src/Makefile.am
-cat >../src/Makefile.am <<\HERE-SRC
-### Makefile.am for the qhull package (src)
-### Author: Rafael Laboissiere <rafael@debian.org>
-### Created: Mon Dec 3 21:36:21 CET 2001
-
-### Shared Library
-
-# to:
-lib_LTLIBRARIES = libqhull.la
-
-# from:
-libqhull_la_SOURCES = \
- user.c \
- global.c \
- stat.c \
- io.c \
- geom2.c \
- poly2.c \
- merge.c \
- qhull.c \
- geom.c \
- poly.c \
- qset.c \
- mem.c
-
-# how:
-libqhull_la_LDFLAGS = -version-info 0:0:0 -lm
-
-### Utility programs
-
-# to:
-bin_PROGRAMS = qhull rbox qconvex qdelaunay qvoronoi qhalf
-
-# from:
-qhull_SOURCES = unix.c
-rbox_SOURCES = rbox.c
-qconvex_SOURCES = qconvex.c
-qdelaunay_SOURCES = qdelaun.c
-qvoronoi_SOURCES = qvoronoi.c
-qhalf_SOURCES = qhalf.c
-
-# how:
-qhull_LDADD = libqhull.la
-rbox_LDADD = libqhull.la
-qconvex_LDADD = libqhull.la
-qdelaunay_LDADD = libqhull.la
-qvoronoi_LDADD = libqhull.la
-qhalf_LDADD = libqhull.la
-
-### Include files
-
-pkginclude_HEADERS = \
- geom.h \
- mem.h \
- poly.h \
- qhull_a.h \
- stat.h \
- io.h \
- merge.h \
- qhull.h \
- qset.h \
- user.h
-
-
-### Example programs
-
-# to:
-docdir = $(prefix)/share/doc/$(PACKAGE)
-examplesdir = $(docdir)/examples
-
-# which:
-examples_DATA = \
- user_eg.c \
- user_eg2.c \
- qhull_interface.cpp \
- Makefile.txt \
- Make-config.sh \
- MBorland
-
-doc_DATA = Changes.txt \
- index.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
-
-
-### Extra files to be included in the tarball
-
-EXTRA_DIST = \
- $(doc_DATA) \
- $(examples_DATA)
-
-HERE-SRC
-
-###################################################
-########### run automake autoconf ################
-###################################################
-
-
-echo Run automake, libtoolize, and autoconf
-cd ..; aclocal &&\
- automake --foreign --add-missing --force-missing && \
- libtoolize --force && \
- autoconf
-
diff --git a/src/Makefile b/src/Makefile.txt
similarity index 100%
rename from src/Makefile
rename to src/Makefile.txt
diff --git a/src/global.c b/src/global.c
index ff0cafb5eb339f21fdda7f6b908e1f82b0044b62..ae3ea2e75db386a8809ce458846b3fd06cee767b 100644
--- a/src/global.c
+++ b/src/global.c
@@ -42,7 +42,7 @@ qhT qh_qh; /* all global variables.
recompile user_eg.c, rbox.c, qhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c
*/
-char *qh_version = "2003.1 2003/12/30";
+char *qh_version = "2009.1 2009/06/11";
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="appendprint">-</a>
diff --git a/src/io.c b/src/io.c
index 2ef5b946a50789e68d2ebd7fdb79ecefc1b9144f..542a49c18a3847517f93c8be770752216f1dafd5 100644
--- a/src/io.c
+++ b/src/io.c
@@ -66,8 +66,8 @@ void qh_produce_output(void) {
qh_memstatistics (qh ferr);
d_1= sizeof(setT) + (qh hull_dim - 1) * SETelemsize;
fprintf(qh ferr, "\
- size in bytes: merge %d ridge %d vertex %d facet %d\n\
- normal %d ridge vertices %d facet vertices or neighbors %d\n",
+ size in bytes: merge %lu ridge %lu vertex %lu facet %lu\n\
+ normal %d ridge vertices %d facet vertices or neighbors %lu\n",
sizeof(mergeT), sizeof(ridgeT),
sizeof(vertexT), sizeof(facetT),
qh normal_size, d_1, d_1 + SETelemsize);
diff --git a/src/rbox.c b/src/rbox.c
index 1c288bddc96bb7214908ce94ca0c498169e51de1..d3e9c4bc96a1fdec5f6ccf005fad98be913a6036 100644
--- a/src/rbox.c
+++ b/src/rbox.c
@@ -218,12 +218,15 @@ int main(int argc, char **argv) {
s= argv[i]+1;
if (*s)
meshn= strtod (s, &s);
- if (*s == ',')
- meshm= strtod (++s, &s);
- else
+ if (*s == ',') {
+ s++;
+ meshm= strtod (s, &s);
+ } else
meshm= 0.0;
- if (*s == ',')
- meshr= strtod (++s, &s);
+ if (*s == ',') {
+ s++;
+ meshr= strtod (s, &s);
+ }
else
meshr= sqrt (meshn*meshn + meshm*meshm);
if (*s) {
diff --git a/src/stat.c b/src/stat.c
index 3a1aa051ff21225c498744003e4c3becc9eebc4c..9ac3b0e74312f7e9ebe731d614ad4507d7f99ec8 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -460,7 +460,7 @@ void qh_initstatistics (void) {
qh_allstatI();
if (qhstat next > sizeof(qhstat id)) {
fprintf (qhmem.ferr, "qhull error (qh_initstatistics): increase size of qhstat.id[].\n\
- qhstat.next %d should be <= sizeof(qhstat id) %d\n", qhstat next, sizeof(qhstat id));
+ qhstat.next %d should be <= sizeof(qhstat id) %lu\n", qhstat next, sizeof(qhstat id));
#if 0 /* for locating error, Znumridges should be duplicated */
for (i=0; i < ZEND; i++) {
int j;