octave-nkf: src/DLD-FUNCTIONS/__voronoi_

annotate src/DLD-FUNCTIONS/voronoi.cc @ 13879:440d7914cf01

fix regression in __voronoi__ and convhulln option processing * __voronoi__.cc (F__voronoi__): Allow user-supplied options to completely replace defaults. * convhulln.cc (F__convhulln__): Likewise. * __voronoi__.cc (F__voronoi__): New argument, caller. * voronoi.m, voronoin.m: Pass name of function to __voronoi__. * voronoin.m: Don't check options here. * voronoi.m: Don't check nargout.

author	John W. Eaton <jwe@octave.org>
date	Thu, 17 Nov 2011 13:47:12 -0500
parents	adf60d6dc1dd
children	1dc120c06ce0

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
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	3 Copyright (C) 2000-2011 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: 6945 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: 6945 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: 6945 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: 6945 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 20. Augiust 2000 - Kai Habel: first release
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	25 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	26
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	27 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	28 2003-12-14 Rafael Laboissiere <rafael@laboissiere.net>
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	29 Added optional second argument to pass options to the underlying
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	30 qhull command
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
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	33 #ifdef HAVE_CONFIG_H
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	34 #include <config.h>
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	35 #endif
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	36
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	37 #include <cstdio>
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	38
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	39 #include <list>
6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	40
9003 0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	41 #include "lo-ieee.h"
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	42
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	43 #include "Cell.h"
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	44 #include "defun-dld.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	45 #include "error.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	46 #include "oct-obj.h"
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	47
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	48 #ifdef HAVE_QHULL
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	49 extern "C" {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	50 #include <qhull/qhull_a.h>
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	51 }
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	52
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	53 #ifdef NEED_QHULL_VERSION
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	54 char qh_version[] = "__voronoi__.oct 2007-07-24";
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	55 #endif
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	56 #endif
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	57
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	58 DEFUN_DLD (__voronoi__, args, ,
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	59 "-- texinfo --\n\
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	60 @deftypefn {Loadable Function} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts})\n\
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	61 @deftypefnx {Loadable Function} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts}, @var{options})\n\
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	62 @deftypefnx {Loadable Function} {@var{C}, @var{F}, @var{Inf_Pts} =} __voronoi__ (@dots{})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	63 Undocumented internal function.\n\
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	64 @end deftypefn")
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	65 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	66 octave_value_list retval;
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	67
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	68 #ifdef HAVE_QHULL
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	69
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	70 retval(0) = 0.0;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	71
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	72 int nargin = args.length ();
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	73 if (nargin < 2 \|\| nargin > 3)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	74 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	75 print_usage ();
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	76 return retval;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	77 }
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	78
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	79 std::string caller = args(0).string_value ();
13203 b6aba5b4edb1 voronoin: accept options as a cell array of character strings John W. Eaton <jwe@octave.org> parents: 12805 diff changeset	80
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	81 Matrix points = args(1).matrix_value ();
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	82 const octave_idx_type dim = points.columns ();
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	83 const octave_idx_type num_points = points.rows ();
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	84
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	85 points = points.transpose ();
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	86
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	87 std::string options;
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	88
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	89 if (dim <= 4)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	90 options = " Qbb";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	91 else
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	92 options = " Qbb Qx";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	93
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	94 if (nargin == 3)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	95 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	96 octave_value opt_arg = args(2);
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	97
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	98 if (opt_arg.is_string ())
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	99 options = " " + args(1).string_value ();
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	100 else if (opt_arg.is_empty ())
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	101 ; // Use default options.
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	102 else if (args(1).is_cellstr ())
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	103 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	104 options = "";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	105
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	106 Array<std::string> tmp = opt_arg.cellstr_value ();
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	107
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	108 for (octave_idx_type i = 0; i < tmp.numel (); i++)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	109 options += " " + tmp(i);
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	110 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	111 else
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	112 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	113 error ("%s: OPTIONS must be a string, cell array of strings, or empty",
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	114 caller.c_str ());
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	115 return retval;
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	116 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	117 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	118
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	119 boolT ismalloc = false;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	120
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	121 // Replace the 0 pointer with stdout for debugging information
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	122 FILE *outfile = 0;
6880 e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman] dbateman parents: 6823 diff changeset	123 FILE *errfile = stderr;
e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman] dbateman parents: 6823 diff changeset	124
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	125 // 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: 13871 diff changeset	126
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	127 std::string cmd = "qhull v" + options;
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	128
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	129 OCTAVE_LOCAL_BUFFER (char, cmd_str, cmd.length () + 1);
13203 b6aba5b4edb1 voronoin: accept options as a cell array of character strings John W. Eaton <jwe@octave.org> parents: 12805 diff changeset	130
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	131 strcpy (cmd_str, cmd.c_str ());
13203 b6aba5b4edb1 voronoin: accept options as a cell array of character strings John W. Eaton <jwe@octave.org> parents: 12805 diff changeset	132
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	133 int exitcode = qh_new_qhull (dim, num_points, points.fortran_vec (),
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	134 ismalloc, cmd_str, outfile, errfile);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	135 if (! exitcode)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	136 {
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	137 // Calling findgood_all provides the number of Voronoi vertices
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	138 // (sets qh num_good).
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	139
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	140 qh_findgood_all (qh facet_list);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	141
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	142 octave_idx_type num_voronoi_regions
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	143 = qh num_vertices - qh_setsize (qh del_vertices);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	144
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	145 octave_idx_type num_voronoi_vertices = qh num_good;
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	146
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	147 // Find the voronoi centers for all facets.
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	148
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	149 qh_setvoronoi_all ();
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	150
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	151 facetT *facet;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	152 vertexT *vertex;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	153 octave_idx_type k;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	154
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	155 // Find the number of Voronoi vertices for each Voronoi cell and
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	156 // store them in NI so we can use them later to set the dimensions
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	157 // of the RowVector objects used to collect them.
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	158
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	159 FORALLfacets
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	160 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	161 facet->seen = false;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	162 }
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	163
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	164 OCTAVE_LOCAL_BUFFER (octave_idx_type, ni, num_voronoi_regions);
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	165 for (octave_idx_type i = 0; i < num_voronoi_regions; i++)
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	166 ni[i] = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	167
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	168 k = 0;
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	169
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	170 FORALLvertices
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	171 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	172 if (qh hull_dim == 3)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	173 qh_order_vertexneighbors (vertex);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	174
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	175 bool infinity_seen = false;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	176
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	177 facetT neighbor, *neighborp;
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	178
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	179 FOREACHneighbor_ (vertex)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	180 {
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	181 if (neighbor->upperdelaunay)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	182 {
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	183 if (! infinity_seen)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	184 {
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	185 infinity_seen = true;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	186 ni[k]++;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	187 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	188 }
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	189 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	190 {
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	191 neighbor->seen = true;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	192 ni[k]++;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	193 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	194 }
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	195
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	196 k++;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	197 }
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	198
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	199 // If Qhull finds fewer regions than points, we will pad the end
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	200 // of the at_inf and C arrays so that they always contain at least
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	201 // as many elements as the given points array.
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	202
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	203 // FIXME -- is it possible (or does it make sense) for
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	204 // num_voronoi_regions to ever be larger than num_points?
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	205
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	206 octave_idx_type nr = (num_points > num_voronoi_regions
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	207 ? num_points : num_voronoi_regions);
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	208
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	209 boolMatrix at_inf (nr, 1, false);
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	210
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	211 // The list of Voronoi vertices. The first element is always
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	212 // Inf.
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	213 Matrix F (num_voronoi_vertices+1, dim);
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	214
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	215 for (octave_idx_type d = 0; d < dim; d++)
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	216 F(0,d) = octave_Inf;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	217
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	218 // The cell array of vectors of indices into F that represent the
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	219 // vertices of the Voronoi regions (cells).
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	220
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	221 Cell C (nr, 1);
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	222
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	223 // Now loop through the list of vertices again and store the
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	224 // coordinates of the Voronoi vertices and the lists of indices
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	225 // for the cells.
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	226
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	227 FORALLfacets
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	228 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	229 facet->seen = false;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	230 }
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	231
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	232 octave_idx_type i = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	233 k = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	234
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	235 FORALLvertices
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	236 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	237 if (qh hull_dim == 3)
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	238 qh_order_vertexneighbors (vertex);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	239
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	240 bool infinity_seen = false;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	241
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	242 octave_idx_type idx = qh_pointid (vertex->point);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	243
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	244 octave_idx_type num_vertices = ni[k++];
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	245
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	246 // Qhull seems to sometimes produces regions with a single
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	247 // vertex. Is that a bug? How can a region have just one
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	248 // vertex? Let's skip it.
6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	249
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	250 if (num_vertices == 1)
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	251 continue;
6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	252
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	253 RowVector facet_list (num_vertices);
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	254
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	255 octave_idx_type m = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	256
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	257 facetT neighbor, *neighborp;
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	258
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	259 FOREACHneighbor_(vertex)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	260 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	261 if (neighbor->upperdelaunay)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	262 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	263 if (! infinity_seen)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	264 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	265 infinity_seen = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	266 facet_list(m++) = 1;
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	267 at_inf(idx) = true;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	268 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	269 }
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	270 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	271 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	272 if (! neighbor->seen)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	273 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	274 i++;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	275 for (octave_idx_type d = 0; d < dim; d++)
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	276 F(i,d) = neighbor->center[d];
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	277
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	278 neighbor->seen = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	279 neighbor->visitid = i;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	280 }
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	281
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	282 facet_list(m++) = neighbor->visitid + 1;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	283 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	284 }
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	285
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	286 C(idx) = facet_list;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	287 }
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	288
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	289 retval(2) = at_inf;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	290 retval(1) = C;
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	291 retval(0) = F;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	292 }
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	293 else
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	294 error ("%s: qhull failed", caller.c_str ());
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	295
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	296 // Free memory from Qhull
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	297 qh_freeqhull (! qh_ALL);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	298
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	299 int curlong, totlong;
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	300 qh_memfreeshort (&curlong, &totlong);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	301
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	302 if (curlong \|\| totlong)
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	303 warning ("%s: qhull did not free %d bytes of long memory (%d pieces)",
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	304 caller.c_str (), totlong, curlong);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	305
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	306 #else
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	307 error ("%s: not available in this version of Octave", caller.c_str ());
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	308 #endif
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	309
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	310 return retval;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	311 }
12805 3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	312
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	313 /*
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	314
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	315 ## No test needed for internal helper function.
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	316 %!assert (1)
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	317
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	318 */

Mercurial > octave-nkf

annotate src/DLD-FUNCTIONS/__voronoi__.cc @ 13879:440d7914cf01

annotate src/DLD-FUNCTIONS/voronoi.cc @ 13879:440d7914cf01