Mercurial > octave-nkf

annotate libinterp/dldfcn/__voronoi__.cc @ 18077:ac74b0c4c564 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid overflow when passing problem dimensions to qhull with --enable-64 * __delaunayn__.cc, __voronoi__.cc, convhulln.cc (octave_qhull_dims_ok): New function. Use it to avoid overflowing the range of integer values used in Qhull when Octave uses 64-bit integer indexing.
author John W. Eaton <jwe@octave.org>
date Tue, 03 Dec 2013 21:39:39 -0500
parents 175b392e91fe
children 65554f5847ac 446c46af4b42
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
17744
d63878346099 maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents: 16343
diff changeset
3 Copyright (C) 2000-2013 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"
14339
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
47 #include "unwind-prot.h"
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
48
14043
f913363318e0 handle new names and locations of qhull include files (bug #33712)
John W. Eaton <jwe@octave.org>
parents: 13903
diff changeset
49 #if defined (HAVE_QHULL)
f913363318e0 handle new names and locations of qhull include files (bug #33712)
John W. Eaton <jwe@octave.org>
parents: 13903
diff changeset
50 # include "oct-qhull.h"
f913363318e0 handle new names and locations of qhull include files (bug #33712)
John W. Eaton <jwe@octave.org>
parents: 13903
diff changeset
51 # if defined (NEED_QHULL_VERSION)
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
52 char qh_version[] = "__voronoi__.oct 2007-07-24";
14043
f913363318e0 handle new names and locations of qhull include files (bug #33712)
John W. Eaton <jwe@octave.org>
parents: 13903
diff changeset
53 # endif
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
54 #endif
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
55
14339
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
56 static void
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
57 close_fcn (FILE *f)
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
58 {
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
59 gnulib::fclose (f);
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
60 }
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
61
18077
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
62 static bool
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
63 octave_qhull_dims_ok (octave_idx_type dim, octave_idx_type n, const char *who)
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
64 {
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
65 if (sizeof (octave_idx_type) > sizeof (int))
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
66 {
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
67 int maxval = std::numeric_limits<int>::max ();
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
68
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
69 if (dim > maxval || n > maxval)
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
70 {
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
71 error ("%s: dimension too large for Qhull", who);
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
72 return false;
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
73 }
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
74 }
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
75
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
76 return true;
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
77 }
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
78
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
79 DEFUN_DLD (__voronoi__, args, ,
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
80 "-*- texinfo -*-\n\
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
81 @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
82 @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
83 @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
84 Undocumented internal function.\n\
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
85 @end deftypefn")
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
86 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
87 octave_value_list retval;
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
88
13903
7b5da9754554 __voronoi__: avoid undeclared variable warning
John W. Eaton <jwe@octave.org>
parents: 13880
diff changeset
89 std::string caller = args(0).string_value ();
7b5da9754554 __voronoi__: avoid undeclared variable warning
John W. Eaton <jwe@octave.org>
parents: 13880
diff changeset
90
14043
f913363318e0 handle new names and locations of qhull include files (bug #33712)
John W. Eaton <jwe@octave.org>
parents: 13903
diff changeset
91 #if defined (HAVE_QHULL)
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
92
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
93 retval(0) = 0.0;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
94
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
95 int nargin = args.length ();
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
96 if (nargin < 2 || nargin > 3)
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
97 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
98 print_usage ();
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
99 return retval;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
100 }
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
101
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
102 Matrix points = args(1).matrix_value ();
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
103 const octave_idx_type dim = points.columns ();
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
104 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
105
18077
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
106 if (! octave_qhull_dims_ok (dim, num_points, "__voronoi__"))
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
107 return retval;
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents: 17787
diff changeset
108
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
109 points = points.transpose ();
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
110
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
111 std::string options;
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
112
16343
dda043ccad7c __voronoi__.cc: Change QHull arguments for 4D inputs to match Matlab.
Rik <rik@octave.org>
parents: 15195
diff changeset
113 if (dim <= 3)
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
114 options = " Qbb";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
115 else
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
116 options = " Qbb Qx";
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 if (nargin == 3)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
119 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
120 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
121
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
122 if (opt_arg.is_string ())
13880
1dc120c06ce0 finish previous change to __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13879
diff changeset
123 options = " " + opt_arg.string_value ();
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
124 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
125 ; // Use default options.
13880
1dc120c06ce0 finish previous change to __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13879
diff changeset
126 else if (opt_arg.is_cellstr ())
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
127 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
128 options = "";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
129
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
130 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
131
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
132 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
133 options += " " + tmp(i);
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
134 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
135 else
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
136 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
137 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
138 caller.c_str ());
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
139 return retval;
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
140 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
141 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
142
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
143 boolT ismalloc = false;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
144
14339
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
145 unwind_protect frame;
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
146
14309
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
147 // 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
148 #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
149 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
150 #else
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
151 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
152 #endif
6880
e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman]
dbateman
parents: 6823
diff changeset
153 FILE *errfile = stderr;
14339
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
154
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
155 if (outfile)
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
156 frame.add_fcn (close_fcn, outfile);
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
157 else
14309
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
158 {
14339
3e4350f09a55 close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents: 14309
diff changeset
159 error ("__voronoi__: unable to create temporary file for output");
14309
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
160 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
161 }
6880
e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman]
dbateman
parents: 6823
diff changeset
162
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
163 // 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
164
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
165 std::string cmd = "qhull v" + options;
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
166
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
167 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
168
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
169 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
170
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
171 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
172 ismalloc, cmd_str, outfile, errfile);
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
173 if (! exitcode)
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
174 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
175 // 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
176 // (sets qh num_good).
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
177
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
178 qh_findgood_all (qh facet_list);
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
179
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
180 octave_idx_type num_voronoi_regions
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
181 = qh num_vertices - qh_setsize (qh del_vertices);
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
182
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
183 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
184
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
185 // Find the voronoi centers for all facets.
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
186
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
187 qh_setvoronoi_all ();
13746
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
188
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
189 facetT *facet;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
190 vertexT *vertex;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
191 octave_idx_type k;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
192
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
193 // 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
194 // 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
195 // of the RowVector objects used to collect them.
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
196
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
197 FORALLfacets
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
198 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
199 facet->seen = false;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
200 }
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
201
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
202 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
203 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
204 ni[i] = 0;
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 k = 0;
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
207
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
208 FORALLvertices
10154
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 if (qh hull_dim == 3)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
211 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
212
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
213 bool infinity_seen = false;
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 facetT *neighbor, **neighborp;
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
216
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
217 FOREACHneighbor_ (vertex)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
218 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
219 if (neighbor->upperdelaunay)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
220 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
221 if (! infinity_seen)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
222 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
223 infinity_seen = true;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
224 ni[k]++;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
225 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
226 }
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
227 else
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
228 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
229 neighbor->seen = true;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
230 ni[k]++;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
231 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
232 }
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
233
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
234 k++;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
235 }
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
236
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
237 // 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
238 // 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
239 // as many elements as the given points array.
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
240
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
241 // FIXME: is it possible (or does it make sense) for
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
242 // 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
243
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
244 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
245 ? num_points : num_voronoi_regions);
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
246
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
247 boolMatrix at_inf (nr, 1, false);
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
248
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
249 // 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
250 // Inf.
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
251 Matrix F (num_voronoi_vertices+1, dim);
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
252
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
253 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
254 F(0,d) = octave_Inf;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
255
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
256 // 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
257 // vertices of the Voronoi regions (cells).
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
258
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
259 Cell C (nr, 1);
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
260
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
261 // 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
262 // 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
263 // for the cells.
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
264
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
265 FORALLfacets
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
266 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
267 facet->seen = false;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
268 }
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
269
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
270 octave_idx_type i = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
271 k = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
272
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
273 FORALLvertices
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
274 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
275 if (qh hull_dim == 3)
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
276 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
277
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
278 bool infinity_seen = false;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
279
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
280 octave_idx_type idx = qh_pointid (vertex->point);
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
281
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
282 octave_idx_type num_vertices = ni[k++];
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
283
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
284 // 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
285 // 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
286 // vertex? Let's skip it.
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
287
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
288 if (num_vertices == 1)
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
289 continue;
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
290
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
291 RowVector facet_list (num_vertices);
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
292
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
293 octave_idx_type m = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
294
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
295 facetT *neighbor, **neighborp;
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
296
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
297 FOREACHneighbor_(vertex)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
298 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
299 if (neighbor->upperdelaunay)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
300 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
301 if (! infinity_seen)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
302 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
303 infinity_seen = true;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
304 facet_list(m++) = 1;
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
305 at_inf(idx) = true;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
306 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
307 }
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
308 else
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
309 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
310 if (! neighbor->seen)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
311 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
312 i++;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
313 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
314 F(i,d) = neighbor->center[d];
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
315
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
316 neighbor->seen = true;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
317 neighbor->visitid = i;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
318 }
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
319
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
320 facet_list(m++) = neighbor->visitid + 1;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
321 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
322 }
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
323
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
324 C(idx) = facet_list;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
325 }
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
326
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
327 retval(2) = at_inf;
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
328 retval(1) = C;
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
329 retval(0) = F;
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
330 }
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
331 else
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
332 error ("%s: qhull failed", caller.c_str ());
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
333
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
334 // 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
335 qh_freeqhull (! qh_ALL);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
336
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
337 int curlong, totlong;
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
338 qh_memfreeshort (&curlong, &totlong);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
339
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
340 if (curlong || totlong)
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
341 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
342 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
343
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
344 #else
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
345 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
346 #endif
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
347
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
348 return retval;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
349 }
12805
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
350
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
351 /*
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
352 ## 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
353 %!assert (1)
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
354 */