octave: src/DLD-FUNCTIONS/convhulln.cc annotate

annotate src/DLD-FUNCTIONS/convhulln.cc @ 14310:decea31ea010 stable

Fix qhull tests. * convhulln.cc: Matlab uses "Qt" for num dimensions < 5 and "Qt Qx" otherwise. Test modified to verify "Qt" is the default option for nd = 3, and to assert the correct result.

author	Ben Abbott <bpabbott@mac.com>
date	Mon, 30 Jan 2012 08:22:32 -0500
parents	824e5d362aba
children	7a7ce92cff56 3e4350f09a55

rev	line source
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	1 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 14043 diff changeset	3 Copyright (C) 2000-2012 Kai Habel
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	4
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	5 This file is part of Octave.
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	6
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6959 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6959 diff changeset	10 option) any later version.
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	11
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	15 for more details.
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	16
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6959 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6959 diff changeset	19 <http://www.gnu.org/licenses/>.
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	20
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	21 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	22
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	23 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	24 29. July 2000 - Kai Habel: first release
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	25 2002-04-22 Paul Kienzle
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	26 * Use warning(...) function rather than writing to cerr
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	27 2006-05-01 Tom Holroyd
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	28 * add support for consistent winding in all dimensions; output is
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	29 * guaranteed to be simplicial.
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	30 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	31
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	32 #ifdef HAVE_CONFIG_H
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	33 #include <config.h>
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	34 #endif
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	35
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	36 #include <sstream>
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	37
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	38 #include "Cell.h"
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	39 #include "defun-dld.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	40 #include "error.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	41 #include "oct-obj.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	42 #include "parse.h"
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	43
14043 f913363318e0 handle new names and locations of qhull include files (bug #33712) John W. Eaton <jwe@octave.org> parents: 13879 diff changeset	44 #if defined (HAVE_QHULL)
f913363318e0 handle new names and locations of qhull include files (bug #33712) John W. Eaton <jwe@octave.org> parents: 13879 diff changeset	45 # include "oct-qhull.h"
f913363318e0 handle new names and locations of qhull include files (bug #33712) John W. Eaton <jwe@octave.org> parents: 13879 diff changeset	46 # if defined (NEED_QHULL_VERSION)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	47 char qh_version[] = "convhulln.oct 2007-07-24";
10474 b2143d97c002 Neither include qhull/qhull_a.h nor run tests unless we HAVE_QHULL. David Grundberg <davidg@cs.umu.se> parents: 10257 diff changeset	48 # endif
14043 f913363318e0 handle new names and locations of qhull include files (bug #33712) John W. Eaton <jwe@octave.org> parents: 13879 diff changeset	49 #endif
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	50
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	51 DEFUN_DLD (convhulln, args, nargout,
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	52 "-- texinfo --\n\
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	53 @deftypefn {Loadable Function} {@var{h} =} convhulln (@var{pts})\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	54 @deftypefnx {Loadable Function} {@var{h} =} convhulln (@var{pts}, @var{options})\n\
8788 d0bc587fce55 doc fix John W. Eaton <jwe@octave.org> parents: 8786 diff changeset	55 @deftypefnx {Loadable Function} {[@var{h}, @var{v}] =} convhulln (@dots{})\n\
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	56 Compute the convex hull of the set of points @var{pts} which is a matrix\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	57 of size [n, dim] containing n points in a space of dimension dim.\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	58 The hull @var{h} is an index vector into the set of points and specifies\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	59 which points form the enclosing hull.\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	60 \n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	61 An optional second argument, which must be a string or cell array of strings,\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	62 contains options passed to the underlying qhull command.\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	63 See the documentation for the Qhull library for details\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	64 @url{http://www.qhull.org/html/qh-quick.htm#options}.\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	65 The default options depend on the dimension of the input:\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	66 \n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	67 @itemize\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	68 @item 2D, 3D, 4D: @var{options} = @code{@{\"Qt\"@}}\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	69 \n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	70 @item 5D and higher: @var{options} = @code{@{\"Qt\", \"Qx\"@}}\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	71 @end itemize\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	72 \n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	73 If @var{options} is not present or @code{[]} then the default arguments are\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	74 used. Otherwise, @var{options} replaces the default argument list.\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	75 To append user options to the defaults it is necessary to repeat the\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	76 default arguments in @var{options}. Use a null string to pass no arguments.\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	77 \n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	78 If the second output @var{v} is requested the volume of the enclosing\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	79 convex hull is calculated.\n\n\
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	80 @seealso{convhull, delaunayn, voronoin}\n\
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	81 @end deftypefn")
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	82 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	83 octave_value_list retval;
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6882 diff changeset	84
14043 f913363318e0 handle new names and locations of qhull include files (bug #33712) John W. Eaton <jwe@octave.org> parents: 13879 diff changeset	85 #if defined (HAVE_QHULL)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	86
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6882 diff changeset	87 int nargin = args.length ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	88 if (nargin < 1 \|\| nargin > 2)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	89 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	90 print_usage ();
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	91 return retval;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	92 }
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	93
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	94 Matrix points (args(0).matrix_value ());
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	95 const octave_idx_type dim = points.columns ();
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	96 const octave_idx_type num_points = points.rows ();
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	97
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	98 points = points.transpose ();
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	99
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	100 std::string options;
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	101
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	102 if (dim <= 4)
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	103 options = " Qt";
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	104 else
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	105 options = " Qt Qx";
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	106
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	107 if (nargin == 2)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	108 {
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	109 if (args(1).is_string ())
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	110 options = " " + args(1).string_value ();
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	111 else if (args(1).is_empty ())
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	112 ; // Use default options.
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	113 else if (args(1).is_cellstr ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	114 {
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	115 options = "";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	116
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	117 Array<std::string> tmp = args(1).cellstr_value ();
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	118
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	119 for (octave_idx_type i = 0; i < tmp.numel (); i++)
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	120 options += " " + tmp(i);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	121 }
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	122 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	123 {
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	124 error ("convhulln: OPTIONS must be a string, cell array of strings, or empty");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	125 return retval;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	126 }
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	127 }
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	128
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	129 boolT ismalloc = false;
10257 cd550069240e assume vsnprintf from gnulib; use sstream instead of snprintf John W. Eaton <jwe@octave.org> parents: 10154 diff changeset	130
14309 824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	131 // Replace the outfile pointer with stdout for debugging information.
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	132 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM)
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	133 FILE *outfile = gnulib::fopen ("NUL", "w");
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	134 #else
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	135 FILE *outfile = gnulib::fopen ("/dev/null", "w");
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	136 #endif
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	137 FILE *errfile = stderr;
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	138
14309 824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	139 if (! outfile)
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	140 {
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	141 error ("convhulln: Unable to create temporary file for output.");
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	142 return retval;
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	143 }
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	144
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	145 // qh_new_qhull command and points arguments are not const...
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	146
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13877 diff changeset	147 std::string cmd = "qhull" + options;
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	148
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	149 OCTAVE_LOCAL_BUFFER (char, cmd_str, cmd.length () + 1);
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	150
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	151 strcpy (cmd_str, cmd.c_str ());
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	152
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	153 int exitcode = qh_new_qhull (dim, num_points, points.fortran_vec (),
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	154 ismalloc, cmd_str, outfile, errfile);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	155 if (! exitcode)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	156 {
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	157 bool nonsimp_seen = false;
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	158
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	159 octave_idx_type nf = qh num_facets;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	160
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	161 Matrix idx (nf, dim + 1);
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	162
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	163 facetT *facet;
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	164
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	165 octave_idx_type i = 0;
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	166
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	167 FORALLfacets
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	168 {
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	169 octave_idx_type j = 0;
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	170
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	171 if (! nonsimp_seen && ! facet->simplicial)
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	172 {
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	173 nonsimp_seen = true;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	174
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	175 if (cmd.find ("QJ") != std::string::npos)
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	176 {
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	177 // Should never happen with QJ.
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	178 error ("convhulln: qhull failed: option 'QJ' returned non-simplicial facet");
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	179 return retval;
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	180 }
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	181 }
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	182
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	183 if (dim == 3)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	184 {
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	185 setT *vertices = qh_facet3vertex (facet);
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	186
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	187 vertexT vertex, *vertexp;
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	188
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	189 FOREACHvertex_ (vertices)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	190 idx(i, j++) = 1 + qh_pointid(vertex->point);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	191
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	192 qh_settempfree (&vertices);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	193 }
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	194 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	195 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	196 if (facet->toporient ^ qh_ORIENTclock)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	197 {
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	198 vertexT vertex, *vertexp;
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	199
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	200 FOREACHvertex_ (facet->vertices)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	201 idx(i, j++) = 1 + qh_pointid(vertex->point);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	202 }
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	203 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	204 {
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	205 vertexT vertex, *vertexp;
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	206
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	207 FOREACHvertexreverse12_ (facet->vertices)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	208 idx(i, j++) = 1 + qh_pointid(vertex->point);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	209 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	210 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	211 if (j < dim)
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	212 warning ("convhulln: facet %d only has %d vertices", i, j);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	213
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	214 i++;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	215 }
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	216
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	217 // Remove extra dimension if all facets were simplicial.
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	218
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	219 if (! nonsimp_seen)
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	220 idx.resize (nf, dim, 0.0);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	221
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	222 if (nargout == 2)
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	223 {
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	224 // Calculate volume of convex hull, taken from qhull src/geom2.c.
0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	225
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	226 realT area;
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	227 realT dist;
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	228
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	229 FORALLfacets
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	230 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	231 if (! facet->normal)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	232 continue;
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	233
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	234 if (facet->upperdelaunay && qh ATinfinity)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	235 continue;
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	236
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	237 facet->f.area = area = qh_facetarea (facet);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	238 facet->isarea = True;
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	239
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	240 if (qh DELAUNAY)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	241 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	242 if (facet->upperdelaunay == qh UPPERdelaunay)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	243 qh totarea += area;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	244 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	245 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	246 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	247 qh totarea += area;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	248 qh_distplane (qh interior_point, facet, &dist);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	249 qh totvol += -dist * area/ qh hull_dim;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	250 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	251 }
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	252
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	253 retval(1) = octave_value (qh totvol);
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	254 }
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	255
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	256 retval(0) = idx;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	257 }
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	258 else
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	259 error ("convhulln: qhull failed");
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6882 diff changeset	260
13877 0d32a681d943 * convhulln.cc: Clean up argument parsing and variable decls. John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	261 // Free memory from Qhull
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6882 diff changeset	262 qh_freeqhull (! qh_ALL);
47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6882 diff changeset	263
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	264 int curlong, totlong;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	265 qh_memfreeshort (&curlong, &totlong);
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	266
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	267 if (curlong \|\| totlong)
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6882 diff changeset	268 warning ("convhulln: did not free %d bytes of long memory (%d pieces)",
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	269 totlong, curlong);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	270
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	271 #else
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	272 error ("convhulln: not available in this version of Octave");
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	273 #endif
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6882 diff changeset	274
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	275 return retval;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	276 }
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	277
dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	278 /*
10474 b2143d97c002 Neither include qhull/qhull_a.h nor run tests unless we HAVE_QHULL. David Grundberg <davidg@cs.umu.se> parents: 10257 diff changeset	279 %!testif HAVE_QHULL
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	280 %! cube = [0 0 0;1 0 0;1 1 0;0 1 0;0 0 1;1 0 1;1 1 1;0 1 1];
14310 decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	281 %! [h, v] = convhulln (cube, "Qt");
decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	282 %! assert (size (h), [12 3]);
decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	283 %! h = sortrows (sort (h, 2), [1:3]);
decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	284 %! assert (h, [1 2 4; 1 2 6; 1 4 8; 1 5 6; 1 5 8; 2 3 4; 2 3 7; 2 6 7; 3 4 7; 4 7 8; 5 6 7; 5 7 8]);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	285 %! assert (v, 1, 10*eps);
14310 decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	286 %! [h2, v2] = convhulln (cube); % Test defaut option = "Qt"
decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	287 %! assert (size (h2), size (h))
decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	288 %! h2 = sortrows (sort (h2, 2), [1:3]);
decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	289 %! assert (h2, h);
decea31ea010 Fix qhull tests. Ben Abbott <bpabbott@mac.com> parents: 14309 diff changeset	290 %! assert (v2, v, 10*eps);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	291
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	292 %!testif HAVE_QHULL
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	293 %! cube = [0 0 0;1 0 0;1 1 0;0 1 0;0 0 1;1 0 1;1 1 1;0 1 1];
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	294 %! [h, v] = convhulln (cube, "QJ");
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	295 %! assert (size (h), [12 3]);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	296 %! assert (sortrows (sort (h, 2), [1:3]), [1 2 4; 1 2 5; 1 4 5; 2 3 4; 2 3 6; 2 5 6; 3 4 8; 3 6 7; 3 7 8; 4 5 8; 5 6 8; 6 7 8]);
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	297 %! assert (v, 1.0, 1e6*eps);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	298
10474 b2143d97c002 Neither include qhull/qhull_a.h nor run tests unless we HAVE_QHULL. David Grundberg <davidg@cs.umu.se> parents: 10257 diff changeset	299 %!testif HAVE_QHULL
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	300 %! tetrahedron = [1 1 1;-1 -1 1;-1 1 -1;1 -1 -1];
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	301 %! [h, v] = convhulln (tetrahedron);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	302 %! h = sortrows (sort (h, 2), [1 2 3]);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	303 %! assert (h, [1 2 3;1 2 4; 1 3 4; 2 3 4]);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	304 %! assert (v, 8/3, 10*eps);
8786 dbd428efbf56 Add calculation convex hull volume Kai Habel <kai.habel@gmx.de> parents: 7520 diff changeset	305 */

Mercurial > octave

annotate src/DLD-FUNCTIONS/convhulln.cc @ 14310:decea31ea010 stable