Mercurial > octave-nkf
annotate src/DLD-FUNCTIONS/__voronoi__.cc @ 13203:b6aba5b4edb1
voronoin: accept options as a cell array of character strings
* __voronoi__.cc (F__voronoi__): Accept options as cell array of
character strings. Use std::string for buffer. Don't use fixed size
for char* buffer that is passed to qh_new_qhull.
* voronoin.m: Accept options as cell array of character strings.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 23 Sep 2011 15:03:29 -0400 |
parents | 3641167e5b75 |
children | 7ff0bdc3dc4c |
rev | line source |
---|---|
6823 | 1 /* |
2 | |
11523 | 3 Copyright (C) 2000-2011 Kai Habel |
6823 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
6823 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
6823 | 20 |
21 */ | |
22 | |
23 /* | |
24 20. Augiust 2000 - Kai Habel: first release | |
25 */ | |
26 | |
27 /* | |
28 2003-12-14 Rafael Laboissiere <rafael@laboissiere.net> | |
29 Added optional second argument to pass options to the underlying | |
30 qhull command | |
31 */ | |
32 | |
33 #ifdef HAVE_CONFIG_H | |
34 #include <config.h> | |
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 |
9003
0631d397fbe0
replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
39 #include "lo-ieee.h" |
9786
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
40 |
6823 | 41 #include "Cell.h" |
9786
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
42 #include "defun-dld.h" |
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
43 #include "error.h" |
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
44 #include "oct-obj.h" |
6823 | 45 |
46 #ifdef HAVE_QHULL | |
47 extern "C" { | |
48 #include <qhull/qhull_a.h> | |
49 } | |
50 | |
51 #ifdef NEED_QHULL_VERSION | |
52 char qh_version[] = "__voronoi__.oct 2007-07-24"; | |
53 #endif | |
54 #endif | |
55 | |
56 DEFUN_DLD (__voronoi__, args, , | |
57 "-*- texinfo -*-\n\ | |
10840 | 58 @deftypefn {Loadable Function} {@var{tri} =} __voronoi__ (@var{point})\n\ |
6823 | 59 @deftypefnx {Loadable Function} {@var{tri} =} __voronoi__ (@var{point}, @var{options})\n\ |
6945 | 60 Undocumented internal function.\n\ |
6823 | 61 @end deftypefn") |
62 { | |
63 octave_value_list retval; | |
6945 | 64 |
6823 | 65 #ifdef HAVE_QHULL |
6945 | 66 |
6823 | 67 retval(0) = 0.0; |
68 | |
6945 | 69 int nargin = args.length (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
70 if (nargin < 1 || nargin > 2) |
6823 | 71 { |
72 print_usage (); | |
73 return retval; | |
74 } | |
75 | |
13203
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
76 std::string options = "qhull v Fv T0"; |
6880 | 77 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
78 if (nargin == 2) |
6823 | 79 { |
13203
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
80 if (args(1).is_cellstr ()) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
81 { |
13203
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
82 Array<std::string> tmp = args(1).cellstr_value (); |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
83 |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
84 for (octave_idx_type i = 0; i < tmp.numel (); i++) |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
85 options += " " + tmp(i); |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
86 } |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
87 else if (args(1).is_string ()) |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
88 options += " " + args(1).string_value (); |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
89 else |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
90 { |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
91 error ("__voronoi__: OPTIONS argument must be a string or cellstr"); |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
92 return retval; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
93 } |
6823 | 94 } |
95 | |
6945 | 96 Matrix p (args(0).matrix_value ()); |
6823 | 97 |
6945 | 98 const octave_idx_type dim = p.columns (); |
99 const octave_idx_type np = p.rows (); | |
100 p = p.transpose (); | |
6823 | 101 |
6945 | 102 double *pt_array = p.fortran_vec (); |
103 | |
6823 | 104 //double pt_array[dim * np]; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
105 //for (int i = 0; i < np; i++) |
6823 | 106 // { |
107 // for (int j = 0; j < dim; j++) | |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
108 // { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
109 // pt_array[j+i*dim] = p(i,j); |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
110 // } |
6823 | 111 // } |
112 | |
113 boolT ismalloc = false; | |
114 | |
6945 | 115 // If you want some debugging information replace the 0 pointer |
116 // with stdout or some other file open for writing. | |
117 | |
118 FILE *outfile = 0; | |
6880 | 119 FILE *errfile = stderr; |
120 | |
13203
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
121 // Qhull flags argument is not const char*... |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
122 OCTAVE_LOCAL_BUFFER (char, flags, options.length () + 1); |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
123 |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
124 strcpy (flags, options.c_str ()); |
b6aba5b4edb1
voronoin: accept options as a cell array of character strings
John W. Eaton <jwe@octave.org>
parents:
12805
diff
changeset
|
125 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
126 if (! qh_new_qhull (dim, np, pt_array, ismalloc, flags, outfile, errfile)) |
6823 | 127 { |
128 facetT *facet; | |
129 vertexT *vertex; | |
130 | |
131 octave_idx_type i = 0, n = 1, k = 0, m = 0, fidx = 0, j = 0, r = 0; | |
6945 | 132 OCTAVE_LOCAL_BUFFER (octave_idx_type, ni, np); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
133 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
134 for (i = 0; i < np; i++) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
135 ni[i] = 0; |
6945 | 136 qh_setvoronoi_all (); |
6823 | 137 bool infinity_seen = false; |
6945 | 138 facetT *neighbor, **neighborp; |
6823 | 139 coordT *voronoi_vertex; |
6945 | 140 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
141 FORALLfacets |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
142 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
143 facet->seen = false; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
144 } |
6945 | 145 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
146 FORALLvertices |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
147 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
148 if (qh hull_dim == 3) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
149 qh_order_vertexneighbors (vertex); |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
150 infinity_seen = false; |
6945 | 151 |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
152 FOREACHneighbor_ (vertex) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
153 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
154 if (! neighbor->upperdelaunay) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
155 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
156 if (! neighbor->seen) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
157 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
158 n++; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
159 neighbor->seen = true; |
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 ni[k]++; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
162 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
163 else if (! infinity_seen) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
164 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
165 infinity_seen = true; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
166 ni[k]++; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
167 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
168 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
169 k++; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
170 } |
6823 | 171 |
6945 | 172 Matrix v (n, dim); |
6823 | 173 for (octave_idx_type d = 0; d < dim; d++) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
174 v(0,d) = octave_Inf; |
6823 | 175 |
6945 | 176 boolMatrix AtInf (np, 1); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
177 for (i = 0; i < np; i++) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
178 AtInf(i) = false; |
8415
fa12c67683d3
Reszie third arg of __voronoi__ before retuning it
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
179 octave_value_list F (np, octave_value ()); |
6823 | 180 k = 0; |
181 i = 0; | |
6945 | 182 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
183 FORALLfacets |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
184 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
185 facet->seen = false; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
186 } |
6945 | 187 |
6823 | 188 FORALLvertices |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
189 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
190 if (qh hull_dim == 3) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
191 qh_order_vertexneighbors(vertex); |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
192 infinity_seen = false; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
193 RowVector facet_list (ni[k++]); |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
194 m = 0; |
6945 | 195 |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
196 FOREACHneighbor_(vertex) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
197 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
198 if (neighbor->upperdelaunay) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
199 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
200 if (! infinity_seen) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
201 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
202 infinity_seen = true; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
203 facet_list(m++) = 1; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
204 AtInf(j) = true; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
205 } |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
206 } |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
207 else |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
208 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
209 if (! neighbor->seen) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
210 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
211 voronoi_vertex = neighbor->center; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
212 fidx = neighbor->id; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
213 i++; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
214 for (octave_idx_type d = 0; d < dim; d++) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
215 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
216 v(i,d) = *(voronoi_vertex++); |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
217 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
218 neighbor->seen = true; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
219 neighbor->visitid = i; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
220 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
221 facet_list(m++) = neighbor->visitid + 1; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
222 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
223 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
224 F(r++) = facet_list; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
225 j++; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
226 } |
6823 | 227 |
228 Cell C(r, 1); | |
229 for (i = 0; i < r; i++) | |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
230 C.elem (i) = F(i); |
6823 | 231 |
232 retval(0) = v; | |
233 retval(1) = C; | |
8415
fa12c67683d3
Reszie third arg of __voronoi__ before retuning it
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
234 AtInf.resize (r, 1); |
6823 | 235 retval(2) = AtInf; |
236 | |
6945 | 237 // free long memory |
238 qh_freeqhull (! qh_ALL); | |
6823 | 239 |
6945 | 240 // free short memory and memory allocator |
6823 | 241 int curlong, totlong; |
242 qh_memfreeshort (&curlong, &totlong); | |
243 | |
6945 | 244 if (curlong || totlong) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
245 warning ("__voronoi__: did not free %d bytes of long memory (%d pieces)", totlong, curlong); |
6823 | 246 } |
6945 | 247 else |
248 error ("__voronoi__: qhull failed"); | |
249 | |
6823 | 250 #else |
251 error ("__voronoi__: not available in this version of Octave"); | |
252 #endif | |
6945 | 253 |
6823 | 254 return retval; |
255 } | |
12805
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
256 |
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
257 /* |
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
258 |
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
259 ## 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
|
260 %!assert (1) |
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
261 |
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
262 */ |