diff --git a/Announce.txt b/Announce.txt
index 668134178eb9f10f02dda8cfdb2b1ee84ab76a8c..0429a5453388a41e199f5f1ce6fc33599f492d80 100644
--- a/Announce.txt
+++ b/Announce.txt
@@ -1,13 +1,11 @@
- Qhull Version 3.1 October 4, 2001
+ Qhull 2002.1 2002/8/20
- http://www.geom.umn.edu/locate/qhull
+ http://www.geom.umn.edu/software/qhull
+ http://www.geom.umn.edu/software/download/qhull.html
+ http://savannah.gnu.org/projects/qhull/
+ http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html
http://www.geomview.org
- ftp://geom.umn.edu/pub/software/qhull.tar.gz
- ftp://geom.umn.edu/pub/software/qhull3-0.zip
- ftp://geom.umn.edu/pub/software/qhull-96.ps.gz
- ftp://geom.umn.edu/pub/software/qhull-1.0.tar.gz
- ftp://geom.umn.edu/pub/software/qhull.sit.hqx
Qhull computes convex hulls, Delaunay triangulations, Voronoi diagrams,
furthest-site Voronoi diagrams, and halfspace intersections about a point.
@@ -20,24 +18,17 @@ 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.
-To download Qhull on Unix systems:
+To download Qhull:
- ftp geom.umn.edu (or 128.101.25.35), user: anonymous
- password: <your user id>, cd pub/software, bin, get qhull.tar.gz, quit
- gunzip qhull.tar.gz, tar xf qhull.tar, cd qhull3.0, more README.txt
+ http://www.geom.umn.edu/software/download/qhull.html
-To download Qhull on Win32 systems:
-
- ftp geom.umn.edu (or 128.101.25.35), user: anonymous
- password: <your user id>, cd pub/software, bin, get qhull3-0.zip, quit
- extract with winzip32, read README.txt
-
-Download qhull-96.ps.gz for:
+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.
http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/
+ http://www.geom.umn.edu/software/qhull/qhull-96.ps
Abstract:
diff --git a/COPYING.txt b/COPYING.txt
index 09b28a263efb41f3e03697762c433912a83ffb04..1334eba6d0be764e899a5184c1b5dcb49e718f15 100644
--- a/COPYING.txt
+++ b/COPYING.txt
@@ -1,4 +1,4 @@
- Qhull, Copyright (c) 1993-2001
+ Qhull, Copyright (c) 1993-2002
The National Science and Technology Research Center for
Computation and Visualization of Geometric Structures
@@ -12,7 +12,7 @@
This software includes Qhull from The Geometry Center. Qhull is
copyrighted as noted above. Qhull is free software and may be obtained
-via anonymous ftp from geom.umn.edu. It may be freely copied, modified,
+via http from www.geom.umn.edu. It may be freely copied, modified,
and redistributed under the following conditions:
1. All copyright notices must remain intact in all files.
diff --git a/File_id.diz b/File_id.diz
index d81596ebf55c150a051ca62f42ca99bf0698b48f..588cb2ffc1513425a43ef6b8a88dbff510004420 100644
--- a/File_id.diz
+++ b/File_id.diz
@@ -7,6 +7,6 @@ works with 2-d, 3-d, 4-d, 5-d, and higher
dimensions. It computes volumes, surface
areas, and approximations. It runs in a
DOS window under Windows 95/NT.
-www.geom.umn.edu/locate/qhull, freeware.
+www.geom.umn.edu/software/qhull, freeware.
diff --git a/README.txt b/README.txt
index a79c168eed4da630854e74f46b3f16ca56bfd6b0..9ef958a1f47de3f64c4ddacf6fd701f1c2d4df7a 100644
--- a/README.txt
+++ b/README.txt
@@ -1,24 +1,24 @@
Name
- qhull, rbox Version 3.1 October 4, 2001
+ qhull, rbox 2002.1 August 20, 2002
Convex hull, Delaunay triangulation, Voronoi diagrams, Halfspace intersection
- Documentation:
- qhull3.0/html/index.htm
+ Documentation:
+ html/index.htm
Available from:
- <http://www.geom.umn.edu/locate/qhull>
- <ftp://geom.umn.edu/pub/software/qhull.tar.Z>
- <ftp://geom.umn.edu/pub/software/qhull3-0.zip>
+ <http://www.geom.umn.edu/software/qhull>
+ <http://savannah.gnu.org/projects/qhull>
+ <http://www.thesa.com/software/qhull>
Version 1 (simplicial only):
- <ftp://geom.umn.edu/pub/software/qhull-1.0.tar.Z>
- <ftp://geom.umn.edu/pub/software/qhull.sit.hqx>
+ <http://www.geom.umn.edu/software/qhull/qhull-1.0.tar.gz>
+ <http://www.geom.umn.edu/software/qhull/qhull.sit.hqx>
News and a paper:
<http://www.geom.umn.edu/~bradb/qhull-news.html>
- <ftp://geom.umn.edu/pub/software/qhull-96.ps.gz>
+ <http://www.geom.umn.edu/software/qhull/qhull-96.ps>
Purpose
@@ -45,8 +45,11 @@ Environment requirements
Qhull is copyrighted software. Please read COPYING.txt and REGISTER.txt
before using or distributing Qhull.
+To contribute to Qhull
-Qhull on Windows 95, 98, ME, NT, 2000
+ Qhull is on Savannah, http://savannah.gnu.org/projects/qhull/
+
+Qhull on Windows 95, 98, ME, NT, 2000, XP
The zip file contains rbox.exe, qhull.exe, qconvex.exe, qdelaunay.exe,
qhalf.exe, qvoronoi.exe, documentation files, and source files.
@@ -55,68 +58,82 @@ Qhull on Windows 95, 98, ME, NT, 2000
- Unzip the files into a directory. You may use WinZip32 <www.hotfiles.com>
- Open a DOS window for the directory.
- In Windows 95, the DOS window needs improvement.
- - Double-click on qhull3.0\eg\qhull-go.bat to call doskey (arrow keys).
+ - Double-click on qhull\eg\qhull-go.bat to call doskey (arrow keys).
- Increase the size of the screen font to 8x12.
- - If the text is too dim, fix the screen colors with shareware (crt.exe)
- - If you use qhull a lot, consider using the Unix shell,
- tcsh (ftp.gw.com/pub/unix/tcsh) and the
+ - If the text is too dim, fix the screen colors with shareware (e.g., crt.exe)
+ - If you use qhull a lot, consider using the Cygwin Unix shell,
Cygwin tools (http://sources.redhat.com/cygwin/)
- Execute 'qconvex' for a synopsis and examples.
- Execute 'rbox 10 | qconvex' to compute the convex hull of 10 random points.
- Execute 'rbox 10 | qconvex i TO file' to write results to 'file'.
- If an error occurs, Windows 95 sends the error to stdout instead of stderr
- use 'TO xxx' to send normal output to xxx and error output to stdout
- - Browse the documentation: qhull3.0\html\index.htm
+ - Browse the documentation: qhull\html\index.htm
Compiling for Unix
- The gzip file, qhull.tar.gz, contains documentation and source files for
+ The gzip file, qhull.tgz, contains documentation and source files for
qhull and rbox.
To unpack the gzip file
- - gunzip qhull.tar.gz
- - tar xf qhull.tar
- - cd qhull3.0
+ - tar zxf qhull.tgz
+ - cd qhull
- To compile qhull, qconvex, qdelaunay, qhalf, qvoronoi, and rbox
- - cd qhull3.0/src
+ Compiling with the Debian Make:[R. Laboissiere]
+ - cd src
+ - ./Make-config.sh
+ - cd ..
+ - configure
+ - make
+
+ Compiling with Makefile (i.e., Makefile.txt)
+ - cd src
- in Makefile, check the CC, CCOPTS1, PRINTMAN, and PRINTC defines
- the defaults are gcc and enscript
- CCOPTS1 should include the ANSI flag. It defines __STDC__
- in user.h, check the definitions of qh_SECticks and qh_CPUclock.
- use '#define qh_CLOCKtype 2' for timing runs longer than 1 hour
- - type: make doc
- - this prints the documentation.
- - See also qhull3.0/html/index.htm
- - type: make
+ - type: make
- this builds: qhull qconvex qdelaunay qhalf qvoronoi rbox libqhull.a
+ - type: make doc
+ - this prints the man page
+ - See also qhull/html/index.htm
- if your compiler reports many errors, it is probably not a ANSI C compiler
- you will need to set the -ansi switch or find another compiler
- if your compiler warns about missing prototypes for fprintf() etc.
- this is ok, your compiler should have these in stdio.h
- if your compiler warns about missing prototypes for memset() etc.
- include memory.h in qhull_a.h
+ - if your compiler is gcc-2.95.1, you need to set flag -fno-strict-aliasing.
+ - This flag is set by default for other versions [Karas, Krishnaswami]
- if your compiler reports "global.c: storage size of 'qh_qh' isn't known"
- delete the initializer "={0}" in global.c, stat.c and mem.c
- if your compiler warns about "stat.c: improper initializer"
- this is ok, the initializer is not used
- if you have trouble building libqhull.a with 'ar'
- - try 'make qhullx'
+ - try 'make -f Makefile.txt qhullx'
- if the code compiles, the qhull test case will automatically execute
- if an error occurs, there's an incompatibility between machines
- - if you can, try a different compiler
- - you can turn off the Qhull memory manager with qh_NOmem in mem.h
- - you can turn off compiler optimization (-O2 in Makefile)
- - if you find the source of the problem, please let us know
- - if you have Geomview,
+ - For gcc-2.95.1, you need to set flag -fno-strict-aliasing.
+ It is set by default for other versions of gcc [Karas, Krishnaswami]
+ - If you can, try a different compiler
+ - You can turn off the Qhull memory manager with qh_NOmem in mem.h
+ - You can turn off compiler optimization (-O2 in Makefile)
+ - If you find the source of the problem, please let us know
+ - if you have Geomview (www.geomview.org)
- try 'rbox 100 | qconvex G >a' and load 'a' into Geomview
- run 'q_eg' for Geomview examples of Qhull output (see qh-eg.htm)
- to install the programs and their man pages:
- define MANDIR and BINDIR
- type 'make install'
+Compiling for Windows NT, 2000, XP with cygwin (www.cygwin.com)
+
+ - install cygwin with gcc, make, ar, and ln
+ - cd qhull/src
+ - make -f Makefile.txt
-Compiling for Windows 95, 98, NT, 2000
+Compiling for Windows 95, 98, NT, 2000, XP
Qhull compiles as a console application in Visual C++ 5.0 at warning
level 3.
@@ -129,32 +146,38 @@ Compiling for Windows 95, 98, NT, 2000
- create a "Win32 console application" called "rbox"
- add rbox.c
- Visual C++ quickstart for qhull library, qconvex, etc.
+ Visual C++ quickstart for qhull library, qconvex.exe, etc.
- To simplify setting up lots of projects,
- create a "Win32 console application" called "qhull source"
- add all .c files from .../src/...
- change Project:Settings... when done
+ - create a temporary "Win32 console application" called "source"
+ - add all .c files from .../src/...
+ - In Tools::Options::Tab
+ Set tab size to 8 and indent size to 2
- create a "Win32 console application" called "rbox"
- move rbox.c from "qhull source"
+ - for Project:Settings..., Link
+ you only need the default libraries
- build the project
- create a "Win32 static library" called "library"
- move these files from "qhull source"
geom.c geom2.c global.c io.c mem.c merge.c poly.c poly2.c qhull.c
qset.c stat.c user.c
+ - set the library file (use the same for debug and release)
- build the project
- create a "Win32 console application" called "qhull"
- move unix.c from "qhull source"
- - add "qhull library.lib" from Visual C++'s build directory
+ - Set the library file in Project:Settings..., Link
+ - Qhull does not use other libraries
- create a "Win32 console application" called "qconvex"
- move qconvex.c from "qhull source"
- - copy "qhull library.lib" from "qhull"
+ - Set the library file in Project:Settings..., Link
- do the same for qdelaun.c, qhalf, qvoronoi.c, user_eg.c, user_eg2.c
- delete "qhull sources" since it is no longer needed
+ - Set the library file in Project:Settings..., Link
- use Project:Settings to make any changes
- use batch build to rebuild everything
@@ -182,7 +205,7 @@ Compiling for the Power Macintosh
Windows 95'. Instead of using SIOUX, Qhull may be embedded within an
application.
- Version 1 is available for Macintosh computers by ftp of qhull.sit.hqx
+ Version 1 is available for Macintosh computers by download of qhull.sit.hqx
It reads point coordinates from a standard file and returns output
to a standard file. There is no graphical output.
@@ -205,12 +228,15 @@ Distributed files
COPYING.txt // copyright notice
Announce.txt // announcement
Changes.txt // change history for Qhull and rbox
- Makefile // Makefile for Unix 'make'
- MBorland // Makefile for Borland C++/Win32
qh-faq.htm // Frequently asked questions
qh-home.htm // Home page
+ qh-get.htm // Download page
html/index.htm // Manual
-
+ Makefile.txt // Makefile for Unix or cygwin 'make'
+ MBorland // Makefile for Borland C++/Win32
+ Make-config.sh // Create Debian configure and automake
+
+src/
rbox consists of:
rbox.exe // Win32 executable (.zip only)
rbox.htm // html manual
@@ -254,7 +280,7 @@ Distributed files
user.c // user re-definable functions
user_eg.c // example of incorporating qhull into a user program
user_eg2.c // more complex example
- qhull_interface.cpp // call Qhull from C++
+ qhull_interface.cpp // call Qhull from C++
other source files:
qhull_a.h // include file for *.c
diff --git a/REGISTER.txt b/REGISTER.txt
index 0018b822d2ebe755d4bfa40dfb8cd5768248dcee..767eb1c0cdac6caa78e9f60d728876402b08c90b 100644
--- a/REGISTER.txt
+++ b/REGISTER.txt
@@ -28,7 +28,7 @@ To cite Qhull, 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.geom.umn.edu/locate/qhull
+ Dec 1996. http://www.geom.umn.edu/software/qhull
Please send e-mail to
diff --git a/eg/q_test b/eg/q_test
index 4f9cbe2b16603117c35f7950af592fc3f58faf90..7b8d30677eedecc14d66c691ffc7359f4772da9e 100644
--- a/eg/q_test
+++ b/eg/q_test
@@ -218,7 +218,7 @@ rbox 6 r s c G0.1 D2 | qhull d FA Tcv
rbox 6 r s c G0.1 D2 | qhull Qt v p Tcv
rbox c | qhull Qt C-0.1 Qc FF s FQ Fi n Fo FQ FI Fm Fn FN FO FO FQ Fs FS FV Fv Tcv
rbox 6 r s c G0.1 D2 P0.1,0.1 | qhull s FP d FO Qt
-RBOX 100 W0 | QHULL Tv Q11 FO
+rbox 100 W0 | qhull Tv Q11
echo === test unbounded intersection ${d:-`date`}
rbox c | qhull PD0:0.5 n | qhull H0 Fp Tcv
@@ -351,12 +351,12 @@ rbox 100 D6 t |qhull A-0.9999 Qx Qc Tcv
rbox 50 D7 t |qhull A-0.99999 Qx Qc Tcv W0.1
echo === check bad cases for Qhull. May cause errors ${d:-`date`}
-RBOX 1000 L100000 s G1e-6 t | QHULL Tv
-RBOX 1000 L100000 s G1e-6 t | QHULL Tv Q10
+rbox 1000 L100000 s G1e-6 t | qhull Tv
+rbox 1000 L100000 s G1e-6 t | qhull Tv Q10
rbox 1000 s Z1 G1e-13 t | qhull Tv
-RBOX 1000 s W1e-13 P0 t | QHULL d Qbb Qc Tv
-RBOX 1000 s W1e-13 t | QHULL d Tv
-RBOX 1000 s W1e-13 t D2 | QHULL d Tv
+rbox 1000 s W1e-13 P0 t | qhull d Qbb Qc Tv
+rbox 1000 s W1e-13 t | qhull d Tv
+rbox 1000 s W1e-13 t D2 | qhull d Tv
echo =======================================================
echo =======================================================
diff --git a/eg/q_test.bat b/eg/q_test.bat
index c1ca11a8c31004bf13b1faf744bb4399235d1ea9..a5561a4a8ebf38d3726f4670316027ddc5ed7961 100644
--- a/eg/q_test.bat
+++ b/eg/q_test.bat
@@ -1,4 +1,4 @@
-echo q_test for Windows DOS box 2001/10/04 >q_test.x
+echo q_test for Windows DOS box 2002/6/1 >q_test.x
echo === errors if 'user_eg' and 'user_eg2' not found ===
echo === check user_eg === >>q_test.x
echo "user_eg 'QR1 p n Qt' 'v p' Fp" >>q_test.x
diff --git a/html/index.htm b/html/index.htm
index 71527b8b9244ab64f716efb8a3c7db56ce53b364..70c67a213bf08685bf22ec4480648c470ea36a5e 100644
--- a/html/index.htm
+++ b/html/index.htm
@@ -15,7 +15,7 @@ NOTE -- verify all links by 'grep href=' 'grep name=' add # 'sort /+7'
<body>
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b><a
href="http://www.geom.umn.edu/~bradb/qhull-news.html">News</a> about Qhull<br>
<b>Up:</b> <a href="qh-faq.htm">FAQ</a> about Qhull<br>
@@ -83,9 +83,9 @@ guarantees simplicial output, but it
is less accurate than merged facets. For merged facets, Qhull
reports the maximum outer and inner plane.
-<p><i>Brad Barber, Cambridge MA, October 4, 2001</i></p>
+<p><i>Brad Barber, Cambridge MA, June 1, 2002</i></p>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -99,6 +99,7 @@ Contents </a></h2>
instructions<br>
<li><a href="../COPYING.txt">COPYING.txt</a> - copyright notice<br>
<li><a href="../REGISTER.txt">REGISTER.txt</a> - registration<br>
+ <li><a href="qh-get.htm">Download</a> Qhull
<li><a href="qh-faq.htm">FAQ</a> - Frequently Asked Questions about Qhull<br>
<li><a href="qh-quick.htm#programs">Programs</a> - Program quick reference<br>
<li><a href="qh-quick.htm#options">Options</a> - Option quick reference<br>
@@ -136,13 +137,14 @@ Contents </a></h2>
<li><a href="http://www.geom.umn.edu/~bradb/qhull-news.html#use">How</a> is Qhull used?
<li><a href="http://www.geom.umn.edu/software/qhull/html/qh-faq.htm">Current FAQ</a> for Qhull
- <li><a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull with additional URLs
+ <li><a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull with additional URLs
+ (<a href=qh-home.htm>local copy</a>)
<li><a href="news:comp.graphics.algorithms">Newsgroup</a>:
comp.graphics.algorithms
<li><a
href="http://exaflop.org/docs/cgafaq/">FAQ</a> for computer graphics algorithms and
<a href="http://exaflop.org/docs/cgafaq/cga6.html">geometric</a> structures.
- <li>Amenta's <a href="http://www.geom.umn.edu/locate/cglist">Directory
+ <li>Amenta's <a href="http://www.geom.umn.edu/software/cglist">Directory
of Computational Geometry Software </a></li>
<li>Bronnimann's <a
href="http://www.inria.fr/prisme/personnel/bronnimann/cgt/WWW.html">Computational
@@ -541,8 +543,7 @@ href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry
goes wrong</a></h2>
<blockquote>
-<p>Please report bugs to <a
-href="http://www.geom.umn.edu/software/qhull/qhull-bug-mail.html">qhull_bug@geom.umn.edu
+<p>Please report bugs to <a href=mailto:qhull_bug@geom.umn.edu>qhull_bug@geom.umn.edu</a>
</a>. Please report if Qhull crashes. Please report if Qhull
generates an "internal error". Please report if Qhull
produces a poor approximate hull in 2-d, 3-d or 4-d. Please
@@ -596,10 +597,8 @@ myself. Qhull is maintained part-time. </p>
<h2><a href="#TOC">»</a><a name="email">Email</a></h2>
<blockquote>
-<p>Please send correspondence to Brad Barber at <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
-</a>and report bugs to <a
-href="http://www.geom.umn.edu/software/qhull/qhull-bug-mail.html">qhull_bug@geom.umn.edu
+<p>Please send correspondence to Brad Barber at <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
+and report bugs to <a href=mailto:qhull_bug@geom.umn.edu>qhull_bug@geom.umn.edu</a>
</a>. Let me know how you use Qhull. If you mention it in a
paper, please send a reference and abstract.</p>
@@ -661,7 +660,7 @@ Huhdanpaa, "The Quickhull Algorithm for Convex Hulls," <i>ACM
Transactions on Mathematical Software</i>, Vol. 22, No. 4 (Dec.
1996), p. 469-483 [<a
href="http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/">http://www.acm.org</a>;
-<a href="ftp://geom.umn.edu/pub/software/qhull-96.ps">ftp://geom.umn.edu</a>].
+<a href="http://www.geom.umn.edu/software/qhull/qhull-96.ps">http://www.geom.umn.edu/software/qhull/qhull-96.ps</a>].
</p>
<p><a name="cla-sho89">Clarkson</a>, K.L. and P.W. Shor,
@@ -705,19 +704,12 @@ in C</i>, Cambridge University Press, 1994.</p>
<p><a name="pre-sha85">Preparata</a>, F. and M. Shamos, <i>Computational
Geometry</i>, Springer-Verlag, New York, 1985.</p>
-<p>Qhull is available by anonymous ftp from geom.umn.edu. To
-retrieve a copy visit <a
-href="http://www.geom.umn.edu/software/download/qhull.html">Download
-Qhull</a> or, in Unix, ftp geom.umn.edu, user: anonymous, cd
-pub/software, get qhull.tar.Z, quit, uncompress qhull.tar.Z, tar
-xf qhull.tar, cd qhull, make </p>
-
</blockquote>
<!-- Navigation links -->
<hr>
<p><b>Up:</b> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b><a
href="http://www.geom.umn.edu/~bradb/qhull-news.html">News</a> about Qhull<br>
<b>Up:</b> <a href="qh-faq.htm">FAQ</a> about Qhull<br>
@@ -743,8 +735,7 @@ structures</a>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qconvex.htm b/html/qconvex.htm
index a1c5c94bfe274a3c3ecd40c26e540bc8f85b9487..94e52483f5fa015536a3b4c01ae46efa11ad4d9e 100644
--- a/html/qconvex.htm
+++ b/html/qconvex.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a> -- Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -121,7 +121,7 @@ in 5-d and higher. It disables the following Qhull
<a href=qh-quick.htm#options>options</a>: <i>d v H Qbb Qf Qg Qm
Qr Qu Qv Qx Qz TR E V Fp Gt Q0,etc</i>.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -170,6 +170,9 @@ input</a></h3>
<li>point coordinates</li>
</ul>
+<p>Use I/O redirection (e.g., qconvex < data.txt), a pipe (e.g., rbox 10 | qconvex),
+or the '<a href=qh-optt.htm#TI>TI</a>' option (e.g., qconvex TI data.txt).
+
<p>Comments start with a non-numeric character. Error reporting is
simpler if there is one point per line. Dimension
and number of points may be reversed.
@@ -466,7 +469,7 @@ See <a href="index.htm#structure">Qhull's data structures</a>.</p>
<pre>
qconvex- compute the convex hull
- http://www.geom.umn.edu/locate/qhull
+ http://www.geom.umn.edu/software/qhull
input (stdin):
first lines: dimension and number of points (or vice-versa).
@@ -583,7 +586,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
•<a href="qh-quick.htm#options">Options</a>
@@ -606,8 +609,7 @@ Print options:
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qdelau_f.htm b/html/qdelau_f.htm
index de91f121442d55b7f71dd754903d8fe44319d9fc..c165ce6a0575cb9975d9acfb32bbb972da787b55 100644
--- a/html/qdelau_f.htm
+++ b/html/qdelau_f.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -108,7 +108,7 @@ in 4-d and higher. It disables the following Qhull
Qm Qr QR Qv Qx TR E V FC Fi Fo Fp FV Q0,etc</i>.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -131,6 +131,9 @@ input</a></h3>
<li>point coordinates</li>
</ul>
+<p>Use I/O redirection (e.g., qdelaunay Qu < data.txt), a pipe (e.g., rbox 10 | qdelaunay Qu),
+or the '<a href=qh-optt.htm#TI>TI</a>' option (e.g., qdelaunay Qu TI data.txt).
+
<p>For example, this is a square containing four random points.
Its furthest-site Delaunay
triangulation contains one square.
@@ -371,7 +374,7 @@ for furthest-site Delaunay triangulations.
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -394,8 +397,7 @@ for furthest-site Delaunay triangulations.
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qdelaun.htm b/html/qdelaun.htm
index 03261853f9c33275f30b4950f7569faf0a7746f7..8c678883422aeb9cb2d3c55e1e5ec4534c199a28 100644
--- a/html/qdelaun.htm
+++ b/html/qdelaun.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -108,7 +108,7 @@ in 4-d and higher. It disables the following Qhull
Qm Qr QR Qv Qx TR E V FC Fi Fo Fp Ft FV Q0,etc</i>.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -156,6 +156,9 @@ input</a></h3>
<li>point coordinates</li>
</ul>
+<p>Use I/O redirection (e.g., qdelaunay < data.txt), a pipe (e.g., rbox 10 | qdelaunay),
+or the '<a href=qh-optt.htm#TI>TI</a>' option (e.g., qdelaunay TI data.txt).
+
<p>For example, this is four cocircular points inside a square. Its Delaunay
triangulation contains 8 triangles and one four-sided
figure.
@@ -473,7 +476,7 @@ conventions</a>.</p>
<pre>
qdelaunay- compute the Delaunay triangulation
- http://www.geom.umn.edu/locate/qhull
+ http://www.geom.umn.edu/software/qhull
input (stdin):
first lines: dimension and number of points (or vice-versa).
@@ -577,7 +580,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -600,8 +603,7 @@ Print options:
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-eg.htm b/html/qh-eg.htm
index e3b8e69c54228c0b2ff41bade505da523371054f..1267330d339987acab254369d2c563a1fddf5b3e 100644
--- a/html/qh-eg.htm
+++ b/html/qh-eg.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><a name="TOP"><b>Up:</b></a> <a href="http://www.geom.umn.edu/locate/qhull">Home
+<p><a name="TOP"><b>Up:</b></a> <a href="http://www.geom.umn.edu/software/qhull">Home
page</a> for Qhull <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -48,7 +48,7 @@ test examples, and <tt>eg/q_test</tt> exercises the code. If you
find yourself viewing the inside of a 3-d example, use Geomview's
normalization option on the 'obscure' menu.</p>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -664,7 +664,7 @@ third picture is a duplicate of the first. </p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home
page for Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual: Table of Contents</a><br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -685,8 +685,7 @@ while loading)<br>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-faq.htm b/html/qh-faq.htm
index 1a3972213586b7dd2261cc05eab6a6e08206340b..d0d33647cf79df263ec5fea9c1f16a1409bf8500 100644
--- a/html/qh-faq.htm
+++ b/html/qh-faq.htm
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type"
content="text/html; charset=iso-8859-1">
<meta name="GENERATOR" content="Microsoft FrontPage 2.0">
-<title>Frequently Asked Questions about Qhull</title>
+<title>Qhull FAQ</title>
<!-- Navigation links
NOTE -- verify all links by 'grep href=' 'grep name=' add # 'sort /+7'
<base href> does not work since #TOC is relative to base instead of doc
@@ -15,8 +15,8 @@ NOTE -- verify all links by 'grep href=' 'grep name=' add # 'sort /+7'
<body>
<p><a name="TOP"><b>Up:</b></a> <a
- href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull
-(http://www.geom.umn.edu/locate/qhull)<br>
+ href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull
+(http://www.geom.umn.edu/software/qhull)<br>
<b>Up:</b> <A href="index.htm#TOC">Qhull manual</A>: Table of Contents<br>
<b>To:</b> <A href="qh-quick.htm#programs">Programs</A>
• <A href="qh-quick.htm#options">Options</A>
@@ -70,10 +70,10 @@ It should be used for Delaunay triangulations instead of
using joggled input ('<A href="qh-optq.htm#QJn">QJ</A>').
<p><i>Brad Barber, Cambridge MA,
-October 4, 2001 <!--
+June 1, 2002 <!--
--> </i></p>
-<p><b>Copyright © 1998-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1998-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -96,6 +96,9 @@ first.
vertices? </li>
</ul>
<li>Delaunay and Voronoi diagram questions<ul>
+ <li><a href="#maxsphere">How</a> do I get the radii of the empty
+ spheres for each Voronoi vertex?
+
<li><A href="#flat">How</A> do I get rid of nearly flat Delaunay
triangles?
@@ -470,6 +473,15 @@ prevents coincident input sites. </p>
<h2><A href="#TOC">»</A><a name="delaunay">Delaunay and Voronoi
diagram questions</a></h2>
+<h4><A href="#TOC">»</A><a name="maxsphere">How</a> do I get the radii of the empty
+ spheres for each Voronoi vertex?</h4><blockquote>
+
+Use option '<A href="qh-optf.htm#Fi">Fi</A>' to list each bisector (i.e. Delaunay ridge). Then compute the
+minimum distance for each Voronoi vertex.
+
+<p>There's other ways to get the same information. Let me know if you
+find a better method.
+
<h4><A href="#TOC">»</A><a name="flat">How</a> do I get rid of
nearly flat Delaunay triangles?</h4><blockquote>
@@ -1095,19 +1107,19 @@ questions</a></h2>
<h4><A href="#TOC">»</A><a name="math">Is</a> Qhull available for Mathematica, Matlab, or Maple?</h4><blockquote>
<p>Z. You of <a href="http://www.mathworks.com">MathWorks</a> added qhull to MATLAB 6.
-See functions <a href="http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/convhulln.shtml"
+See functions <a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/convhulln.shtml"
>convhulln</a>,
- <a href="http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/delaunayn.shtml"
+ <a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/delaunayn.shtml"
>delaunayn</a>,
- <a href="http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/griddata3.shtml"
+ <a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/griddata3.shtml"
>griddata3</a>,
- <a href="http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/griddatan.shtml"
+ <a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/griddatan.shtml"
>griddatan</a>,
- <a href="http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/tsearch.shtml"
+ <a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/tsearch.shtml"
>tsearch</a>,
- <a href="http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/tsearchn.shtml"
+ <a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/tsearchn.shtml"
>tsearchn</a>, and
- <a href="http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/voronoin.shtml"
+ <a href="http://www.mathworks.com/access/helpdesk/help/techdoc/ref/voronoin.shtml"
>voronoin</a>.
<p>See <a href="http://www.mathsource.com/Content/Enhancements/Geometry/0211-251"
@@ -1463,7 +1475,7 @@ the vertex order and the flag facet->toporient.</p>
<hr><!-- Navigation links -->
<p><a><b>Up:</b> </a><a
- href="http://www.geom.umn.edu/locate/qhull">Home page for Qhull</a><br>
+ href="http://www.geom.umn.edu/software/qhull">Home page for Qhull</a><br>
<b>Up:</b> <A href="index.htm#TOC">Qhull manual</A>: Table of Contents <br>
<b>To:</b> <A href="qh-quick.htm#programs">Programs</A>
• <A href="qh-quick.htm#options">Options</A>
@@ -1482,8 +1494,7 @@ the vertex order and the flag facet->toporient.</p>
height=40 src="qh--geom.gif" width=40 ></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
- href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created:
Sept. 25, 1995 --- <!-- hhmts start -->Last modified: see top
diff --git a/html/qh-get.htm b/html/qh-get.htm
new file mode 100644
index 0000000000000000000000000000000000000000..93633c4ec50f1a82592df7ef193d2b3fba64879e
--- /dev/null
+++ b/html/qh-get.htm
@@ -0,0 +1,108 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+
+<head>
+<title>Download Qhull</title>
+</head>
+
+<body>
+<!-- Navigation links -->
+<p><b>Up:</b> <a href="./"><i>Downloadable Software from the
+Geometry Center </i></a><br>
+</p>
+
+<hr>
+
+<h1><a
+href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
+src="/software/qhull/html/qh--cone.gif" alt="[CONE]" align="middle"
+width="100" height="100"></a> Download Qhull</h1>
+
+<ul>
+ <li><a href="http://www.geom.umn.edu/software/qhull">Home page for Qhull</a> <p>Qhull
+ computes convex hulls, Delaunay triangulations, halfspace
+ intersections about a point, Voronoi diagrams, furthest-site Delaunay
+ triangulations, and furthest-site Voronoi diagrams. It
+ runs in 2-d, 3-d, 4-d, and higher dimensions. It
+ implements the Quickhull algorithm for computing the
+ convex hull. Qhull handles roundoff errors from floating
+ point arithmetic. It can approximate a convex hull. </p>
+ </li>
+ <li><a
+ href="http://www.geom.umn.edu/software/qhull/qhull2002.1.zip">Download:
+ Qhull 2002.1 for Windows</a> (1.2 Mbytes) <p>Type: console program for
+ Windows 95, 98, ME, 2000, NT, XP</p>
+ <p>Includes documentation and sources files. It runs in a
+ DOS window.</p>
+ </li>
+ <li><a href="http://www.geom.umn.edu/software/qhull/qhull2002.1.tgz">Download:
+ Qhull version 2002.1</a> (600K) <p>Type: C source code for
+ 32-bit and 64-bit architectures </p>
+ <p>Includes makefiles and instructions for Unix and Power
+ MacOS. It should compile on other 32-bit and 64-bit
+ operating systems. </p>
+ </li>
+ <li><a href=http://savannah.gnu.org/projects/qhull/>Savannah sources</a>
+ <p>Sources for Qhull 2002.1 in CVS. Includes downloads of Qhull's current and previous
+ versions.</p>
+ </li>
+ <li><a href=http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html>Spanish
+ mirror site</a> <p>Download Qhull's current and
+ previous versions from <a href=http://www.etsimo.uniovi.es/derechos.html>Servidor
+ WWW de la Escuela de Minas</a> of the Universidad de Oviedo.</p>
+ </li>
+ <li><a href="http://www.thesa.com/software/qhull">http://www.thesa.com/software/qhull</a>
+ <p>Backup web site for Qhull.
+ </li>
+ <li><a
+ href="http://www.geom.umn.edu/software/qhull/qhull-96.ps">Download:
+ Article about Qhull</a> (210K) <p>Type: Postscript file</p>
+ <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
+ href="http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/">abstract</a>].</p>
+ </li>
+ <li><a
+ href="http://www.geom.umn.edu/software/qhull/qhull-1.0.tar.gz">Download:
+ Qhull version 1.0</a> (92K) <p>Type: C source code for
+ 32-bit architectures </p>
+ <p>Version 1.0 is a fifth the size of version 2.4. It
+ computes convex hulls and Delaunay triangulations. If a
+ precision error occurs, it stops with an error message.
+ It reports an initialization error for inputs made with
+ 0/1 coordinates. </p>
+ <p>Version 1.0 compiles on a PC with Borland C++ 4.02 for
+ Win32 and DOS Power Pack. The options for rbox are
+ "bcc32 -WX -w- -O2-e -erbox -lc rbox.c". The
+ options for qhull are the same. [D. Zwick] </p>
+ </li>
+ <li><a
+ href="http://www.geom.umn.edu/software/qhull/qhull-1.0.sit.hqx">Download:
+ Qhull version 1.0 (Mac)</a> (180K) <p>Type: C source
+ code, packaged for Macintosh w/68881 </p>
+ <p>The Macintosh implementation of Qhull 1.0 reads input
+ from a file and returns the results to a file. The code
+ is compiled for a 68881 floating point coprocessor. The
+ package includes Think C projects for Qhull and the rbox
+ input generator. </p>
+ </li>
+</ul>
+<!-- Navigation links -->
+<hr>
+
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/download"><i>Downloadable Software from the
+Geometry Center </i></a><br>
+<!-- GC common information --></p>
+
+<hr>
+
+<p><a href="http://www.geom.umn.edu/"><img src="/pix/home.gif" alt="[HOME]"
+align="middle"></a> <i>The Geometry Center Home Page</i> </p>
+
+<p>Comments to: <a href="http://www.geom.umn.edu/admin/mail/webmaster.html">webmaster@geom.umn.edu</a><br>
+Created: Feb 28 1995 ---
+<!-- hhmts start -->
+Last modified: November 2, 2001 <!-- hhmts end --> </p>
+</body>
+</html>
diff --git a/html/qh-home.htm b/html/qh-home.htm
index d46bac3a61692d2ac0cb315819a81b5853944e5d..51162b7bdc2dc56280fcad56f79cda59cad2a405 100644
--- a/html/qh-home.htm
+++ b/html/qh-home.htm
@@ -7,16 +7,16 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="../past-projects.html"><i>Past Software
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/past-projects.html"><i>Past Software
Projects of the Geometry Center</i></a> <br>
-<b>URL:</b> <a href="http://www.geom.umn.edu/locate/qhull">http://www.geom.umn.edu/locate/qhull</a>
+<b>URL:</b> <a href="http://www.geom.umn.edu/software/qhull">http://www.geom.umn.edu/software/qhull</a>
</p>
<hr>
<!-- Main text of document -->
<h1><a
-href="/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
-src="html/qh--cone.gif" alt="[CONE]" align="middle" width="100"
+href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/cone.html"><img
+src="/software/qhull/html/qh--cone.gif" alt="[CONE]" align="middle" width="100"
height="100"></a> Home page for Qhull</h1>
<p>Qhull computes convex hulls, Delaunay triangulations,
@@ -36,35 +36,41 @@ and higher. </p>
<hr>
<ul>
- <li><a href="/~bradb/qhull-news.html">News</a> about Qhull </li>
- <li><a href="/~bradb/qhull-news.html#use">How</a> is Qhull used?</li>
- <li><a href="/software/download/qhull.html">Download</a>
+ <li><a href="http://www.geom.umn.edu/~bradb/qhull-news.html">News</a> about Qhull </li>
+ <li><a href="http://www.geom.umn.edu/~bradb/qhull-news.html#use">How</a> is Qhull used?</li>
+ <li><a href="http://www.geom.umn.edu/software/download/qhull.html">Download</a>
Qhull</li>
<li><a
- href="/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">Examples
+ href="http://www.geom.umn.edu/graphics/pix/Special_Topics/Computational_Geometry/welcome.html">Examples
</a>of Qhull output </li>
- <li><a href="html/index.htm">Manual</a> for Qhull and rbox
+ <li><a href=http://savannah.gnu.org/projects/qhull/>Qhull development</a> at Savannah
+ <li><a href="/software/qhull/html/index.htm">Manual</a> for Qhull and rbox
<ul>
- <li><a href="html/qconvex.htm">qconvex</a> -- convex hull
- <li><a href="html/qdelaun.htm">qdelaunay</a> -- Delaunay triangulation
- <li><a href="html/qvoronoi.htm">qvoronoi</a> -- Voronoi diagram
- <li><a href="html/qhalf.htm">qhalf</a> -- halfspace intersection about a point
- <li><a href="html/rbox.htm">rbox</a> -- generate point distributions
+ <li><a href="/software/qhull/html/qconvex.htm">qconvex</a> -- convex hull
+ <li><a href="/software/qhull/html/qdelaun.htm">qdelaunay</a> -- Delaunay triangulation
+ <li><a href="/software/qhull/html/qvoronoi.htm">qvoronoi</a> -- Voronoi diagram
+ <li><a href="/software/qhull/html/qhalf.htm">qhalf</a> -- halfspace intersection about a point
+ <li><a href="/software/qhull/html/rbox.htm">rbox</a> -- generate point distributions
+ <li><a href=/software/qhull/src/index.htm>Qhull functions</a>, macros, and data structures with source
</ul>
- <li><a href="html/qh-faq.htm">Frequently</a> asked
+ <li><a href="/software/qhull/html/qh-faq.htm">Frequently</a> asked
questions about Qhull</li>
- <li>MATLAB's qhull functions: <a href=http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/convhulln.shtml>convhulln</a>
- <a href=http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/delaunayn.shtml>delaunayn</a>
- <a href=http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/griddata3.shtml>griddata3</a>
- <a href=http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/griddatan.shtml>griddatan</a>
- <a href=http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/tsearch.shtml>tsearch</a>
- <a href=http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/tsearchn.shtml>tsearchn</a>
- <a href=http://www.mathworks.com/access/helpdesk/jhelp/techdoc/ref/voronoin.shtml>voronoin</a>
+ <li><a href=http://www.geomview.org>Geomview</a> -- 3-D and 4-D visualization of Qhull output
+ <li>MATLAB's qhull functions: <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/convhulln.shtml>convhulln</a>
+ <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/delaunayn.shtml>delaunayn</a>
+ <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/griddata3.shtml>griddata3</a>
+ <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/griddatan.shtml>griddatan</a>
+ <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/tsearch.shtml>tsearch</a>
+ <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/tsearchn.shtml>tsearchn</a>
+ <a href=http://www.mathworks.com/access/helpdesk/help/techdoc/ref/voronoin.shtml>voronoin</a>. MATLAB has not upgraded
+ to version 3.1 and triangulated output ('Qt').
</li>
+ <li><a href=http://www.octave.org/>GNU Octave</a> uses Qhull for their
+ <a href=http://octave.sourceforge.net/index/analysis.html#Geometry>computational geometry functions</a>. Octave has not upgraded
+ to version 3.1 and triangulated output ('Qt').
<li>Mathematica's Delaunay interface: <a href=http://www.mathsource.com/Content/Enhancements/Geometry/0211-251>qh-math</a>
- <li><a href="qhull-mail.html">Send e-mail</a> to
- qhull@geom.umn.edu </li>
- <li><a href="qhull-bug-mail.html">Report bugs</a> to <a
+ <li>Send e-mail to <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a> </li>
+ <li>Report bugs to <a
href="mailto:qhull_bug@geom.umn.edu">qhull_bug@geom.umn.edu</a>
</ul>
@@ -87,7 +93,8 @@ and higher. </p>
and algorithms,
<li><a
href="http://netlib.bell-labs.com/netlib/voronoi/hull.html">Clarkson's
- hull </a>program with exact arithmetic </li>
+ hull </a>program with exact arithmetic for convex hulls, Delaunay triangulations,
+ Voronoi volumes, and alpha shapes. </li>
<li><a
href="http://www.ifor.math.ethz.ch/ifor/staff/fukuda/cdd_home/cdd.html">Fukuda's
cdd</a> program for halfspace intersection and convex hulls</li>
@@ -99,13 +106,15 @@ geometry programs and other combinatorial algorithms
</ul>
<ul>
- <li><a href="http://www.geom.umn.edu/locate/cglist">Amenta's directory</a> of
+ <li><a href="http://www.geom.umn.edu/software/cglist">Amenta's directory</a> of
computational geometry software </li>
<li><a href="http://compgeom.cs.uiuc.edu/~jeffe/compgeom/compgeom.html">Erickson's
Computational</a> Geometry Pages and
<a href="http://compgeom.cs.uiuc.edu/~jeffe/compgeom/code.html">Software</a>
<li><a href=http://www.magic-software.com>Magic Software</a> source code for computer
graphics, image analysis, and numerical methods
+ <li>MathWork's <a href=http://www.mathtools.net/>Mathtools.net</a> -- scientific and engineering
+ software
<li><a href="http://www.andrew.cmu.edu/user/sowen/mesh.html">Owen's Meshing</a> Research Corner
<li><a
href="http://www-users.informatik.rwth-aachen.de/~roberts/meshgeneration.html">Schneiders'
@@ -121,11 +130,15 @@ geometry programs and other combinatorial algorithms
for computer graphics algorithms
(<a href="http://exaflop.org/docs/cgafaq/cga6.html">geometric</a> structures)
</li>
+ <li><a href=http://www.google.com/search?as_q=qhull&num=100&btnG=Google+Search&as_epq=&as_oq=&as_eq=&lr=&as_ft=i&as_filetype=&as_qdr=m3&as_occt=any&as_dt=i&as_sitesearch=>Recent references</a> to Qhull in Google.
+ <li><a href=http://groups.google.com/groups?as_q=qhull&num=100&as_scoring=d&btnG=Google+Search&as_epq=&as_oq=&as_eq=%22alt.%22&as_ugroup=&as_usubject=&as_uauthors=&as_umsgid=&lr=&as_qdr=&as_mind=12&as_minm=5&as_miny=1981&as_maxd=8&as_maxm=1&as_maxy=2002>Qhull references</a> in Google Groups (i.e., newsgroups)
<li><a
href="http://www-unix.mcs.anl.gov/otc/Guide/faq/linear-programming-faq.html">FAQ
</a>for linear programming </li>
<li><a href="news:comp.graphics.algorithms">Newsgroup</a>:
comp.graphics.algorithms </li>
+ <li><a href="news:comp.soft-sys.matlab">Newsgroup</a>:
+ comp.soft-sys.matlab</li>
<li><a href="news:sci.math.num-analysis">Newsgroup</a>:
sci.math.num-analysis </li>
<li><a href="news:sci.op-research">Newsgroup</a>:
@@ -144,7 +157,7 @@ href="http://www.geomview.org">Geomview</a>. An alternative
is <a href=http://www.kitware.com/vtk.html>VTK</a>.</p>
<p>For an article about Qhull, download <a
-href="ftp://geom.umn.edu/pub/software/qhull-96.ps.Z">qhull-96.ps.Z</a>:
+href="/software/qhull/qhull-96.ps">qhull-96.ps.Z</a>:
</p>
<blockquote>
@@ -180,18 +193,19 @@ href="ftp://geom.umn.edu/pub/software/qhull-96.ps.Z">qhull-96.ps.Z</a>:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="../past-projects.html"><i>Past Software
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/past-projects.html"><i>Past Software
Projects of the Geometry Center</i></a> <br>
-<b>URL:</b> <a href="http://www.geom.umn.edu/locate/qhull">http://www.geom.umn.edu/locate/qhull</a>
+<b>URL:</b> <a href="http://www.geom.umn.edu/software/qhull">http://www.geom.umn.edu/software/qhull</a>
<!-- GC common information --></p>
<hr>
-<p><a href="/"><img src="/pix/home.gif" alt="[HOME]"
+<p><a href="http://www.geom.umn.edu/"><img src="/pix/home.gif" alt="[HOME]"
align="middle"></a> <i>The Geometry Center Home Page</i> </p>
-<p>Comments to: <a href="/admin/mail/webmaster.html">webmaster@geom.umn.edu</a>
+<p>Comments to: <a href="mailto:qhull@geom.umn.edu">qhull@geom.umn.edu</a>
<br>
-Created: May 17 1995 --- <!-- hhmts start --> Last modified: December 30, 1998<!-- hhmts end --> </p>
+Created: May 17 1995 --- <!-- hhmts start -->
+Last modified: August 21, 2002<!-- hhmts end --> </p>
</body>
</html>
diff --git a/html/qh-impre.htm b/html/qh-impre.htm
index 2c4599830b90cb1f01fc6eb0c1f869f5202adf20..ce7ca276869f67e027d17ba0c6d7feade4898153 100644
--- a/html/qh-impre.htm
+++ b/html/qh-impre.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><a name="TOP"><b>Up:</b></a> <a href="http://www.geom.umn.edu/locate/qhull">Home
+<p><a name="TOP"><b>Up:</b></a> <a href="http://www.geom.umn.edu/software/qhull">Home
page</a> for Qhull <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of
Contents<br>
@@ -46,7 +46,7 @@ convex. It verifies that all points are on or below all facets. </p>
<p>Qhull automatically tests for convexity if it detects
precision errors while constructing the hull. </p>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -187,7 +187,7 @@ or triangulated output ('<a href="qh-optq.htm#Qt">Qt</a>') if </p>
<ul>
<li>Your application needs clearly convex, simplicial output</li>
<li>Your application supports perturbed input points and narrow triangles.</li>
- <li>Seven significant digits is sufficient accuracy. </li>
+ <li>Seven significant digits is sufficient accuracy.</li>
</ul>
<p>You may use both techniques or combine joggle with
@@ -731,7 +731,7 @@ largest facet in each quadrant.</p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home
page</a> for Qhull <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of
Contents<br>
@@ -753,8 +753,7 @@ Contents<br>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-in.htm b/html/qh-in.htm
index a8c6c3cc49f82f9aa564343f81d69d27875e586e..53d6436491f76ceef58d28b03a407c7252cb7fe6 100644
--- a/html/qh-in.htm
+++ b/html/qh-in.htm
@@ -9,7 +9,7 @@
<body>
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page for Qhull</a>
+href="http://www.geom.umn.edu/software/qhull">Home page for Qhull</a>
<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual: Table of
Contents</a><br>
@@ -37,7 +37,7 @@ height="100"></a> Qhull internals</h1>
<p>This section discusses the internals of Qhull. </p>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -502,6 +502,8 @@ href="qh-optc.htm#Vn">Vn</a>')
- determine the limitations of '<a href="qh-optq.htm#Qg">Qg</a>'
Precision improvements:
+ - For 'Qt', resolve cross-linked, butterfly ridges.
+ May allow retriangulation in qh_addpoint().
- for Delaunay triangulations ('d' or 'v') under joggled input ('QJ'),
remove vertical facets whose lowest vertex may be coplanar with convex hull
- review use of 'Qbb' with 'd QJ'. Is MAXabs_coord better than MAXwidth?
@@ -517,6 +519,7 @@ Precision improvements:
New features:
- compute volume of Voronoi regions. You need to determine the dual face
graph in all dimensions [see Clarkson's hull program]
+ - compute alpha shapes [see Clarkson's hull program]
- implement deletion of Delaunay vertices
see Devillers, ACM Symposium on Computational Geometry, Minneapolis 1999.
- compute largest empty circle [see O'Rourke, chapter 5.5.3] [Hase]
@@ -531,6 +534,7 @@ New features:
need to insert a coordinate for Delaunay triangulations
Input/output improvements:
+ - Support the VTK Visualization Toolkit, http://www.kitware.com/vtk.html
- generate output data array for Qhull library [Gautier]
- need improved DOS window with screen fonts, scrollbar, cut/paste
- generate Geomview output for Voronoi ridges and unbounded rays
@@ -558,7 +562,7 @@ Performance improvements:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home
page for Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual: Table of
Contents</a><br>
@@ -581,8 +585,7 @@ structures <!-- GC common information -->
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see changes.txt <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optc.htm b/html/qh-optc.htm
index 85c18cecb01a1c26af24c3d92aee06c8ce161b3d..ac23526ce610bdb2d06bce4eb450f208a326b823 100644
--- a/html/qh-optc.htm
+++ b/html/qh-optc.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -29,7 +29,7 @@ height="100"></a> Qhull precision options</h1>
This section lists the precision options for Qhull. These options are
indicated by an upper-case letter followed by a number.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -264,7 +264,7 @@ distinguish coplanar points from interior points.</p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -282,8 +282,7 @@ distinguish coplanar points from interior points.</p>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optf.htm b/html/qh-optf.htm
index 6246745699a8e285ac66d0292abcf4787339abdb..1207e0c332374d753a2d7dccdd805730098e0ff6 100644
--- a/html/qh-optf.htm
+++ b/html/qh-optf.htm
@@ -6,7 +6,7 @@
</head>
<body><!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <A href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <A href="qh-quick.htm#programs">Programs</a>
• <A href="qh-quick.htm#options">Options</a>
@@ -30,7 +30,7 @@ are indicated by 'F' followed by a letter. See <A
and <A href="qh-optg.htm#geomview">Geomview</a> for other output
options. </p>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -71,7 +71,7 @@ may also be used.</p>
<dd>print summary: dim, #points, total vertices and
facets, #vertices, #facets, max outer and inner plane
<dt><A href="#Fd">Fd</a>
- <dd>use cdd format for input (offset first)
+ <dd>use format for input (offset first)
<dt><A href="#FD">FD</a>
<dd>use cdd format for normals (offset first)
<dt>
@@ -214,7 +214,8 @@ data ends with an "end" line.</p>
<p>For halfspaces ('<A href="qhalf.htm">qhalf</a> Fd'),
the input format is the same. Each halfspace starts with its
-offset. The sign of the offset is the opposite of Qhull's
+offset. The signs of the offset and coefficients are the
+opposite of Qhull's
convention. The first two lines of the input may be an interior
point in '<A href="#FV">FV</a>' format.</p>
@@ -228,9 +229,9 @@ command line that invoked Qhull. Data starts with a
"begin" line. The next line is the number of normals or
points followed by the dimension plus one and "real".
Then the normals or points are listed with the offset before the
-coefficients. The offset for points is 1.0. The offset for
-normals has the opposite sign. The data ends with an
-"end" line.</p>
+coefficients. The offset for points is 1.0. For normals,
+the offset and coefficients use the opposite sign from Qhull.
+The data ends with an "end" line.</p>
<h3><A href="#format">»</a><a name="FF">FF - print facets w/o
ridges </a></h3>
@@ -630,7 +631,7 @@ are unordered. <!-- Navigation links --> </p>
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <A href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <A href="qh-quick.htm#programs">Programs</a>
• <A href="qh-quick.htm#options">Options</a>
@@ -647,8 +648,7 @@ are unordered. <!-- Navigation links --> </p>
height=40 src="qh--geom.gif" width=40 ></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
- href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created:
Sept. 25, 1995 --- <!-- hhmts start -->Last modified: see top
diff --git a/html/qh-optg.htm b/html/qh-optg.htm
index 0b3ddf21e78a0e29a2548cb5a1d1f41e4c62e360..5bb0b69d85220700ca38a17d33a95ba9f43c477f 100644
--- a/html/qh-optg.htm
+++ b/html/qh-optg.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -33,7 +33,7 @@ indicated by 'G' followed by a letter. See
and <a href="qh-optf.htm#format">Format</a> for other output options.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -245,7 +245,7 @@ data. See '<a href="#Gp">Gp</a>' for determining the radius.</p>
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -264,8 +264,7 @@ data. See '<a href="#Gp">Gp</a>' for determining the radius.</p>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-opto.htm b/html/qh-opto.htm
index 868051f072c10cc65ef53b4a021114f1dcc285d0..97cd59cf429c02de476219e7233d77ced9a7c67b 100644
--- a/html/qh-opto.htm
+++ b/html/qh-opto.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -33,7 +33,7 @@ href="qh-optp.htm#print">Print</a>, and <a
href="qh-optg.htm#geomview">Geomview</a> for other output
options. </p>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -318,7 +318,7 @@ than 0.05. </p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -336,8 +336,7 @@ than 0.05. </p>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optp.htm b/html/qh-optp.htm
index 78dcbbc3fc4aab1b818c752b62e05185208b642a..b0c48b78258aea92a4ccef0a00f05af3d4a28a47 100644
--- a/html/qh-optp.htm
+++ b/html/qh-optp.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -32,7 +32,7 @@ indicated by 'P' followed by a letter. See
and <a href="qh-optf.htm#format">Format</a> for other output options.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -224,7 +224,7 @@ removes the narrow hull warning.</p>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -242,8 +242,7 @@ removes the narrow hull warning.</p>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optq.htm b/html/qh-optq.htm
index 9a72a6dd3ddbf5e035f626669cd2416b5cd711f3..fd954ce5523bb2a7b2aa8693e55a0f9acc341a41 100644
--- a/html/qh-optq.htm
+++ b/html/qh-optq.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -29,7 +29,7 @@ height="100"></a> Qhull control options (Q)</h1>
<p>This section lists the control options for Qhull. These
options are indicated by 'Q' followed by a letter. </p>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -295,7 +295,7 @@ reports the number of interior points (should always be zero).</p>
'<a href="qh-optf.htm#Fc">Fc</a>', '<a href="qh-optf.htm#FN">FN</a>',
and '<a href="qh-optf.htm#FP">FP</a>' include interior points. </p>
-<h3><a href="#qhull">»</a><a name="QJn">QJ or QJn - joggled
+<h3><a href="#qhull">»</a><a name="QJ">QJ</a> or <a name="QJn">QJn</a> - joggled
input to avoid precision errors</a></h3>
<p>Option 'QJ' or 'QJn' joggles each input coordinate by adding a
@@ -409,7 +409,7 @@ best initial simplex. This is expensive is high dimensions. </p>
<p>By default, qhull merges facets to handle precision errors. This
produces non-simplicial facets (e.g., the convex hull of a cube has 6 square
-facets. Each facet is non-simplicial because it has four vertices.
+facets). Each facet is non-simplicial because it has four vertices.
<p>Use option 'Qt' to triangulate all non-simplicial facets before generating
results. Alternatively, use joggled input ('<a href="#QJn">QJ</a>') to
@@ -671,7 +671,7 @@ reports an error due to a duplicate ridge.
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -689,8 +689,7 @@ reports an error due to a duplicate ridge.
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-optt.htm b/html/qh-optt.htm
index 544e4934987d31ec3b057789a7eafa1a91b3c5a8..d7404b0fc0267d57b194d9b55ff8afc367d670ee 100644
--- a/html/qh-optt.htm
+++ b/html/qh-optt.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -29,7 +29,7 @@ height="100"></a> Qhull trace options (T)</h1>
This section lists the trace options for Qhull. These options are
indicated by 'T' followed by a letter.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -250,7 +250,7 @@ stdout </a></h3>
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -268,8 +268,7 @@ stdout </a></h3>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qh-quick.htm b/html/qh-quick.htm
index 872852e16a741a4f5869622d09f9523a87eaaeec..2d4ecb2520a38fa45c8c860b477aa355535e7ca0 100644
--- a/html/qh-quick.htm
+++ b/html/qh-quick.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><a name="TOC"><b>Up:</b></a> <a href="http://www.geom.umn.edu/locate/qhull">Home
+<p><a name="TOC"><b>Up:</b></a> <a href="http://www.geom.umn.edu/software/qhull">Home
page for Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a> <br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -38,7 +38,7 @@ height="100"></a> Qhull quick reference</h1>
This section lists all programs and options in Qhull.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<p>
<a name="programs"> </a>
@@ -455,7 +455,7 @@ Q11_trinormals
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home
page for Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a> <br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
@@ -482,8 +482,7 @@ page for Qhull</a> <br>
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qhalf.htm b/html/qhalf.htm
index bcd05ca8df758c800d9865396e5c953b679c56c7..4076516c307dc8041f469a8d368bcabe7ed8088f 100644
--- a/html/qhalf.htm
+++ b/html/qhalf.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><a name="TOP"><b>Up</b></a><b>:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><a name="TOP"><b>Up</b></a><b>:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -78,7 +78,7 @@ in 5-d and higher. It disables the following Qhull
Qr QR Qv Qx Qz TR E V Fa FA FC FD FS Ft FV Gt Q0,etc</i>.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<h3><a href="#TOP">»</a><a name="synopsis">qhalf synopsis</a></h3>
@@ -130,6 +130,9 @@ examples:
<li>halfspace coefficients followed by offset</li>
</ul>
+<p>Use I/O redirection (e.g., qhalf < data.txt), a pipe (e.g., rbox c | qconvex FV n | qhalf),
+or the '<a href=qh-optt.htm#TI>TI</a>' option (e.g., qhalf TI data.txt).
+
<p>Qhull needs an interior point to compute the halfspace
intersection. An interior point is inside all of the halfspaces <i>Hx+b
<= 0</i>. The interior point may be in the input. If not, option
@@ -429,7 +432,7 @@ conventions</a> and <a href="index.htm#structure">Qhull's data structures</a>.</
<pre>
qhalf- compute the intersection of halfspaces about a point
- http://www.geom.umn.edu/locate/qhull
+ http://www.geom.umn.edu/software/qhull
input (stdin):
optional interior point: dimension, 1, coordinates
@@ -533,7 +536,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -556,8 +559,7 @@ Print options:
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qhull.htm b/html/qhull.htm
index 05e31ed33bfdcd20709c2cf3e60802d430243504..5618bfa186081499d8c9e96a778de8a3df766807 100644
--- a/html/qhull.htm
+++ b/html/qhull.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b><a name="TOP">Up</a></b><b>:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b><a name="TOP">Up</a></b><b>:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -113,7 +113,7 @@ hull contains non-simplicial facets (e.g., a hypercube). See
are there extra points in a 4-d or higher convex hull?</a><br>
</p>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -170,6 +170,9 @@ examples:
<li>point coordinates</li>
</ul>
+<p>Use I/O redirection (e.g., qhull < data.txt), a pipe (e.g., rbox 10 | qhull),
+or the '<a href=qh-optt.htm#TI>TI</a>' option (e.g., qhull TI data.txt).
+
<p>Comments start with a non-numeric character. Error reporting is
simpler if there is one point per line. Dimension
and number of points may be reversed. For halfspace intersection,
@@ -275,7 +278,7 @@ individually or together.</p>
<pre>
qhull- compute convex hulls and related structures.
- http://www.geom.umn.edu/locate/qhull
+ http://www.geom.umn.edu/software/qhull
input (stdin):
first lines: dimension and number of points (or vice-versa).
@@ -427,7 +430,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -448,8 +451,7 @@ Print options:
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qhull.man b/html/qhull.man
index a4fcaf2789ac93ac81e0f1002ee5016f5f8a65fb..8f0a0b5d0a8b4335a83b05f7b237349860e41820 100644
--- a/html/qhull.man
+++ b/html/qhull.man
@@ -12,7 +12,7 @@
./"
./" Warning: a leading quote "'" or dot "." will not format correctly
./"
-.TH qhull 1 "October 4, 2001" "Geometry Center"
+.TH qhull 1 "August 20, 2002" "Geometry Center"
.SH NAME
qhull \- convex hull, Delaunay triangulation, Voronoi diagram,
halfspace intersection about a point, hull volume, facet area
@@ -56,12 +56,11 @@ example:
- html manual: index.htm
- installation: README.txt
- see also: COPYING.txt, REGISTER.txt, Changes.txt
- - WWW: <http://www.geom.umn.edu/locate/qhull>
+ - WWW: <http://www.geom.umn.edu/software/qhull>
+ - CVS: <http://savannah.gnu.org/projects/qhull/>
+ - mirror: <http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html>
+ - backup: <http://www.thesa.com/software/qhull>
- news: <http://www.geom.umn.edu/~bradb/qhull-news.html>
- - ftp: <ftp://geom.umn.edu/pub/software/qhull.tar.Z>
- - <ftp://geom.umn.edu/pub/software/qhull.zip>
- - <ftp://geom.umn.edu/pub/software/qhull-96.ps.Z>
- - <ftp://geom.umn.edu/pub/software/qhull-1.0.tar.Z>
- Geomview: <http://www.geomview.org>
- news group: <news:comp.graphics.algorithms>
- FAQ: <http://exaflop.org/docs/cgafaq/cga6.html>
@@ -962,7 +961,7 @@ Barber, C. B., D.P. Dobkin, and H.T. Huhdanpaa,
"The Quickhull Algorithm for Convex Hulls," ACM
Trans. on Mathematical Software, Dec. 1996.
http://www.acm.org/pubs/citations/journals/toms/1996-22-4/p469-barber/
-ftp://geom.umn.edu/pub/software/qhull-96.ps.Z
+http://www.geom.umn.edu/software/qhull/qhull-96.ps
Clarkson, K.L., K. Mehlhorn, and R. Seidel, "Four results on randomized
incremental construction," Computational Geometry: Theory and Applications,
@@ -999,7 +998,4 @@ The Geometry Center is supported by grant DMS-8920161 from the National
Science Foundation, by grant DOE/DE-FG02-92ER25137 from the Department
of Energy, by the University of Minnesota, and by Minnesota Technology, Inc.
-Qhull is available by anonymous ftp from geom.umn.edu. To retrieve
-a copy go to www.geom.umn.edu/locate/qhull or ftp: geom.umn.edu,
-user: anonymous, cd pub/software, get qhull.tar.Z, quit,
-uncompress qhull.tar.Z, tar xf qhull.tar, cd qhull, make
+Qhull is available from http://www.geom.umn.edu/software/qhull
diff --git a/html/qhull.txt b/html/qhull.txt
index 5b59629456db7d8bfac4084dc5ad48d8edfddceb..ed100e26f3c09dbf119be57f03b7486da9015e02 100644
--- a/html/qhull.txt
+++ b/html/qhull.txt
@@ -45,12 +45,11 @@ SYNOPSIS
- html manual: index.htm
- installation: README.txt
- see also: COPYING.txt, REGISTER.txt, Changes.txt
- - WWW: <http://www.geom.umn.edu/locate/qhull>
+ - WWW: <http://www.geom.umn.edu/software/qhull>
+ - CVS: <http://savannah.gnu.org/projects/qhull/>
+ - mirror: <http://www6.uniovi.es/ftp/pub/mirrors/geom.umn.edu/software/ghindex.html>
+ - backup: <http://www.thesa.com/software/qhull>
- news: <http://www.geom.umn.edu/~bradb/qhull-news.html>
- - ftp: <ftp://geom.umn.edu/pub/software/qhull.tar.Z>
- - <ftp://geom.umn.edu/pub/software/qhull.zip>
- - <ftp://geom.umn.edu/pub/software/qhull-96.ps.Z>
- - <ftp://geom.umn.edu/pub/software/qhull-1.0.tar.Z>
- Geomview: <http://www.geomview.org>
- news group: <news:comp.graphics.algorithms>
- FAQ: <http://exaflop.org/docs/cgafaq/cga6.html>
@@ -60,7 +59,7 @@ SYNOPSIS
-Geometry Center October 4, 2001 1
+Geometry Center Aug 20, 2002 1
@@ -126,7 +125,7 @@ DESCRIPTION
-Geometry Center October 4, 2001 2
+Geometry Center Aug 20, 2002 2
@@ -192,7 +191,7 @@ OPTIONS
-Geometry Center October 4, 2001 3
+Geometry Center Aug 20, 2002 3
@@ -258,7 +257,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 4
+Geometry Center Aug 20, 2002 4
@@ -326,7 +325,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 5
+Geometry Center Aug 20, 2002 5
@@ -392,7 +391,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 6
+Geometry Center Aug 20, 2002 6
@@ -458,7 +457,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 7
+Geometry Center Aug 20, 2002 7
@@ -524,7 +523,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 8
+Geometry Center Aug 20, 2002 8
@@ -590,7 +589,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 9
+Geometry Center Aug 20, 2002 9
@@ -656,7 +655,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 10
+Geometry Center Aug 20, 2002 10
@@ -722,7 +721,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 11
+Geometry Center Aug 20, 2002 11
@@ -788,7 +787,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 12
+Geometry Center Aug 20, 2002 12
@@ -852,7 +851,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 13
+Geometry Center Aug 20, 2002 13
@@ -919,7 +918,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 14
+Geometry Center Aug 20, 2002 14
@@ -988,7 +987,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 15
+Geometry Center Aug 20, 2002 15
@@ -1065,7 +1064,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 16
+Geometry Center Aug 20, 2002 16
@@ -1131,7 +1130,7 @@ BUGS
-Geometry Center October 4, 2001 17
+Geometry Center Aug 20, 2002 17
@@ -1163,7 +1162,7 @@ SEE ALSO
ematical Software, Dec. 1996.
http://www.acm.org/pubs/citations/jour-
nals/toms/1996-22-4/p469-barber/
- ftp://geom.umn.edu/pub/software/qhull-96.ps.Z
+ http://www.geom.umn.edu/software/qhull/qhull-96.ps
Clarkson, K.L., K. Mehlhorn, and R. Seidel, "Four results
on randomized incremental construction," Computational
@@ -1197,7 +1196,7 @@ ACKNOWLEDGEMENTS
-Geometry Center October 4, 2001 18
+Geometry Center Aug 20, 2002 18
@@ -1214,11 +1213,7 @@ qhull(1) qhull(1)
FG02-92ER25137 from the Department of Energy, by the Uni-
versity of Minnesota, and by Minnesota Technology, Inc.
- Qhull is available by anonymous ftp from geom.umn.edu. To
- retrieve a copy go to www.geom.umn.edu/locate/qhull or
- ftp: geom.umn.edu, user: anonymous, cd pub/software, get
- qhull.tar.Z, quit, uncompress qhull.tar.Z, tar xf
- qhull.tar, cd qhull, make
+ Qhull is available at http://www.geom.umn.edu/software/qhull
@@ -1263,6 +1258,7 @@ qhull(1) qhull(1)
-Geometry Center October 4, 2001 19
+
+Geometry Center Aug 20, 2002 19
diff --git a/html/qvoron_f.htm b/html/qvoron_f.htm
index b483b0d419734d175ddc55bff65ab26c399c3bd2..f7ce9d3a520de7985095bfcc29ae2ce557d6cba3 100644
--- a/html/qvoron_f.htm
+++ b/html/qvoron_f.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -93,7 +93,7 @@ in 4-d and higher. It disables the following Qhull
QB Qc Qf Qg Qi Qm Qr QR Qv Qx TR E V Fa FA FC Fp FS Ft FV Gt Q0,etc</i>.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<h3><a href="#TOP">»</a><a name="synopsis">furthest-site qvoronoi synopsis</a></h3>
@@ -115,6 +115,9 @@ input</a></h3>
<li>point coordinates</li>
</ul>
+<p>Use I/O redirection (e.g., qvoronoi Qu < data.txt), a pipe (e.g., rbox 10 | qvoronoi Qu),
+or the '<a href=qh-optt.htm#TI>TI</a>' option (e.g., qvoronoi TI data.txt Qu).
+
<p>For example, this is a square containing four random points.
Its furthest-site Voronoi diagram has on vertex and four unbounded,
separating hyperplanes (i.e., the coordinate axes)
@@ -375,7 +378,7 @@ for furthest-site Voronoi diagrams.
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -398,8 +401,7 @@ for furthest-site Voronoi diagrams.
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/qvoronoi.htm b/html/qvoronoi.htm
index 6240bfe436b89f47c272ff62ea6f47d1ab01e71d..72e898688560a562199ac3716e61396b96322cc9 100644
--- a/html/qvoronoi.htm
+++ b/html/qvoronoi.htm
@@ -8,7 +8,7 @@
<body>
<!-- Navigation links -->
<a name="TOP"><b>Up</b></a><b>:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -115,7 +115,7 @@ in 4-d and higher. It disables the following Qhull
<a href=qh-quick.htm#options>options</a>: <i>d n v Qbb QbB Qf Qg Qm
Qr QR Qv Qx Qz TR E V Fa FA FC FD FS Ft FV Gt Q0,etc</i>.
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<h3><a href="#TOP">»</a><a name="synopsis">qvoronoi synopsis</a></h3>
@@ -161,6 +161,9 @@ The input data on <tt>stdin</tt> consists of:
<li>point coordinates</li>
</ul>
+<p>Use I/O redirection (e.g., qvoronoi < data.txt), a pipe (e.g., rbox 10 | qvoronoi),
+or the '<a href=qh-optt.htm#TI>TI</a>' option (e.g., qvoronoi TI data.txt).
+
<p>For example, this is four cocircular points inside a square. Their Voronoi
diagram has nine vertices and eight regions. Notice the Voronoi vertex
at the origin, and the Voronoi vertices (on each axis) for the four
@@ -541,7 +544,7 @@ href="qdelaun.htm#conventions">Delaunay conventions</a>, and
<pre>
qvoronoi- compute the Voronoi diagram
- http://www.geom.umn.edu/locate/qhull
+ http://www.geom.umn.edu/software/qhull
input (stdin):
first lines: dimension and number of points (or vice-versa).
@@ -640,7 +643,7 @@ Print options:
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -663,8 +666,7 @@ Print options:
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/html/rbox.htm b/html/rbox.htm
index 4161d84410b1b6dd9c81426f502d0cdb2a13594a..7bf60f9ed9be8e0a9d649d7dfe12ddc3f6b922cf 100644
--- a/html/rbox.htm
+++ b/html/rbox.htm
@@ -7,7 +7,7 @@
<body>
<!-- Navigation links -->
-<p><b><a name="TOP">Up:</a></b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b><a name="TOP">Up:</a></b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -244,7 +244,7 @@ Some combinations of arguments generate odd results.
<!-- Navigation links -->
<hr>
-<p><b>Up:</b> <a href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+<p><b>Up:</b> <a href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual</a>: Table of Contents<br>
<b>To:</b> <a href="qh-quick.htm#programs">Programs</a>
• <a href="qh-quick.htm#options">Options</a>
@@ -265,8 +265,7 @@ Some combinations of arguments generate odd results.
align="middle" width="40" height="40"></a><i>The Geometry Center
Home Page </i></p>
-<p>Comments to: <a
-href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu</a>
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
<br>
Created: Sept. 25, 1995 --- <!-- hhmts start --> Last modified: August 12, 1998 <!-- hhmts end --> </p>
</body>
diff --git a/src/Changes.txt b/src/Changes.txt
index c5ff469d282a2ba51bcd9fcf94a917ce29aaeffb..5ab22a877c8280ffa838479ea7d598b481a38410 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -1,6 +1,46 @@
.............This file lists all changes to qhull and rbox.....................
+
+qhull 2002.1 2002/8/20
+
+Changes to distribution:
+ - Set up savannah.gnu.org/projects/qhull/ [R. Laboissiere]
+ - Set up www.thesa.com/software/qhull as a backup
+ - Added qh-get.htm, a local copy of the download page
+ - Added Visual C++ interface to Qhull, qhull_interface.cpp [K. Erleben]
+ - Use HTTP instead of FTP for downloading Qhull
+ - Renamed qhull-1.0.sit.hqx
+
+Bug fixes:
+ - Fixed sign of coefficients for cdd halfspaces ('FD','Fd') [T. Abraham]
+
+Changes to code:
+ - Replace qh_version with qh_VERSION in qhull.h.
+ Allows shared libraries and single point of definition
+
+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.
+ - In README, use -fno-strict-aliasing with gcc-2.95.1 [Karas, Krishnaswami]
+ - Fixed chmod in Makefile.txt [B. Karas]
+
+Documentation updates
+ - Documented input options for each program [A. Montesinos]
+ - FAQ: "How to get the radii of the empty spheres for Voronoi vertices"
+
+URL updates:
+ - Changed official URL from locate/qhull to software/qhull
+ - Changed URLs from relative to absolute in qh-home.htm and qh-get.htm
+ - Added URL for Newsgroup: comp.soft-sys.matlab
+ - Added URL for GNU Octave
+ - Added URLs for Google and Google Groups
+ - Replaced qhull_mail.html and qhull_bug.html with mailto links.
+ - Removed URL for Computational Geometry Tribune
+ - Changed URL for locate/cglist to software/cglist
+ - Used site relative links for qh-home.htm
+
qhull 3.1 2001/10/04
New features
@@ -24,7 +64,7 @@ Changes to options
Corrections to code
- rbox: allow 'c' and 'd' with 's r', meshes, etc.
- - qh_findbest: redesigned as directed search plus qh_findbesthorizon for coplanarset
+ - 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,
@@ -696,7 +736,7 @@ qhull V2.1 6/7/95
qhull V2.1 6/3/95
- home page for Qhull and new descriptions for the Qhull examples
- http://www.geom.umn.edu/locate/qhull
+ http://www.geom.umn.edu/software/qhull
- changed SIOUX buffering for Power Macintosh. It runs fast now.
added a project file for Metrowerk's C
- note in README about compiling qhull on the PC
diff --git a/src/Make-config.sh b/src/Make-config.sh
new file mode 100644
index 0000000000000000000000000000000000000000..90bbb9585992f15875ad76939ce6a6218a2515cf
--- /dev/null
+++ b/src/Make-config.sh
@@ -0,0 +1,285 @@
+#!/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 = \
+ 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-home.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
new file mode 100644
index 0000000000000000000000000000000000000000..e87b66b49bc29139ac2d6d912df464c945f065a1
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,190 @@
+# Unix Makefile for qhull and rbox
+#
+# see README.txt
+#
+# make to produce qhull qconvex qdelaunay qhalf qvoronoi rbox
+# make qvoronoi to produce qvoronoi (etc.)
+# make qhullx to produce qhull qconvex etc. w/o using libqhull.a
+# make doc to print documentation
+# make install to copy qhull, rbox, qhull.1, rbox.1 to BINDIR, MANDIR
+# make new to rebuild qhull and rbox from source
+#
+# make printall to print all files
+# make user_eg to produce user_eg
+# make user_eg2 to produce user_eg2
+# make clean to remove object files and core
+# make cleanall to remove all generated files
+#
+# PRINTMAN -- command for printing manual pages
+# PRINTC -- command for printing C files
+# BINDIR -- directory where to copy executables
+# MANDIR -- directory where to copy manual pages
+# CC -- ANSI C or C++ compiler
+# CCOPTS1 - options used to compile .c files
+# CCOPTS2 -- options used to link .o files
+#
+# CFILES -- .c files for printing
+# HFILES -- .h files for printing
+# DFILES -- documentation files
+# MFILES -- man pages and html files
+# TFILES -- .txt versions of html html files
+# FILES -- all other files
+# OBJS -- specifies the object files of libqhull.a
+#
+BINDIR = /usr/local/bin
+MANDIR = /usr/local/man/man1
+
+# if you do not have enscript, try a2ps or just use lpr. The files are text.
+PRINTMAN = enscript -2rl
+PRINTC = enscript -2r
+# PRINTMAN = lpr
+# PRINTC = lpr
+
+#for Gnu's gcc compiler -O2 for optimization, -g for debugging, -Wall for check
+#
+CC = gcc
+CCOPTS1 = -O2 -ansi
+
+# for Sun's cc compiler, -fast or O2 for optimization, -g for debugging, -Xc for ANSI
+#CC = cc
+#CCOPTS1 = -Xc -v -fast
+
+# for Silicon Graphics cc compiler, -O2 for optimization, -g for debugging
+#CC = cc
+#CCOPTS1 = -ansi -O2
+
+# for Next cc compiler with fat executable
+#CC = cc
+#CCOPTS1 = -ansi -O2 -arch m68k -arch i386 -arch hppa
+
+# for loader, ld
+CCOPTS2 = $(CCOPTS1)
+
+# OBJS in execution frequency order. CFILES after qhull.c are alphabetical
+OBJS = user.o global.o stat.o io.o geom2.o poly2.o \
+ merge.o qhull.o geom.o poly.o qset.o mem.o
+
+CFILES= unix.c qhull.c geom.c geom2.c global.c io.c mem.c merge.c poly.c \
+ poly2.c qset.c stat.c user.c qconvex.c qdelaun.c qhalf.c qvoronoi.c
+HFILES= user.h qhull.h qhull_a.h geom.h io.h mem.h merge.h poly.h qset.h stat.h
+TXTFILES= ../Announce.txt ../REGISTER.txt ../COPYING.txt ../README.txt Changes.txt
+DOCFILES= ../html/rbox.txt ../html/qhull.txt
+FILES= Makefile rbox.c user_eg.c ../eg/q_test ../eg/q_egtest ../eg/q_eg
+HTMFILES= qhull.man rbox.man qh-in.htm qh-optg.htm qh-optt.htm qh-optp.htm \
+ index.htm qh-quick.htm qh-impre.htm qh-eg.htm \
+ qh-optc.htm qh-opto.htm qh-optf.htm qh-optq.htm \
+ qh-c.htm qh-faq.htm qhull.htm qconvex.htm qdelaun.htm \
+ qh-geom.htm qh-globa.htm qh-io.htm qh-mem.htm qh-merge.htm \
+ qh-poly.htm qh-qhull.htm qh-set.htm qh-stat.htm qh-user.htm \
+ qdelau_f.htm qhalf.htm qvoronoi.htm qvoron_f.htm rbox.htm
+
+all: rbox qconvex qdelaunay qhalf qvoronoi qhull
+
+unix.o: qhull.h user.h mem.h
+qconvex.o: qhull.h user.h mem.h
+qdelaun.o: qhull.h user.h mem.h
+qhalf.o: qhull.h user.h mem.h
+qvoronoi.o: qhull.h user.h mem.h
+qhull.o: $(HFILES)
+geom.o: $(HFILES)
+geom2.o: $(HFILES)
+global.o: $(HFILES)
+io.o: $(HFILES)
+mem.o: mem.h
+merge.o: $(HFILES)
+poly.o: $(HFILES)
+poly2.o: $(HFILES)
+qset.o: qset.h mem.h
+stat.o: $(HFILES)
+user.o: $(HFILES)
+
+.c.o:
+ $(CC) -c $(CCOPTS1) $<
+
+clean:
+ rm -f *.o ../core qconvex qdelaunay qhalf qvoronoi qhull libqhull.a \
+ *.exe
+
+cleanall: clean
+ rm -f *~ ../rbox ../qhull ../qhalf ../qconvex ../qdelaunay ../qhalf\
+ ../qvoronoi ../user_eg ../user_eg2 ../*.exe >/dev/null
+
+doc:
+ $(PRINTMAN) $(TXTFILES) $(DOCFILES)
+
+install: all
+ cp ../qconvex $(BINDIR)/qconvex
+ cp ../qdelaunay $(BINDIR)/qdelaunay
+ cp ../qhalf $(BINDIR)/qhalf
+ cp ../qhull $(BINDIR)/qhull
+ cp ../qvoronoi $(BINDIR)/qvoronoi
+ cp ../rbox $(BINDIR)/rbox
+ cp ../html/qhull.man $(MANDIR)/qhull.1
+ cp ../html/rbox.man $(MANDIR)/rbox.1
+
+new: cleanall all
+
+printall: doc printh printc printf
+
+printh:
+ $(PRINTC) $(HFILES)
+
+printc:
+ $(PRINTC) $(CFILES)
+
+printf:
+ $(PRINTC) $(FILES)
+
+libqhull.a: $(OBJS)
+ @echo if 'ar' or 'ranlib' fails, try 'make qhullx'
+ ar r libqhull.a $(OBJS)
+ @echo the next line may need to be removed.
+ -test -x /bin/ranlib -o -x /usr/bin/ranlib && ranlib libqhull.a
+
+# don't use ../qconvex. Does not work on Red Hat Linux
+qconvex: qconvex.o libqhull.a
+ $(CC) -o qconvex $(CCOPTS2) qconvex.o -L. -lqhull -lm
+ cp qconvex ..
+
+qdelaunay: qdelaun.o libqhull.a
+ $(CC) -o qdelaunay $(CCOPTS2) qdelaun.o -L. -lqhull -lm
+ cp qdelaunay ..
+
+qhalf: qhalf.o libqhull.a
+ $(CC) -o qhalf $(CCOPTS2) qhalf.o -L. -lqhull -lm
+ cp qhalf ..
+
+qvoronoi: qvoronoi.o libqhull.a
+ $(CC) -o qvoronoi $(CCOPTS2) qvoronoi.o -L. -lqhull -lm
+ cp qvoronoi ..
+
+qhull: unix.o libqhull.a
+ $(CC) -o qhull $(CCOPTS2) unix.o -L. -lqhull -lm
+ cp qhull ..
+ -chmod +x ../eg/q_test ../eg/q_eg ../eg/q_egtest
+ -cd ..; ./rbox D4 | ./qhull
+
+# compile qhull without using libqhull.a
+qhullx: qconvex.o qdelaun.o qhalf.o qvoronoi.o unix.o $(OBJS)
+ $(CC) -o qconvex $(CCOPTS2) qconvex.o $(OBJS) -lm
+ $(CC) -o qdelaunay $(CCOPTS2) qdelaun.o $(OBJS) -lm
+ $(CC) -o qhalf $(CCOPTS2) qhalf.o $(OBJS) -lm
+ $(CC) -o qvoronoi $(CCOPTS2) qvoronoi.o $(OBJS) -lm
+ $(CC) -o qhull $(CCOPTS2) unix.o $(OBJS) -lm
+ cp qconvex qdelaunay qhalf qvoronoi qhull ..
+ -chmod +x ../eg/q_test ../eg/q_eg ../eg/q_egtest
+ -cd ..; ./rbox D4 | ./qhull
+
+rbox: rbox.o
+ $(CC) -o rbox rbox.o $(CCOPTS2) -lm
+ cp rbox ..
+
+user_eg: user_eg.o libqhull.a
+ $(CC) -o user_eg $(CCOPTS2) user_eg.o -L. -lqhull -lm
+ cp user_eg ..
+
+user_eg2: user_eg2.o libqhull.a
+ $(CC) -o user_eg2 $(CCOPTS2) user_eg2.o -L. -lqhull -lm
+ cp user_eg2 ..
+
+# end of Makefile
diff --git a/src/Makefile.txt b/src/Makefile.txt
index 6c572f6697e0f0046840517123daea365dca0029..e87b66b49bc29139ac2d6d912df464c945f065a1 100644
--- a/src/Makefile.txt
+++ b/src/Makefile.txt
@@ -102,7 +102,8 @@ user.o: $(HFILES)
$(CC) -c $(CCOPTS1) $<
clean:
- rm -f *.o ../core qconvex qdelaunay qhalf qvoronoi qhull
+ rm -f *.o ../core qconvex qdelaunay qhalf qvoronoi qhull libqhull.a \
+ *.exe
cleanall: clean
rm -f *~ ../rbox ../qhull ../qhalf ../qconvex ../qdelaunay ../qhalf\
@@ -171,7 +172,7 @@ qhullx: qconvex.o qdelaun.o qhalf.o qvoronoi.o unix.o $(OBJS)
$(CC) -o qvoronoi $(CCOPTS2) qvoronoi.o $(OBJS) -lm
$(CC) -o qhull $(CCOPTS2) unix.o $(OBJS) -lm
cp qconvex qdelaunay qhalf qvoronoi qhull ..
- -chmod +x ../eq/q_test ../eq/q_eg ../eq/q_egtest
+ -chmod +x ../eg/q_test ../eg/q_eg ../eg/q_egtest
-cd ..; ./rbox D4 | ./qhull
rbox: rbox.o
diff --git a/src/geom.c b/src/geom.c
index f25d171f3dbb70f40b30a5a5e92e580f90493450..b3cf198d51028a60c41239ceb6f0b73778275628 100644
--- a/src/geom.c
+++ b/src/geom.c
@@ -6,7 +6,7 @@
see qh-geom.htm and geom.h
- copyright (c) 1993-2001 The Geometry Center
+ copyright (c) 1993-2002 The Geometry Center
infrequent code goes into geom2.c
*/
diff --git a/src/geom.h b/src/geom.h
index 4233e56ea8dedc1f968b47421c32971bdf812292..32440cff56ff3154f728bb1c086f4566271f2bc2 100644
--- a/src/geom.h
+++ b/src/geom.h
@@ -6,7 +6,7 @@
see qh-geom.htm and geom.c
- copyright (c) 1993-2001 The Geometry Center
+ copyright (c) 1993-2002 The Geometry Center
*/
#ifndef qhDEFgeom
diff --git a/src/geom2.c b/src/geom2.c
index 19c8185b82104a46cc401048daf80d8307057a32..bd58ce1282b9cfad2f0f9048502a476c7dce86e8 100644
--- a/src/geom2.c
+++ b/src/geom2.c
@@ -7,7 +7,7 @@
see qh-geom.htm and geom.h
- copyright (c) 1993-2001 The Geometry Center
+ copyright (c) 1993-2002 The Geometry Center
frequently used code goes into geom.c
*/
diff --git a/src/global.c b/src/global.c
index 260e8d765753c141b5837e0b5f98bd2ddca497b3..d3e141aa985dca8e15aa55c8294d9eda281417c2 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1,16 +1,16 @@
/*<html><pre> -<a href="qh-globa.htm"
>-------------------------------</a><a name="TOP">-</a>
- global.c
+ global.c
initializes all the globals of the qhull application
- see README
+ see README
see qhull.h for qh.globals and function prototypes
see qhull_a.h for internal functions
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include "qhull_a.h"
@@ -20,14 +20,14 @@
#if qh_QHpointer
qhT *qh_qh= NULL; /* pointer to all global variables */
#else
-qhT qh_qh; /* all global variables.
- Add "= {0}" if this causes a compiler error.
+qhT qh_qh; /* all global variables.
+ Add "= {0}" if this causes a compiler error.
Also qh_qhstat in stat.c and qhmem in mem.c. */
#endif
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="appendprint">-</a>
-
+
qh_appendprint( printFormat )
append printFormat to qh.PRINTout unless already defined
*/
@@ -165,7 +165,7 @@ unsigned long qh_clock (void) {
}
ratio= qh_SECticks / (double)clktck;
ticks= time.tms_utime * ratio;
- return ticks;
+ return ticks;
#else
fprintf (qh ferr, "qhull internal error (qh_clock): use qh_CLOCKtype 2 in user.h\n");
qh_errexit (qh_ERRqhull, NULL, NULL); /* never returns */
@@ -175,7 +175,7 @@ unsigned long qh_clock (void) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="freebuffers">-</a>
-
+
qh_freebuffers()
free up global memory buffers
@@ -227,7 +227,7 @@ void qh_freebuffers (void) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="freebuild">-</a>
-
+
qh_freebuild( allmem )
free global memory used by qh_initbuild and qh_buildhull
if !allmem,
@@ -266,7 +266,7 @@ void qh_freebuild (boolT allmem) {
}
}
}else if (qh VERTEXneighbors) {
- FORALLvertices
+ FORALLvertices
qh_setfreelong (&(vertex->neighbors));
}
qh VERTEXneighbors= False;
@@ -327,7 +327,7 @@ void qh_freebuild (boolT allmem) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="freeqhull">-</a>
-
+
qh_freeqhull( allmem )
free global memory
if !allmem,
@@ -359,77 +359,77 @@ void qh_freeqhull (boolT allmem) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="init_A">-</a>
-
+
qh_init_A( infile, outfile, errfile, argc, argv )
initialize memory and stdio files
convert input options to option string (qh.qhull_command)
notes:
infile may be NULL if qh_readpoints() is not called
-
+
errfile should always be defined. It is used for reporting
errors. outfile is used for output and format options.
-
+
argc/argv may be 0/NULL
-
+
called before error handling initialized
qh_errexit() may not be used
*/
void qh_init_A (FILE *infile, FILE *outfile, FILE *errfile, int argc, char *argv[]) {
qh_meminit (errfile);
- qh_initqhull_start (infile, outfile, errfile);
+ qh_initqhull_start (infile, outfile, errfile);
qh_init_qhull_command (argc, argv);
} /* init_A */
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="init_B">-</a>
-
+
qh_init_B( points, numpoints, dim, ismalloc )
initialize globals for points array
-
+
points has numpoints dim-dimensional points
points[0] is the first coordinate of the first point
points[1] is the second coordinate of the first point
points[dim] is the first coordinate of the second point
-
+
ismalloc=True
Qhull will call free(points) on exit or input transformation
ismalloc=False
Qhull will allocate a new point array if needed for input transformation
-
- qh.qhull_command
- is the option string.
+
+ qh.qhull_command
+ is the option string.
It is defined by qh_init_B(), qh_qhull_command(), or qh_initflags
returns:
if qh.PROJECTinput or (qh.DELAUNAY and qh.PROJECTdelaunay)
projects the input to a new point array
-
- if qh.DELAUNAY,
+
+ if qh.DELAUNAY,
qh.hull_dim is increased by one
- if qh.ATinfinity,
+ if qh.ATinfinity,
qh_projectinput adds point-at-infinity for Delaunay tri.
-
+
if qh.SCALEinput
changes the upper and lower bounds of the input, see qh_scaleinput()
-
+
if qh.ROTATEinput
rotates the input by a random rotation, see qh_rotateinput()
if qh.DELAUNAY
rotates about the last coordinate
-
+
notes:
called after points are defined
qh_errexit() may be used
*/
-void qh_init_B (coordT *points, int numpoints, int dim, boolT ismalloc) {
+void qh_init_B (coordT *points, int numpoints, int dim, boolT ismalloc) {
qh_initqhull_globals (points, numpoints, dim, ismalloc);
if (qhmem.LASTsize == 0)
qh_initqhull_mem();
/* mem.c and qset.c are initialized */
qh_initqhull_buffers();
qh_initthresholds (qh qhull_command);
- if (qh PROJECTinput || (qh DELAUNAY && qh PROJECTdelaunay))
+ if (qh PROJECTinput || (qh DELAUNAY && qh PROJECTdelaunay))
qh_projectinput();
if (qh SCALEinput)
qh_scaleinput();
@@ -450,16 +450,16 @@ void qh_init_B (coordT *points, int numpoints, int dim, boolT ismalloc) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="init_qhull_command">-</a>
-
+
qh_init_qhull_command( argc, argv )
build qh.qhull_command from argc/argv
returns:
a space-deliminated string of options (just as typed)
-
+
notes:
- makes option string easy to input and output
-
+ makes option string easy to input and output
+
argc/argv may be 0/NULL
*/
void qh_init_qhull_command(int argc, char *argv[]) {
@@ -489,17 +489,17 @@ void qh_init_qhull_command(int argc, char *argv[]) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="initflags">-</a>
-
+
qh_initflags( commandStr )
set flags and initialized constants from commandStr
returns:
sets qh.qhull_command to command if needed
-
+
notes:
ignores first word (e.g., "qhull d")
use qh_strtol/strtod since strtol/strtod may or may not skip trailing spaces
-
+
see:
qh_initthresholds() continues processing of 'Pdn' and 'PDn'
'prompt' in unix.c for documentation
@@ -515,8 +515,8 @@ void qh_init_qhull_command(int argc, char *argv[]) {
check syntax
append approriate option to option string
set appropriate global variable or append printFormat to print options
-
-
+
+
*/
void qh_initflags(char *command) {
int k, i, lastproject;
@@ -577,7 +577,7 @@ void qh_initflags(char *command) {
qh DELAUNAY= True;
break;
case 'A':
- if (!isdigit(*s) && *s != '.' && *s != '-')
+ if (!isdigit(*s) && *s != '.' && *s != '-')
fprintf(qh ferr, "qhull warning: no maximum cosine angle given for option 'An'. Ignored.\n");
else {
if (*s == '-') {
@@ -589,7 +589,7 @@ void qh_initflags(char *command) {
qh_option ("Angle-postmerge", NULL, &qh postmerge_cos);
qh POSTmerge= True;
}
- qh MERGING= True;
+ qh MERGING= True;
}
break;
case 'C':
@@ -605,7 +605,7 @@ void qh_initflags(char *command) {
qh_option ("Centrum-postmerge", NULL, &qh postmerge_centrum);
qh POSTmerge= True;
}
- qh MERGING= True;
+ qh MERGING= True;
}
break;
case 'E':
@@ -741,7 +741,7 @@ void qh_initflags(char *command) {
if (qh PRINToptions1st) {
qh_option ("FOptions", NULL, NULL);
qh_appendprint (qh_PRINToptions);
- }else
+ }else
qh PRINToptions1st= True;
break;
case 'p':
@@ -946,7 +946,7 @@ void qh_initflags(char *command) {
if ((r= qh_strtod(s, &s)) == 0.0) {
t= s; /* need true dimension for memory allocation */
while (*t && !isspace(*t)) {
- if (toupper(*t++) == 'B'
+ if (toupper(*t++) == 'B'
&& k == qh_strtol (t, &t)
&& *t++ == ':'
&& qh_strtod(t, &t) == 0.0) {
@@ -961,7 +961,7 @@ void qh_initflags(char *command) {
}
}
if (!wasproject) {
- if (lastproject == k && r == 0.0)
+ if (lastproject == k && r == 0.0)
lastproject= -1; /* doesn't catch all possible sequences */
else if (key == 'b') {
qh SCALEinput= True;
@@ -1008,6 +1008,15 @@ void qh_initflags(char *command) {
qh_option ("Qtriangulate", NULL, NULL);
qh TRIangulate= True;
break;
+ case 'T':
+ qh_option ("QTestPoints", NULL, NULL);
+ if (!isdigit (*s))
+ fprintf (qh ferr, "qhull input error: missing number of test points for option 'QTn'\n");
+ else {
+ qh TESTpoints= qh_strtol (s, &s);
+ qh_option ("QTestPoints", &qh TESTpoints, NULL);
+ }
+ break;
case 'u':
qh_option ("QupperDelaunay", NULL, NULL);
qh UPPERdelaunay= True;
@@ -1027,7 +1036,7 @@ void qh_initflags(char *command) {
case '0':
qh_option ("Q0-no-premerge", NULL, NULL);
qh NOpremerge= True;
- break;
+ break;
case '1':
if (!isdigit(*s)) {
qh_option ("Q1-no-angle-sort", NULL, NULL);
@@ -1060,7 +1069,7 @@ void qh_initflags(char *command) {
qh_option ("Q3-no-merge-vertices", NULL, NULL);
qh MERGEvertices= False;
LABELcheckdigit:
- if (isdigit(*s))
+ if (isdigit(*s))
fprintf (qh ferr, "qhull warning: can not follow '1', '2', or '3' with a digit. '%c' skipped.\n",
*s++);
break;
@@ -1090,11 +1099,11 @@ void qh_initflags(char *command) {
break;
case 'G':
i= qh_strtol (s, &t);
- if (qh GOODpoint)
+ if (qh GOODpoint)
fprintf (qh ferr, "qhull warning: good point already defined for option 'QGn'. Ignored\n");
else if (s == t)
fprintf (qh ferr, "qhull warning: missing good point id for option 'QGn'. Ignored\n");
- else if (i < 0 || *s == '-') {
+ else if (i < 0 || *s == '-') {
qh GOODpoint= i-1;
qh_option ("QGood-if-dont-see-point", &i, NULL);
}else {
@@ -1124,7 +1133,7 @@ void qh_initflags(char *command) {
break;
case 'V':
i= qh_strtol (s, &t);
- if (qh GOODvertex)
+ if (qh GOODvertex)
fprintf (qh ferr, "qhull warning: good vertex already defined for option 'QVn'. Ignored\n");
else if (s == t)
fprintf (qh ferr, "qhull warning: no good point id given for option 'QVn'. Ignored\n");
@@ -1245,7 +1254,7 @@ void qh_initflags(char *command) {
*(t++)= *s++;
}
*t= '\0';
- if (isquote)
+ if (isquote)
fprintf (qh ferr, "qhull error: missing end quote for option 'TO'. Rest of line ignored.\n");
else if (!freopen (filename, "w", stdout)) {
fprintf (qh ferr, "qhull error: could not open file \"%s\".", filename);
@@ -1329,7 +1338,7 @@ void qh_initflags(char *command) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="initqhull_buffers">-</a>
-
+
qh_initqhull_buffers()
initialize global memory buffers
@@ -1362,10 +1371,10 @@ void qh_initqhull_buffers (void) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="initqhull_globals">-</a>
-
+
qh_initqhull_globals( points, numpoints, dim, ismalloc )
initialize globals
- if ismalloc
+ if ismalloc
points were malloc'd and qhull should free at end
returns:
@@ -1377,18 +1386,18 @@ void qh_initqhull_buffers (void) {
notes:
do not use qh_point() since an input transformation may move them elsewhere
-
+
see:
qh_initqhull_start() sets default values for non-zero globals
-
+
design:
initialize points array from input arguments
- test for qh.ZEROcentrum
+ test for qh.ZEROcentrum
(i.e., use opposite vertex instead of cetrum for convexity testing)
test for qh.PRINTgood (i.e., only print 'good' facets)
initialize qh.CENTERtype, qh.normal_size,
qh.center_size, qh.TRACEpoint/level,
- initialize and test random numbers
+ initialize and test random numbers
check for conflicting print output options
*/
void qh_initqhull_globals (coordT *points, int numpoints, int dim, boolT ismalloc) {
@@ -1396,10 +1405,10 @@ void qh_initqhull_globals (coordT *points, int numpoints, int dim, boolT ismallo
boolT printgeom= False, printmath= False, printcoplanar= False;
realT randr;
realT factorial;
-
+
time_t timedata;
- trace0((qh ferr, "qh_initqhull_globals: for %s | %s\n", qh rbox_command,
+ trace0((qh ferr, "qh_initqhull_globals: for %s | %s\n", qh rbox_command,
qh qhull_command));
qh POINTSmalloc= ismalloc;
qh first_point= points;
@@ -1427,7 +1436,7 @@ void qh_initqhull_globals (coordT *points, int numpoints, int dim, boolT ismallo
qh SCALElast= True;
qh_option ("Qbbound-last-qj", NULL, NULL);
}
- if (qh MERGING && !qh POSTmerge && qh premerge_cos > REALmax/2
+ if (qh MERGING && !qh POSTmerge && qh premerge_cos > REALmax/2
&& qh premerge_centrum == 0) {
qh ZEROcentrum= True;
qh ZEROall_ok= True;
@@ -1507,7 +1516,7 @@ void qh_initqhull_globals (coordT *points, int numpoints, int dim, boolT ismallo
if (qh IStracing) {
fprintf (qh ferr, "qhull input error: tracing is not installed (qh_NOtrace in user.h)");
qh_errexit (qh_ERRqhull, NULL, NULL);
- }
+ }
#endif
if (qh RERUN > 1) {
qh TRACElastrun= qh IStracing; /* qh_build_withrestart duplicates next conditional */
@@ -1522,7 +1531,7 @@ void qh_initqhull_globals (coordT *points, int numpoints, int dim, boolT ismallo
if (qh ROTATErandom == -1) {
seed= -seed;
qh_option ("QRandom-seed", &seed, NULL );
- }else
+ }else
qh_option ("QRotate-random", &seed, NULL);
qh ROTATErandom= seed;
}
@@ -1638,25 +1647,25 @@ available for 4-d output (ignored). Could use 'GDn' instead.\n");
if (qh DROPdim >=0) { /* after Geomview checks */
if (qh DROPdim < qh hull_dim) {
qh PRINTdim--;
- if (!printgeom || qh hull_dim < 3)
+ if (!printgeom || qh hull_dim < 3)
fprintf (qh ferr, "qhull input warning: drop dimension 'GD%d' is only available for 3-d/4-d Geomview\n", qh DROPdim);
}else
qh DROPdim= -1;
}else if (qh VORONOI) {
qh DROPdim= qh hull_dim-1;
- qh PRINTdim= qh hull_dim-1;
+ qh PRINTdim= qh hull_dim-1;
}
} /* initqhull_globals */
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="initqhull_mem">-</a>
-
+
qh_initqhull_mem( )
initialize mem.c for qhull
qh.hull_dim and qh.normal_size determine some of the allocation sizes
- if qh.MERGING,
+ if qh.MERGING,
includes ridgeT
- calls qh_user_memsizes() to add up to 10 additional sizes for quick allocation
+ calls qh_user_memsizes() to add up to 10 additional sizes for quick allocation
(see numsizes below)
returns:
@@ -1671,7 +1680,7 @@ void qh_initqhull_mem (void) {
int i;
numsizes= 8+10;
- qh_meminitbuffers (qh IStracing, qh_MEMalign, numsizes,
+ qh_meminitbuffers (qh IStracing, qh_MEMalign, numsizes,
qh_MEMbufsize,qh_MEMinitbuf);
qh_memsize(sizeof(vertexT));
if (qh MERGING) {
@@ -1690,7 +1699,7 @@ void qh_initqhull_mem (void) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="initqhull_start">-</a>
-
+
qh_initqhull_start( infile, outfile, errfile )
start initialization of qhull
initialize statistics, stdio, default values for global variables
@@ -1753,14 +1762,14 @@ void qh_initqhull_start (FILE *infile, FILE *outfile, FILE *errfile) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="initthresholds">-</a>
-
+
qh_initthresholds( commandString )
set thresholds for printing and scaling from commandString
returns:
sets qh.GOODthreshold or qh.SPLITthreshold if 'Pd0D1' used
- see:
+ see:
qh_initflags(), 'Qbk' 'QBk' 'Pdk' and 'PDk'
qh_inthresholds()
@@ -1769,14 +1778,14 @@ void qh_initqhull_start (FILE *infile, FILE *outfile, FILE *errfile) {
check syntax
set qh.lower_threshold or qh.upper_threshold
set qh.GOODthreshold if an unbounded threshold is used
- set qh.SPLITthreshold if a bounded threshold is used
+ set qh.SPLITthreshold if a bounded threshold is used
*/
void qh_initthresholds(char *command) {
realT value;
int index, maxdim, k;
char *s= command;
char key;
-
+
maxdim= qh input_dim;
if (qh DELAUNAY && (qh PROJECTdelaunay || qh PROJECTinput))
maxdim++;
@@ -1794,7 +1803,7 @@ void qh_initthresholds(char *command) {
}
index= qh_strtol (s, &s);
if (index >= qh hull_dim) {
- fprintf(qh ferr, "qhull warning: dimension %d for Print option '%c' is >= %d. Ignored\n",
+ fprintf(qh ferr, "qhull warning: dimension %d for Print option '%c' is >= %d. Ignored\n",
index, key, qh hull_dim);
continue;
}
@@ -1802,7 +1811,7 @@ void qh_initthresholds(char *command) {
s++;
value= qh_strtod(s, &s);
if (fabs((double)value) > 1.0) {
- fprintf(qh ferr, "qhull warning: value %2.4g for Print option %c is > +1 or < -1. Ignored\n",
+ fprintf(qh ferr, "qhull warning: value %2.4g for Print option %c is > +1 or < -1. Ignored\n",
value, key);
continue;
}
@@ -1833,7 +1842,7 @@ void qh_initthresholds(char *command) {
}
index= qh_strtol (s, &s);
if (index >= maxdim) {
- fprintf(qh ferr, "qhull warning: dimension %d for Qhull option %c is >= %d. Ignored\n",
+ fprintf(qh ferr, "qhull warning: dimension %d for Qhull option %c is >= %d. Ignored\n",
index, key, maxdim);
continue;
}
@@ -1872,7 +1881,7 @@ void qh_initthresholds(char *command) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="option">-</a>
-
+
qh_option( option, intVal, realVal )
add an option description to qh.qhull_options
@@ -1896,14 +1905,14 @@ void qh_option (char *option, int *i, realT *r) {
if (qh qhull_optionlen >= 80 && maxlen > 0) {
qh qhull_optionlen= len;
strncat (qh qhull_options, "\n", maxlen--);
- }
+ }
strncat (qh qhull_options, buf, maxlen);
} /* option */
#if qh_QHpointer
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="restore_qhull">-</a>
-
+
qh_restore_qhull( oldqh )
restores a previously saved qhull
also restores qh_qhstat and qhmem.tempstack
@@ -1911,11 +1920,11 @@ void qh_option (char *option, int *i, realT *r) {
notes:
errors if current qhull hasn't been saved or freed
uses qhmem for error reporting
-
- NOTE 1998/5/11:
- Freeing memory after qh_save_qhull and qh_restore_qhull
+
+ NOTE 1998/5/11:
+ Freeing memory after qh_save_qhull and qh_restore_qhull
is complicated. The procedures will be redesigned.
-
+
see:
qh_save_qhull()
*/
@@ -1944,7 +1953,7 @@ void qh_restore_qhull (qhT **oldqh) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="save_qhull">-</a>
-
+
qh_save_qhull( )
saves qhull for a later qh_restore_qhull
also saves qh_qhstat and qhmem.tempstack
@@ -1954,11 +1963,11 @@ void qh_restore_qhull (qhT **oldqh) {
notes:
need to initialize qhull or call qh_restore_qhull before continuing
-
- NOTE 1998/5/11:
- Freeing memory after qh_save_qhull and qh_restore_qhull
+
+ NOTE 1998/5/11:
+ Freeing memory after qh_save_qhull and qh_restore_qhull
is complicated. The procedures will be redesigned.
-
+
see:
qh_restore_qhull()
*/
@@ -1983,7 +1992,7 @@ qhT *qh_save_qhull (void) {
/*-<a href="qh-globa.htm#TOC"
>-------------------------------</a><a name="strtol">-</a>
-
+
qh_strtol( s, endp) qh_strtod( s, endp)
internal versions of strtol() and strtod()
does not skip trailing spaces
diff --git a/src/index.htm b/src/index.htm
index 9d2b645b1d291e9adee3bcd888b6fe881b60d425..ef8fe4fd517985e3c39778e8c89f2809a7c123a4 100644
--- a/src/index.htm
+++ b/src/index.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -82,11 +82,11 @@ Opera does not always work since it treats '<' characters as HTML tags.
Please report documentation and link errors
to <a href="mailto:qhull-bug@geom.umn.edu">qhull-bug@geom.umn.edu</a>.
<p>
-<i>Brad Barber, Cambridge MA, October 4, 2001</i>
+<i>Brad Barber, Cambridge MA, June 1, 2002</i>
</p>
</blockquote>
-<p><b>Copyright © 1997-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1997-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
@@ -206,7 +206,7 @@ the code with defined constants and specialized routines.
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -232,8 +232,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/io.c b/src/io.c
index 4372a6e7f2dd181f32ab49dbe6ce65e3a531564c..79ca7995d1e15a383cfb12902f103056c45f2c64 100644
--- a/src/io.c
+++ b/src/io.c
@@ -13,7 +13,7 @@
unix.c and user.c are the only callers of io.c functions
This allows the user to avoid loading io.o from qhull.a
- copyright (c) 1993-2001 The Geometry Center
+ copyright (c) 1993-2002 The Geometry Center
*/
#include "qhull_a.h"
@@ -1144,12 +1144,15 @@ void qh_printafacet(FILE *fp, int format, facetT *facet, boolT printall) {
fprintf (fp, "no normal for facet f%d\n", facet->id);
break;
}
- if (qh CDDoutput)
+ if (qh CDDoutput) {
fprintf (fp, qh_REAL_1, -offset);
- for (k=0; k < qh hull_dim; k++)
- fprintf (fp, qh_REAL_1, facet->normal[k]);
- if (!qh CDDoutput)
+ for (k=0; k < qh hull_dim; k++)
+ fprintf (fp, qh_REAL_1, -facet->normal[k]);
+ }else {
+ for (k=0; k < qh hull_dim; k++)
+ fprintf (fp, qh_REAL_1, facet->normal[k]);
fprintf (fp, qh_REAL_1, offset);
+ }
fprintf (fp, "\n");
break;
case qh_PRINTmathematica: /* either 2 or 3-d by qh_printbegin */
@@ -2570,7 +2573,7 @@ void qh_printfacets(FILE *fp, int format, facetT *facetlist, setT *facets, boolT
else
qh_printextremes (fp, facetlist, facets, printall);
}else if (format == qh_PRINToptions)
- fprintf(fp, "Options selected for Qhull %s:\n%s\n", qh_version, qh qhull_options);
+ fprintf(fp, "Options selected for Qhull %s:\n%s\n", qh_VERSION, qh qhull_options);
else if (format == qh_PRINTpoints && !qh VORONOI)
qh_printpoints_out (fp, facetlist, facets, printall);
else if (format == qh_PRINTqhull)
@@ -3901,8 +3904,8 @@ coordT *qh_readpoints(int *numpoints, int *dimension, boolT *ismalloc) {
if (++tokcount > maxcount)
continue;
if (qh HALFspace) {
- if (qh CDDinput && !coordcount)
- *(coordp++)= -value; /* offset */
+ if (qh CDDinput)
+ *(coordp++)= -value; /* both coefficients and offset */
else
*(coordp++)= value;
}else {
diff --git a/src/io.h b/src/io.h
index df743e9a6cda4cc3d42a6c7fbca46266bcec68c0..351d56b37084a8b86bcf9aa85ea50bee8a93f4e8 100644
--- a/src/io.h
+++ b/src/io.h
@@ -6,7 +6,7 @@
see README, qhull.h and io.c
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#ifndef qhDEFio
diff --git a/src/mem.c b/src/mem.c
index 200195261c6bfa58888ee9a83d774ed3faf0af5f..7293462668428e86e2930154c16ddfed4b7b2270 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -29,7 +29,7 @@
qh-mem.htm and mem.h
global.c (qh_initbuffers) for an example of using mem.c
- copyright (c) 1993-2001 The Geometry Center
+ copyright (c) 1993-2002 The Geometry Center
*/
#include <stdio.h>
diff --git a/src/mem.h b/src/mem.h
index 3066c5e574a08abc574fcb394c66a295e170108f..e9ebd1bb9bca3cda1982c336eac7ec9bb7ff77cf 100644
--- a/src/mem.h
+++ b/src/mem.h
@@ -11,7 +11,7 @@
and
qh_errexit (qhmem_ERRqhull, NULL, NULL) otherwise
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#ifndef qhDEFmem
diff --git a/src/merge.c b/src/merge.c
index d0ea4e1e75d769d96513bb918d6d8342a78afb34..34ecda1865fc44f5b8bb0570ce2b332b2d4967dd 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -20,7 +20,7 @@
merges occur in qh_mergefacet and in qh_mergecycle
vertex->neighbors not set until the first merge occurs
- copyright (c) 1993-2001 The Geometry Center
+ copyright (c) 1993-2002 The Geometry Center
*/
#include "qhull_a.h"
diff --git a/src/merge.h b/src/merge.h
index 704112fa3ca57be1fb448f855934e03f90f1faa6..7fc2afa596725152009bacb46654e1e5f650ec49 100644
--- a/src/merge.h
+++ b/src/merge.h
@@ -6,7 +6,7 @@
see qh-merge.htm and merge.c
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#ifndef qhDEFmerge
diff --git a/src/poly.c b/src/poly.c
index 7f5f6f316120f1c328feddfa18f0045a34f07de8..6319e43d66af51981461dca18582917e2c893b26 100644
--- a/src/poly.c
+++ b/src/poly.c
@@ -9,7 +9,7 @@
infrequent code is in poly2.c
(all but top 50 and their callers 12/3/95)
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include "qhull_a.h"
diff --git a/src/poly.h b/src/poly.h
index af547abee1d9d9d09561d4741896470009cb8316..294ec9527fc169469fdc06985ac9c57868e4bd7e 100644
--- a/src/poly.h
+++ b/src/poly.h
@@ -6,7 +6,7 @@
see qh-poly.htm, qhull.h and poly.c
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#ifndef qhDEFpoly
diff --git a/src/poly2.c b/src/poly2.c
index 6c12445139d25488be3d054ebfc7518ba60abfec..713faab8bed18517a7e4b0ebae00ea24200f3cd1 100644
--- a/src/poly2.c
+++ b/src/poly2.c
@@ -8,7 +8,7 @@
frequently used code is in poly.c
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include "qhull_a.h"
@@ -1621,7 +1621,7 @@ void qh_initbuild( void) {
if (qh TRACElevel || qh IStracing)
fprintf (qh ferr, "\nTrace level %d for %s | %s\n",
qh IStracing ? qh IStracing : qh TRACElevel, qh rbox_command, qh qhull_command);
- fprintf (qh ferr, "Options selected for Qhull %s:\n%s\n", qh_version, qh qhull_options);
+ fprintf (qh ferr, "Options selected for Qhull %s:\n%s\n", qh_VERSION, qh qhull_options);
}
qh_resetlists (False, qh_RESETvisible /*qh visible_list newvertex_list newfacet_list */);
qh facet_next= qh facet_list;
diff --git a/src/qconvex.c b/src/qconvex.c
index 5e2af72564a14d9fd7c02f5f1974e2427467c23b..67b78646e5007a10d2e7a2781b73b8e65c52dbc6 100644
--- a/src/qconvex.c
+++ b/src/qconvex.c
@@ -6,7 +6,7 @@
see unix.c for full interface
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include <stdio.h>
@@ -41,8 +41,8 @@ int isatty (int); /* returns 1 if stdin is a tty
/*-<a href="qh-qhull.htm#TOC"
>-------------------------------</a><a name="prompt">-</a>
- qh_prompt and qh_version
- version and long prompt for qconvex
+ qh_prompt
+ long prompt for qconvex
notes:
restricted version of qhull.c
@@ -51,14 +51,12 @@ int isatty (int); /* returns 1 if stdin is a tty
concise prompt below
*/
-char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
-
/* duplicated in qconvex.htm */
char hidden_options[]=" d v H Qbb Qf Qg Qm Qr Qu Qv Qx Qz TR E V Fp Gt Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 ";
char qh_prompta[]= "\n\
qconvex- compute the convex hull\n\
- http://www.geom.umn.edu/locate/qhull %s\n\
+ http://www.geom.umn.edu/software/qhull %s\n\
\n\
input (stdin):\n\
first lines: dimension and number of points (or vice-versa).\n\
@@ -291,16 +289,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_version);
+ fprintf(stdout, qh_prompt2, qh_VERSION);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_version, qh_DEFAULTbox,
+ fprintf(stdout, qh_prompta, qh_VERSION, qh_DEFAULTbox,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_version);
+ fprintf(stdout, qh_prompt3, qh_VERSION);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/qdelaun.c b/src/qdelaun.c
index eaac01ce7b8af04aa18f03cb117d68a1bbe8d9e2..0e49d9c381eb69033e02fa6d0ca49fd32f8c5082 100644
--- a/src/qdelaun.c
+++ b/src/qdelaun.c
@@ -7,7 +7,7 @@
see unix.c for full interface
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include <stdio.h>
@@ -52,14 +52,12 @@ int isatty (int); /* returns 1 if stdin is a tty
concise prompt below
*/
-char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
-
/* duplicated in qdelau_f.htm and qdelaun.htm */
char hidden_options[]=" d n v H U Qb QB Qc Qf Qg Qi Qm Qr QR Qv Qx TR E V FC Fi Fo Ft Fp FV Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 ";
char qh_prompta[]= "\n\
qdelaunay- compute the Delaunay triangulation\n\
- http://www.geom.umn.edu/locate/qhull %s\n\
+ http://www.geom.umn.edu/software/qhull %s\n\
\n\
input (stdin):\n\
first lines: dimension and number of points (or vice-versa).\n\
@@ -276,16 +274,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_version);
+ fprintf(stdout, qh_prompt2, qh_VERSION);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_version,
+ fprintf(stdout, qh_prompta, qh_VERSION,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_version);
+ fprintf(stdout, qh_prompt3, qh_VERSION);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/qh-geom.htm b/src/qh-geom.htm
index 068cd22a518f2160b886f1600b4e51148e74fb5f..2869f774ac6e4418cbe1811c857b077ff96d708e 100644
--- a/src/qh-geom.htm
+++ b/src/qh-geom.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -54,7 +54,7 @@ computations is determined at initialization. The roundoff error
in halfspace computation is accounted for by computing the
distance from vertices to the halfspace. </p>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <b>Geom</b>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a> •
@@ -257,7 +257,7 @@ outer and inner planes
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -284,8 +284,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-globa.htm b/src/qh-globa.htm
index 5596b61d606565f8b0ae3daf1e875b4b97fca1c9..1ed0e3a713dd94c4edbfc49c888c5225cb67893b 100644
--- a/src/qh-globa.htm
+++ b/src/qh-globa.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -42,7 +42,7 @@ dynamically allocated with malloc(). See
<a href="user.h#QHpointer">QHpointer</a>.
</p>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <b>Global</b> •
@@ -126,7 +126,7 @@ strtod() and strtol() </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -151,8 +151,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-io.htm b/src/qh-io.htm
index f15de044abaf86c8e6b6c0568c7a3a52f8b62d82..42f4518314a9167f0be80c558dd485c5983dbb9e 100644
--- a/src/qh-io.htm
+++ b/src/qh-io.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -53,7 +53,7 @@ the same driver: </p>
qh_skipfacet() is tested. </p>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a> <a name="TOC">•</a>
<a href="qh-globa.htm#TOC">Global</a> • <b>Io</b> •
@@ -262,7 +262,7 @@ vertices as OFF spheres </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -288,8 +288,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-mem.htm b/src/qh-mem.htm
index aeb72ac306789cdd578793e9f2e2a879c88d4642..784395aa7e9ffdb97cbb6124dd3d97617346b30f 100644
--- a/src/qh-mem.htm
+++ b/src/qh-mem.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -40,7 +40,7 @@ from a reserved buffer. </p>
<p>Use 'T5' to trace memory allocations.</p>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a> •
@@ -107,7 +107,7 @@ print out memory statistics </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -133,8 +133,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-merge.htm b/src/qh-merge.htm
index d3771fec0c52efb233102ba04bfbf04b05954eb0..f27e07c29f1983241a6085f6f40e58047e8894ce 100644
--- a/src/qh-merge.htm
+++ b/src/qh-merge.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -98,7 +98,7 @@ structure.This is called a <em>redundant vertex</em>.
</li>
</ul>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -331,7 +331,7 @@ print trace message during post-merging </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -357,8 +357,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-poly.htm b/src/qh-poly.htm
index ce92cd0cde73cec2892377401a6cfa4eb4635286..3a34c94b970ab10888251f78e2323c2ecd0224b4 100644
--- a/src/qh-poly.htm
+++ b/src/qh-poly.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -119,7 +119,7 @@ joggled input, they
may have zero area or flipped orientation.
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -446,7 +446,7 @@ print out facet list for debugging </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -472,8 +472,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-qhull.htm b/src/qh-qhull.htm
index 2149331ffd6482b44a0affaa865b5ebe240347fb..5f20cb61fc6cd63e428ab7a358398df75212baab 100644
--- a/src/qh-qhull.htm
+++ b/src/qh-qhull.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -41,7 +41,7 @@ the n-d beneath-beyond algorithm. See
functions and base data types. The top-level header file, <tt>qhull.h</tt>,
contains prototypes for these functions.</p>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -83,6 +83,7 @@ codes for indicating errors </li>
<li><a href="unix.c#prompt">qh_prompt</a> version and long prompt for Qhull</li>
<li><a href="unix.c#prompt2">qh_prompt2</a> synopsis for Qhull</li>
<li><a href="unix.c#prompt3">qh_prompt3</a> concise prompt for Qhull</li>
+<li><a href="qhull.h#qh_VERSION">qh_VERSION</a> version stamp</li>
</ul>
<h3><a href="qh-qhull.htm#TOC">»</a><a name="qmacro">qhull.h other
@@ -237,7 +238,7 @@ print all fields for a list of facets </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -263,8 +264,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-set.htm b/src/qh-set.htm
index 6bf9200b5e57df207910c85a7caa6fd0bf64a3e9..84b3b16744b8344ad78c9017ea59fc96bc0f6d2f 100644
--- a/src/qh-set.htm
+++ b/src/qh-set.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -60,7 +60,7 @@ If a set is full, appending an element copies the set to
a larger array. </p>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a> •
@@ -271,7 +271,7 @@ temporary) </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -297,8 +297,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-stat.htm b/src/qh-stat.htm
index 732ff569f95df1ea446aed7f20d5b28979e09588..b5b2b2df3ebc4dab5f32ed632de216423681c94a 100644
--- a/src/qh-stat.htm
+++ b/src/qh-stat.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -41,7 +41,7 @@ Statistics
may be turned off in user.h. If so, all but the 'zz'
statistics are ignored.</p>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -128,7 +128,7 @@ standard deviation and average from statistics </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -154,8 +154,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qh-user.htm b/src/qh-user.htm
index 30bb625feaccf9b8a03f0c7c3d009f74ecbf7dbb..195a697300b86e93f6172c73420ade6ae3d8dbf9 100644
--- a/src/qh-user.htm
+++ b/src/qh-user.htm
@@ -9,7 +9,7 @@ content="text/html; charset=iso-8859-1">
<body>
<!-- Navigation links -->
<p><a name="TOP"><b>Up:</b></a> <a
-href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
+href="http://www.geom.umn.edu/software/qhull">Home page</a> for Qhull<br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual</a>: Table of Contents <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
• <a href="../html/qh-quick.htm#options">Options</a>
@@ -35,7 +35,7 @@ href="http://www.geom.umn.edu/locate/qhull">Home page</a> for Qhull<br>
user may want to change. </p>
</blockquote>
-<p><b>Copyright © 1995-2001 The Geometry Center, Minneapolis MN</b></p>
+<p><b>Copyright © 1995-2002 The Geometry Center, Minneapolis MN</b></p>
<hr>
<p><a href="#TOP">»</a> <a href="qh-geom.htm#TOC">Geom</a>
<a name="TOC">•</a> <a href="qh-globa.htm#TOC">Global</a>
@@ -201,7 +201,7 @@ print all fields of all facets </li>
<p><!-- Navigation links --> </p>
<hr>
<p><b>Up:</b>
-<a href="http://www.geom.umn.edu/locate/qhull">Home page for
+<a href="http://www.geom.umn.edu/software/qhull">Home page for
Qhull</a> <br>
<b>Up:</b> <a href="../html/index.htm#TOC">Qhull manual: Table of Contents</a> <br>
<b>Up:</b> <a href="../html/qh-quick.htm#programs">Programs</a>
@@ -227,8 +227,7 @@ Qhull</a> <br>
<p><a href="http://www.geom.umn.edu/"><img
src="../html/qh--geom.gif" align="middle" width="40" height="40"></a><i>The
Geometry Center Home Page </i></p>
-<p>Comments to:
-<a href="http://www.geom.umn.edu/software/qhull/qhull-mail.html">qhull@geom.umn.edu
+<p>Comments to: <a href=mailto:qhull@geom.umn.edu>qhull@geom.umn.edu</a>
</a><br>
Created: May 2, 1997 --- <!-- hhmts start --> Last modified: see top <!-- hhmts end --> </p>
</body>
diff --git a/src/qhalf.c b/src/qhalf.c
index 56c34a600b0cd9b7de0b5ecb910286943d00220f..a2b3875dd7fdb64170c954e7ae7e4642fb1887b1 100644
--- a/src/qhalf.c
+++ b/src/qhalf.c
@@ -6,7 +6,7 @@
see unix.c for full interface
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include <stdio.h>
@@ -51,14 +51,12 @@ int isatty (int); /* returns 1 if stdin is a tty
concise prompt below
*/
-char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
-
/* duplicated in qhalf.htm */
char hidden_options[]=" d n v Qbb QbB Qf Qg Qm Qr QR Qv Qx Qz TR E V Fa FA FC FD FS Ft FV Gt Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 ";
char qh_prompta[]= "\n\
qhalf- compute the intersection of halfspaces about a point\n\
- http://www.geom.umn.edu/locate/qhull %s\n\
+ http://www.geom.umn.edu/software/qhull %s\n\
\n\
input (stdin):\n\
optional interior point: dimension, 1, coordinates\n\
@@ -273,16 +271,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_version);
+ fprintf(stdout, qh_prompt2, qh_VERSION);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_version,
+ fprintf(stdout, qh_prompta, qh_VERSION,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_version);
+ fprintf(stdout, qh_prompt3, qh_VERSION);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/qhull.c b/src/qhull.c
index eba31f04ce4799df883d9d4ca80da6fa3ea6c817..dc835bb4f28a2a7b89ddcf30b290046c9b692636 100644
--- a/src/qhull.c
+++ b/src/qhull.c
@@ -10,7 +10,7 @@
see qhull_a.h for internal functions
- copyright (c) 1993-2001 The Geometry Center
+ copyright (c) 1993-2002 The Geometry Center
*/
#include "qhull_a.h"
diff --git a/src/qhull.h b/src/qhull.h
index 54eb22f9f3fb84b13014682e3d8ddf2b209166a6..896ec1e9c18597e5fd77fa0f08f8348189658f7c 100644
--- a/src/qhull.h
+++ b/src/qhull.h
@@ -6,23 +6,21 @@
see qh-qhull.htm, qhull_a.h
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
- defines qh_qh, global data structure for qhull.
-
NOTE: access to qh_qh is via the 'qh' macro. This allows
qh_qh to be either a pointer or a structure. An example
of using qh is "qh DROPdim" which accesses the DROPdim
field of qh_qh. Similarly, access to qh_qhstat is via
the 'qhstat' macro.
-
+
includes function prototypes for qhull.c, geom.c, global.c, io.c, user.c
use mem.h for mem.c
use qset.h for qset.c
-
+
see unix.c for an example of using qhull.h
-
+
recompile qhull if you change this file
*/
@@ -41,11 +39,11 @@
#include <Desk.h>
#endif
-#ifndef __STDC__
+#ifndef __STDC__
#ifndef __cplusplus
#if !_MSC_VER
#error Neither __STDC__ nor __cplusplus is defined. Please use strict ANSI C or C++ to compile
-#error Qhull. You may need to turn off compiler extensions in your project configuration. If
+#error Qhull. You may need to turn off compiler extensions in your project configuration. If
#error your compiler is a standard C compiler, you can delete this warning from qhull.h
#endif
#endif
@@ -55,9 +53,29 @@
/*============ constants and basic types ====================*/
+/*-<a href="qh-qhull.htm#TOC"
+ >--------------------------------</a><a name="qh_VERSION">-</a>
+
+ qh_VERSION
+ version string by year and date
+
+ the revision increases on code changes only
+
+ notes:
+ change date: Changes.txt, Announce.txt, README.txt, qhull.man
+ qhull-news.html, Eudora signatures,
+ change version: README.txt, qhull.html, file_id.diz, Makefile
+ change year: Copying.txt
+ check download size
+ recompile user_eg.c, rbox.c, qhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c
+ make copy of qhull-news.html as qh-news.htm
+*/
+
+#define qh_VERSION "2002.1 2002/8/20"
+
/*-<a href="qh-geom.htm#TOC"
>--------------------------------</a><a name="coordT">-</a>
-
+
coordT
coordinates and coefficients are stored as realT (i.e., double)
@@ -67,9 +85,10 @@
Also C compilers may do expressions in double anyway.
*/
#define coordT realT
+
/*-<a href="qh-geom.htm#TOC"
>--------------------------------</a><a name="pointT">-</a>
-
+
pointT
a point is an array of DIM3 coordinates
*/
@@ -85,7 +104,7 @@
/*-<a href="qh-qhull.htm#TOC"
>--------------------------------</a><a name="boolT">-</a>
-
+
boolT
boolean value, either True or False
@@ -104,7 +123,7 @@
/*-<a href="qh-qhull.htm#TOC"
>--------------------------------</a><a name="CENTERtype">-</a>
-
+
qh_CENTER
to distinguish facet->center
*/
@@ -116,7 +135,7 @@ qh_CENTER;
/*-<a href="qh-qhull.htm#TOC"
>--------------------------------</a><a name="qh_PRINT">-</a>
-
+
qh_PRINT
output formats for printing (qh.PRINTout).
'Fa' 'FV' 'Fc' 'FC'
@@ -141,7 +160,7 @@ typedef enum {qh_PRINTnone= 0,
/*-<a href="qh-qhull.htm#TOC"
>--------------------------------</a><a name="qh_ALL">-</a>
-
+
qh_ALL
argument flag for selecting everything
*/
@@ -181,12 +200,12 @@ typedef struct setT setT; /* defined in qset.h */
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="facetT">-</a>
-
+
facetT
defines a facet
notes:
- qhull() generates the hull as a list of facets.
+ qhull() generates the hull as a list of facets.
topological information:
f.previous,next doubly-linked list of facets
@@ -194,14 +213,14 @@ typedef struct setT setT; /* defined in qset.h */
f.ridges set of ridges
f.neighbors set of neighbors
f.toporient True if facet has top-orientation (else bottom)
-
+
geometric information:
f.offset,normal hyperplane equation
f.maxoutside offset to outer plane -- all points inside
f.center centrum for testing convexity
f.simplicial True if facet is simplicial
f.flipped True if facet does not include qh.interior_point
-
+
for constructing hull:
f.visible True if facet on list of visible facets (will be deleted)
f.newfacet True if facet on list of newly created facets
@@ -212,7 +231,7 @@ typedef struct setT setT; /* defined in qset.h */
f.visitid marks visited facets during a loop
f.replace replacement facet for to-be-deleted, visible facets
f.samecycle,newcycle cycle of facets for merging into horizon facet
-
+
see below for other flags and fields
*/
struct facetT {
@@ -226,7 +245,7 @@ struct facetT {
Actual outer plane is +DISTround and
computed outer plane is +2*DISTround */
#endif
- coordT offset; /* exact offset of hyperplane from origin */
+ coordT offset; /* exact offset of hyperplane from origin */
coordT *normal; /* normal of hyperplane, hull_dim coefficients */
/* if tricoplanar, shared with a neighbor */
union { /* in order of testing */
@@ -248,7 +267,7 @@ struct facetT {
if simplicial, 1st vertex was apex/furthest */
setT *ridges; /* explicit ridges for nonsimplicial facets.
for simplicial facets, neighbors defines ridge */
- setT *neighbors; /* neighbors of the facet. If simplicial, the kth
+ setT *neighbors; /* neighbors of the facet. If simplicial, the kth
neighbor is opposite the kth vertex, and the first
neighbor is the horizon facet for the first vertex*/
setT *outsideset; /* set of points outside this facet
@@ -305,7 +324,7 @@ struct facetT {
ridgeT
defines a ridge
-
+
notes:
a ridge is DIM3-1 simplex between two neighboring facets. If the
facets are non-simplicial, there may be more than one ridge between
@@ -315,10 +334,10 @@ struct facetT {
topological information:
vertices a set of vertices
top,bottom neighboring facets with orientation
-
+
geometric information:
tested True if ridge is clearly convex
- nonconvex True if ridge is non-convex
+ nonconvex True if ridge is non-convex
*/
struct ridgeT {
setT *vertices; /* vertices belonging to this ridge, inverse sorted by ID
@@ -328,20 +347,20 @@ struct ridgeT {
unsigned id:24; /* unique identifier, =>room for 8 flags */
flagT seen:1; /* used to perform operations only once */
flagT tested:1; /* True when ridge is tested for convexity */
- flagT nonconvex:1; /* True if getmergeset detected a non-convex neighbor
+ flagT nonconvex:1; /* True if getmergeset detected a non-convex neighbor
only one ridge between neighbors may have nonconvex */
};
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="vertexT">-</a>
-
+
vertexT
defines a vertex
-
+
topological information:
next,previous doubly-linked list of all vertices
neighbors set of adjacent facets (only if qh.VERTEXneighbors)
-
+
geometric information:
point array of DIM3 coordinates
*/
@@ -362,11 +381,9 @@ struct vertexT {
/*======= -global variables -qh ============================*/
-extern char qh_version[]; /* defined in unix.c etc. */
-
/*-<a href="qh-globa.htm#TOC"
>--------------------------------</a><a name="qh">-</a>
-
+
qh
all global variables for qhull are in qh, qhmem, and qhstat
@@ -374,7 +391,7 @@ extern char qh_version[]; /* defined in unix.c etc. */
qhmem is defined in mem.h and qhstat is defined in stat.h
access to qh_qh is via the "qh" macro. See qh_QHpointer in user.h
*/
-typedef struct qhT qhT;
+typedef struct qhT qhT;
#if qh_QHpointer
#define qh qh_qh->
extern qhT *qh_qh; /* allocated in global.c */
@@ -390,7 +407,7 @@ struct qhT {
qh constants
configuration flags and constants for Qhull
-
+
notes:
The user configures Qhull by defining flags. They are
copied into qh by qh_setflags(). qh-quick.htm#options defines the flags.
@@ -400,7 +417,7 @@ struct qhT {
boolT APPROXhull; /* true 'Wn' if MINoutside set */
realT MINoutside; /* 'Wn' min. distance for an outside point */
boolT ATinfinity; /* true 'Qz' if point num_points-1 is "at-infinity"
- for improving precision in Delaunay triangulations */
+ for improving precision in Delaunay triangulations */
boolT AVOIDold; /* true 'Q4' if avoid old->new merges */
boolT BESToutside; /* true 'Qf' if partition points into best outsideset */
boolT CDDinput; /* true 'Pc' if input uses CDD format (1.0/offset first) */
@@ -414,7 +431,7 @@ struct qhT {
boolT FORCEoutput; /* true 'Po' if forcing output despite degeneracies */
int GOODpoint; /* 1+n for 'QGn', good facet if visible/not(-) from point n*/
pointT *GOODpointp; /* the actual point */
- boolT GOODthreshold; /* true if qh lower_threshold/upper_threshold defined
+ boolT GOODthreshold; /* true if qh lower_threshold/upper_threshold defined
false if qh SPLITthreshold */
int GOODvertex; /* 1+n, good facet if vertex for point n */
pointT *GOODvertexp; /* the actual point */
@@ -422,7 +439,7 @@ struct qhT {
int IStracing; /* trace execution, 0=none, 1=least, 4=most, -1=events */
int KEEParea; /* 'PAn' number of largest facets to keep */
boolT KEEPcoplanar; /* true 'Qc' if keeping nearest facet for coplanar points */
- boolT KEEPinside; /* true 'Qi' if keeping nearest facet for inside points
+ boolT KEEPinside; /* true 'Qi' if keeping nearest facet for inside points
set automatically if 'd Qc' */
int KEEPmerge; /* 'PMn' number of facets to keep with most merges */
realT KEEPminArea; /* 'PFn' minimum facet area to keep */
@@ -482,8 +499,9 @@ struct qhT {
used only for printing (not for qh ONLYgood) */
int STOPcone; /* 'TCn' 1+n for stopping after cone for point n*/
/* also used by qh_build_withresart for err exit*/
- int STOPpoint; /* 'TVn' 'TV-n' 1+n for stopping after/before(-)
+ int STOPpoint; /* 'TVn' 'TV-n' 1+n for stopping after/before(-)
adding point n */
+ int TESTpoints; /* 'QTn' num of test points after qh.num_points. Test points always coplanar. */
boolT TESTvneighbors; /* true 'Qv' if test vertex neighbors at end */
int TRACElevel; /* 'Tn' conditional IStracing level */
int TRACElastrun; /* qh.TRACElevel applies to last qh.RERUN */
@@ -523,7 +541,7 @@ struct qhT {
if Delaunay, default is 0.0 for upper envelope */
realT *lower_threshold; /* don't print if facet->normal[k] <=lower_threshold[k] */
realT *upper_bound; /* scale point[k] to new upper bound */
- realT *lower_bound; /* scale point[k] to new lower bound
+ realT *lower_bound; /* scale point[k] to new lower bound
project if both upper_ and lower_bound == 0 */
/*-<a href="qh-globa.htm#TOC"
@@ -531,7 +549,7 @@ struct qhT {
qh precision constants
precision constants for Qhull
-
+
notes:
qh_detroundoff() computes the maximum roundoff error for distance
and other computations. It also sets default values for the
@@ -554,7 +572,7 @@ struct qhT {
realT *NEARzero; /* hull_dim array for near zero in gausselim */
realT NEARinside; /* keep points for qh_check_maxout if close to facet */
realT ONEmerge; /* max distance for merging simplicial facets */
- realT outside_err; /* application's epsilon for coplanar points
+ realT outside_err; /* application's epsilon for coplanar points
qh_check_bestdist() qh_check_points() reports error if point outside */
realT WIDEfacet; /* size of wide facet for skipping ridge in
area computation and locking centrum */
@@ -591,7 +609,7 @@ struct qhT {
facetT *facet_list; /* first facet */
facetT *facet_tail; /* end of facet_list (dummy facet) */
facetT *facet_next; /* next facet for buildhull()
- previous facets do not have outside sets
+ previous facets do not have outside sets
NARROWhull: previous facets may have coplanar outside sets for qh_outcoplanar */
facetT *newfacet_list; /* list of new facets to end of facet_list */
facetT *visible_list; /* list of visible facets preceeding newfacet_list,
@@ -608,7 +626,7 @@ struct qhT {
int num_facets; /* number of facets in facet_list
includes visble faces (num_visible) */
int num_vertices; /* number of vertices in facet_list */
- int num_outside; /* number of points in outsidesets (for tracing and RANDOMoutside)
+ int num_outside; /* number of points in outsidesets (for tracing and RANDOMoutside)
includes coplanar outsideset points for NARROWhull/qh_outcoplanar() */
int num_good; /* number of good facets (after findgood_all) */
unsigned facet_id; /* ID of next, new facet from newfacet() */
@@ -640,7 +658,7 @@ struct qhT {
before roundoff, due to a merge */
realT min_vertex; /* minimum distance (<0) from vertex to a facet,
before roundoff, due to a merge
- if qh.JOGGLEmax, qh_makenewplanes sets it
+ if qh.JOGGLEmax, qh_makenewplanes sets it
recomputed if qh.DOcheckmax, default -qh.DISTround */
boolT NEWfacets; /* true while visible facets invalid due to new or merge
from makecone/attachnewfacets to deletevisible */
@@ -662,22 +680,22 @@ struct qhT {
/*-<a href="qh-globa.htm#TOC"
>--------------------------------</a><a name="qh-set">-</a>
-
+
qh global sets
defines sets for merging, initial simplex, hashing, extra input points,
and deleted vertices
*/
setT *facet_mergeset; /* temporary set of merges to be done */
setT *degen_mergeset; /* temporary set of degenerate and redundant merges */
- setT *hash_table; /* hash table for matching ridges in qh_matchfacets
+ setT *hash_table; /* hash table for matching ridges in qh_matchfacets
size is setsize() */
setT *other_points; /* additional points (first is qh interior_point) */
- setT *del_vertices; /* vertices to partition and delete with visible
+ setT *del_vertices; /* vertices to partition and delete with visible
facets. Have deleted set for checkfacet */
/*-<a href="qh-globa.htm#TOC"
>--------------------------------</a><a name="qh-buf">-</a>
-
+
qh global buffers
defines buffers for maxtrix operations, input, and error messages
*/
@@ -690,10 +708,10 @@ struct qhT {
/*-<a href="qh-globa.htm#TOC"
>--------------------------------</a><a name="qh-static">-</a>
-
+
qh static variables
defines static variables for individual functions
-
+
notes:
do not use 'static' within a function. Multiple instances of qhull
may exist.
@@ -718,7 +736,7 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="otherfacet_">-</a>
-
+
otherfacet_(ridge, facet)
return neighboring facet for a ridge in facet
*/
@@ -727,7 +745,7 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="getid_">-</a>
-
+
getid_(p)
return ID for facet, ridge, or vertex
return MAXINT if NULL (-1 causes type conversion error )
@@ -738,22 +756,22 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FORALLfacets">-</a>
-
+
FORALLfacets { ... }
assign 'facet' to each facet in qh.facet_list
-
+
notes:
uses 'facetT *facet;'
assumes last facet is a sentinel
see:
- FORALLfacet_( facetlist )
+ FORALLfacet_( facetlist )
*/
#define FORALLfacets for (facet=qh facet_list;facet && facet->next;facet=facet->next)
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FORALLpoints">-</a>
-
+
FORALLpoints { ... }
assign 'point' to each point in qh.first_point, qh.num_points
@@ -764,7 +782,7 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FORALLpoint_">-</a>
-
+
FORALLpoint_( points, num) { ... }
assign 'point' to each point in points array of num points
@@ -776,10 +794,10 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FORALLvertices">-</a>
-
+
FORALLvertices { ... }
assign 'vertex' to each vertex in qh.vertex_list
-
+
declare:
vertexT *vertex;
@@ -790,10 +808,10 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHfacet_">-</a>
-
+
FOREACHfacet_( facets ) { ... }
assign 'facet' to each facet in facets
-
+
declare:
facetT *facet, **facetp;
@@ -804,13 +822,13 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHneighbor_">-</a>
-
+
FOREACHneighbor_( facet ) { ... }
assign 'neighbor' to each neighbor in facet->neighbors
-
+
FOREACHneighbor_( vertex ) { ... }
assign 'neighbor' to each neighbor in vertex->neighbors
-
+
declare:
facetT *neighbor, **neighborp;
@@ -821,10 +839,10 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHpoint_">-</a>
-
+
FOREACHpoint_( points ) { ... }
assign 'point' to each point in points set
-
+
declare:
pointT *point, **pointp;
@@ -835,10 +853,10 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHridge_">-</a>
-
+
FOREACHridge_( ridges ) { ... }
assign 'ridge' to each ridge in ridges set
-
+
declare:
ridgeT *ridge, **ridgep;
@@ -849,10 +867,10 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHvertex_">-</a>
-
+
FOREACHvertex_( vertices ) { ... }
assign 'vertex' to each vertex in vertices set
-
+
declare:
vertexT *vertex, **vertexp;
@@ -863,10 +881,10 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHfacet_i_">-</a>
-
+
FOREACHfacet_i_( facets ) { ... }
assign 'facet' and 'facet_i' for each facet in facets set
-
+
declare:
facetT *facet;
int facet_n, facet_i;
@@ -878,13 +896,13 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHneighbor_i_">-</a>
-
+
FOREACHneighbor_i_( facet ) { ... }
assign 'neighbor' and 'neighbor_i' for each neighbor in facet->neighbors
FOREACHneighbor_i_( vertex ) { ... }
assign 'neighbor' and 'neighbor_i' for each neighbor in vertex->neighbors
-
+
declare:
facetT *neighbor;
int neighbor_n, neighbor_i;
@@ -896,10 +914,10 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHpoint_i_">-</a>
-
+
FOREACHpoint_i_( points ) { ... }
assign 'point' and 'point_i' for each point in points set
-
+
declare:
pointT *point;
int point_n, point_i;
@@ -911,10 +929,10 @@ struct qhT {
/*-<a href="qh-poly.htm#TOC"
>--------------------------------</a><a name="FOREACHridge_i_">-</a>
-
+
FOREACHridge_i_( ridges ) { ... }
assign 'ridge' and 'ridge_i' for each ridge in ridges set
-
+
declare:
ridgeT *ridge;
int ridge_n, ridge_i;
@@ -949,14 +967,14 @@ void qh_printsummary(FILE *fp);
void qh_errexit(int exitcode, facetT *facet, ridgeT *ridge);
void qh_errprint(char* string, facetT *atfacet, facetT *otherfacet, ridgeT *atridge, vertexT *atvertex);
-int qh_new_qhull (int dim, int numpoints, coordT *points, boolT ismalloc,
+int qh_new_qhull (int dim, int numpoints, coordT *points, boolT ismalloc,
char *qhull_cmd, FILE *outfile, FILE *errfile);
void qh_printfacetlist(facetT *facetlist, setT *facets, boolT printall);
void qh_user_memsizes (void);
/***** -geom.c/geom2.c prototypes (duplicated from geom.h) ****************/
-facetT *qh_findbest (pointT *point, facetT *startfacet,
+facetT *qh_findbest (pointT *point, facetT *startfacet,
boolT bestoutside, boolT newfacets, boolT noupper,
realT *dist, boolT *isoutside, int *numpart);
facetT *qh_findbestnew (pointT *point, facetT *startfacet,
diff --git a/src/qhull_a.h b/src/qhull_a.h
index eef637e131635337e711c2af987617e44b9ffd06..d4e69b071bed6099ab4d4ce04a77d61b12303645 100644
--- a/src/qhull_a.h
+++ b/src/qhull_a.h
@@ -12,7 +12,7 @@
defines internal functions for qhull.c global.c
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
Notes: grep for ((" and (" to catch fprintf("lkasdjf");
full parens around (x?y:z)
diff --git a/src/qhull_interface.cpp b/src/qhull_interface.cpp
index 759eb87226d7584c07974a8ac4ba142444a3a2a9..6ecc640e82b8718a64ccdcb5b3ba40ed795cfeaa 100644
--- a/src/qhull_interface.cpp
+++ b/src/qhull_interface.cpp
@@ -37,7 +37,6 @@ extern "C"
#include <qhull/poly.h>
#include <qhull/io.h>
#include <qhull/stat.h>
-char qh_version[] = "qad 2000/8/1"; /* used for error messages */
#if defined(__cplusplus)
}
#endif
diff --git a/src/qset.c b/src/qset.c
index 77d168bb5f80a7dc7c6119ec86b2a1a0b871542e..9e78464c07e4fda7aa6baa5a6f9cbb27bee5d8ce 100644
--- a/src/qset.c
+++ b/src/qset.c
@@ -6,7 +6,7 @@
see qh-set.htm and qset.h
- copyright (c) 1993-2001 The Geometry Center
+ copyright (c) 1993-2002 The Geometry Center
*/
#include <stdio.h>
diff --git a/src/qset.h b/src/qset.h
index 88a0e0c876958d8acb83000abc2aa36980f04b8a..6c0ff758de4c7500c9fe93eabaac8915c6593f38 100644
--- a/src/qset.h
+++ b/src/qset.h
@@ -16,7 +16,7 @@
- every set is NULL terminated
- sets may be sorted or unsorted, the caller must distinguish this
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#ifndef qhDEFset
diff --git a/src/qvoronoi.c b/src/qvoronoi.c
index 05706aad67203e3a0489f89c06aaa2645cf2a155..ebeb7367b87fcf53c2e1b6bc11316e8af4851913 100644
--- a/src/qvoronoi.c
+++ b/src/qvoronoi.c
@@ -7,7 +7,7 @@
see unix.c for full interface
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include <stdio.h>
@@ -52,14 +52,12 @@ int isatty (int); /* returns 1 if stdin is a tty
concise prompt below
*/
-char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
-
/* duplicated in qvoron_f.htm and qvoronoi.htm */
char hidden_options[]=" d n m v H U Qb QB Qc Qf Qg Qi Qm Qr QR Qv Qx TR E V Fa FA FC Fp FS Ft FV Pv Gt Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 ";
char qh_prompta[]= "\n\
qvoronoi- compute the Voronoi diagram\n\
- http://www.geom.umn.edu/locate/qhull %s\n\
+ http://www.geom.umn.edu/software/qhull %s\n\
\n\
input (stdin):\n\
first lines: dimension and number of points (or vice-versa).\n\
@@ -271,16 +269,16 @@ int main(int argc, char *argv[]) {
#endif
if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_version);
+ fprintf(stdout, qh_prompt2, qh_VERSION);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_version,
+ fprintf(stdout, qh_prompta, qh_VERSION,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_version);
+ fprintf(stdout, qh_prompt3, qh_VERSION);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
diff --git a/src/stat.c b/src/stat.c
index 5b4bcf7bc65c52a0a71e2263bf87c17dd20c21ff..e8d21fe69dba669c6e7b75025862df1eb20f396d 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -6,7 +6,7 @@
see qh-stat.htm and stat.h
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include "qhull_a.h"
@@ -572,7 +572,7 @@ void qh_printstatistics (FILE *fp, char *string) {
fprintf (fp, "\n\
%s\n\
qhull invoked by: %s | %s\n%s with options:\n%s\n", string, qh rbox_command,
- qh qhull_command, qh_version, qh qhull_options);
+ qh qhull_command, qh_VERSION, qh qhull_options);
fprintf (fp, "\nprecision constants:\n\
%6.2g max. abs. coordinate in the (transformed) input ('Qbd:n')\n\
%6.2g max. roundoff error for distance computation ('En')\n\
diff --git a/src/stat.h b/src/stat.h
index 992011e13f4eff31186a5eafb3ac958af59fe57e..1dae54ed21d77375eaf5560fb2e2dd1fe2a27097 100644
--- a/src/stat.h
+++ b/src/stat.h
@@ -6,7 +6,7 @@
see qh-stat.htm and stat.c
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
recompile qhull if you change this file
diff --git a/src/unix.c b/src/unix.c
index 654e213dbf696dd6b7cce7e985b0e27630ccca5a..5ec5feab16c87b413fcc33de5540868dbd0a6ba7 100644
--- a/src/unix.c
+++ b/src/unix.c
@@ -7,7 +7,7 @@
see qh-qhull.htm
- copyright (c) 1993-2001, The Geometry Center
+ copyright (c) 1993-2002, The Geometry Center
*/
#include <stdio.h>
@@ -39,20 +39,6 @@ int isatty (int); /* returns 1 if stdin is a tty
if "Undefined symbol" this can be deleted along with call in main() */
#endif
-/*========= version =======================
-
- notes:
- change date: Changes.txt, Announce.txt, README.txt, qhull.man
- qhull-news.html, Eudora signatures,
- change version: README.txt, qhull.html, file_id.diz, Makefile
- qconvex.c qdelaun.c qhalf.c qvoronoi.c
- change year: Copying.txt
- check download size
- recompile user_eg.c, rbox.c, qhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c
-*/
-
-char qh_version[]= "version 3.1 2001/10/04";
-
/*-<a href="qh-qhull.htm#TOC"
>-------------------------------</a><a name="prompt">-</a>
@@ -64,7 +50,7 @@ char qh_version[]= "version 3.1 2001/10/04";
*/
char qh_prompta[]= "\n\
qhull- compute convex hulls and related structures.\n\
- http://www.geom.umn.edu/locate/qhull %s\n\
+ http://www.geom.umn.edu/software/qhull %s\n\
\n\
input (stdin):\n\
first lines: dimension and number of points (or vice-versa).\n\
@@ -226,8 +212,8 @@ Print options:\n\
>-------------------------------</a><a name="prompt2">-</a>
qh_prompt2
- synopsis for qhull
-*/
+ synopsis for qhull
+*/
char qh_prompt2[]= "\n\
qhull- compute convex hulls and related structures. %s\n\
input (stdin): dimension, n, point coordinates\n\
@@ -276,8 +262,8 @@ examples:\n\
>-------------------------------</a><a name="prompt3">-</a>
qh_prompt3
- concise prompt for qhull
-*/
+ concise prompt for qhull
+*/
char qh_prompt3[]= "\n\
Qhull %s.\n\
Except for 'F.' and 'PG', upper-case options take an argument.\n\
@@ -318,10 +304,10 @@ Except for 'F.' and 'PG', upper-case options take an argument.\n\
/*-<a href="qh-qhull.htm#TOC"
>-------------------------------</a><a name="main">-</a>
-
+
main( argc, argv )
processes the command line, calls qhull() to do the work, and exits
-
+
design:
initializes data structures
reads points
@@ -344,22 +330,22 @@ int main(int argc, char *argv[]) {
SIOUXSettings.rows= 40;
if (setvbuf (stdin, inBuf, _IOFBF, sizeof(inBuf)) < 0 /* w/o, SIOUX I/O is slow*/
|| setvbuf (stdout, outBuf, _IOFBF, sizeof(outBuf)) < 0
- || (stdout != stderr && setvbuf (stderr, errBuf, _IOFBF, sizeof(errBuf)) < 0))
+ || (stdout != stderr && setvbuf (stderr, errBuf, _IOFBF, sizeof(errBuf)) < 0))
fprintf (stderr, "qhull internal warning (main): could not change stdio to fully buffered.\n");
argc= ccommand(&argv);
#endif
- if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_version);
+ if ((argc == 1) && isatty( 0 /*stdin*/)) {
+ fprintf(stdout, qh_prompt2, qh_VERSION);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_version, qh_DEFAULTbox,
+ fprintf(stdout, qh_prompta, qh_VERSION, qh_DEFAULTbox,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
if (argc >1 && *argv[1] == '.' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompt3, qh_version);
+ fprintf(stdout, qh_prompt3, qh_VERSION);
exit(qh_ERRnone);
}
qh_init_A (stdin, stdout, stderr, argc, argv); /* sets qh qhull_command */
@@ -381,7 +367,7 @@ int main(int argc, char *argv[]) {
#else
qh_freeqhull( False);
qh_memfreeshort (&curlong, &totlong);
- if (curlong || totlong)
+ if (curlong || totlong)
fprintf (stderr, "qhull internal warning (main): did not free %d bytes of long memory (%d pieces)\n",
totlong, curlong);
#endif
diff --git a/src/user.c b/src/user.c
index b507559a91aba991e19b777d3f8d6e869d3d55a2..94b31aaf99f7533a9b2f2142f4486f5d0a74dc9d 100644
--- a/src/user.c
+++ b/src/user.c
@@ -46,7 +46,6 @@
qh_call_qhull( void )
template for calling qhull from inside your program
remove #if 0, #endif to compile
- define: char qh_version[]= "...";
returns:
exit code (see qh_ERR... in qhull.h)
@@ -60,8 +59,6 @@
*/
#if 0
-char qh_version[] = "user_eg 98/7/25"; /* used for error messages */
-
{
int dim; /* dimension of points */
int numpoints; /* number of points */
@@ -200,7 +197,7 @@ void qh_errexit(int exitcode, facetT *facet, ridgeT *ridge) {
qh hulltime= qh_CPUclock - qh hulltime;
qh_errprint("ERRONEOUS", facet, NULL, ridge, NULL);
fprintf (qh ferr, "\nWhile executing: %s | %s\n", qh rbox_command, qh qhull_command);
- fprintf(qh ferr, "Options selected for Qhull %s:\n%s\n", qh_version, qh qhull_options);
+ fprintf(qh ferr, "Options selected for Qhull %s:\n%s\n", qh_VERSION, qh qhull_options);
if (qh furthest_id >= 0) {
fprintf(qh ferr, "Last point added to hull was p%d.", qh furthest_id);
if (zzval_(Ztotmerge))
diff --git a/src/user_eg.c b/src/user_eg.c
index 2e4200e86099a0c3ac2760ea642d06f20ff4e298..97e4aa7a89aba23b2554408d228a2ee6b0d8a33f 100644
--- a/src/user_eg.c
+++ b/src/user_eg.c
@@ -47,8 +47,6 @@
#include "qhull_a.h"
-char qh_version[] = "user_eg 3.1 2001/10/04"; /* used for error messages */
-
/*-------------------------------------------------
-internal function prototypes
*/
diff --git a/src/user_eg2.c b/src/user_eg2.c
index 3543358fd17840967096f1afbd6adb3314133007..1eb42ccfe8add0ada8063d635ac3aa3013592d14 100644
--- a/src/user_eg2.c
+++ b/src/user_eg2.c
@@ -51,8 +51,6 @@
#include "qhull_a.h"
-char qh_version[] = "user_eg2 3.1 2001/10/04"; /* used for error messages */
-
/*-------------------------------------------------
-internal function prototypes
*/