Mercurial > octave
annotate libinterp/dldfcn/__voronoi__.cc @ 27919:1891570abac8
update Octave Project Developers copyright for the new year
In files that have the "Octave Project Developers" copyright notice,
update for 2020.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 06 Jan 2020 22:29:51 -0500 |
parents | b442ec6dda5c |
children | bd51beb6205e |
rev | line source |
---|---|
6823 | 1 /* |
2 | |
27919
1891570abac8
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
27918
diff
changeset
|
3 Copyright (C) 2000-2020 The Octave Project Developers |
27918
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
4 |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
5 See the file COPYRIGHT.md in the top-level directory of this distribution |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
6 or <https://octave.org/COPYRIGHT.html/>. |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
7 |
6823 | 8 |
9 This file is part of Octave. | |
10 | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24262
diff
changeset
|
11 Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
12 under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24262
diff
changeset
|
13 the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
14 (at your option) any later version. |
6823 | 15 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
16 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
17 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
19 GNU General Public License for more details. |
6823 | 20 |
21 You should have received a copy of the GNU General Public License | |
7016 | 22 along with Octave; see the file COPYING. If not, see |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24262
diff
changeset
|
23 <https://www.gnu.org/licenses/>. |
6823 | 24 |
25 */ | |
26 | |
27 /* | |
28 20. Augiust 2000 - Kai Habel: first release | |
29 */ | |
30 | |
31 /* | |
32 2003-12-14 Rafael Laboissiere <rafael@laboissiere.net> | |
33 Added optional second argument to pass options to the underlying | |
34 qhull command | |
35 */ | |
36 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21723
diff
changeset
|
37 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
38 # include "config.h" |
6823 | 39 #endif |
9786
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
40 |
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
41 #include <cstdio> |
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
42 |
23024
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
43 #include <limits> |
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
44 #include <string> |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
45 |
23024
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
46 #include "Array.h" |
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
47 #include "boolMatrix.h" |
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
48 #include "dMatrix.h" |
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
49 #include "dRowVector.h" |
19269
65554f5847ac
don't include oct-locbuf.h in header files unnecessarily
John W. Eaton <jwe@octave.org>
parents:
18077
diff
changeset
|
50 #include "oct-locbuf.h" |
23024
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
51 #include "unwind-prot.h" |
9786
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
52 |
6823 | 53 #include "Cell.h" |
9786
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
54 #include "defun-dld.h" |
2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents:
9003
diff
changeset
|
55 #include "error.h" |
21126
ba0a4b4f021d
include errwarn.h in files that use err_disabled_feature conditionally
John W. Eaton <jwe@octave.org>
parents:
21109
diff
changeset
|
56 #include "errwarn.h" |
23024
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
57 #include "ov.h" |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20939
diff
changeset
|
58 #include "ovl.h" |
6823 | 59 |
14043
f913363318e0
handle new names and locations of qhull include files (bug #33712)
John W. Eaton <jwe@octave.org>
parents:
13903
diff
changeset
|
60 #if defined (HAVE_QHULL) |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
61 |
21200
fcac5dbbf9ed
maint: Indent #ifdef blocks in libinterp.
Rik <rik@octave.org>
parents:
21126
diff
changeset
|
62 # include "oct-qhull.h" |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
63 |
21200
fcac5dbbf9ed
maint: Indent #ifdef blocks in libinterp.
Rik <rik@octave.org>
parents:
21126
diff
changeset
|
64 # if defined (NEED_QHULL_VERSION) |
6823 | 65 char qh_version[] = "__voronoi__.oct 2007-07-24"; |
21200
fcac5dbbf9ed
maint: Indent #ifdef blocks in libinterp.
Rik <rik@octave.org>
parents:
21126
diff
changeset
|
66 # endif |
6823 | 67 |
14339
3e4350f09a55
close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents:
14309
diff
changeset
|
68 static void |
3e4350f09a55
close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents:
14309
diff
changeset
|
69 close_fcn (FILE *f) |
3e4350f09a55
close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents:
14309
diff
changeset
|
70 { |
21942
aab79a1885cc
limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents:
21937
diff
changeset
|
71 std::fclose (f); |
14339
3e4350f09a55
close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents:
14309
diff
changeset
|
72 } |
3e4350f09a55
close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents:
14309
diff
changeset
|
73 |
24260
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
74 static void |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
75 free_qhull_memory () |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
76 { |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
77 qh_freeqhull (! qh_ALL); |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
78 |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
79 int curlong, totlong; |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
80 qh_memfreeshort (&curlong, &totlong); |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
81 |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
82 if (curlong || totlong) |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
83 warning ("__voronoi__: did not free %d bytes of long memory (%d pieces)", |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
84 totlong, curlong); |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
85 } |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
86 |
18077
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
87 static bool |
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
88 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
|
89 { |
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
90 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
|
91 { |
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
92 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
|
93 |
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
94 if (dim > maxval || n > maxval) |
20825
66cd994d1b79
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20790
diff
changeset
|
95 error ("%s: dimension too large for Qhull", who); |
18077
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
96 } |
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
97 |
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
98 return true; |
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
99 } |
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
100 |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
101 #endif |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
102 |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
103 DEFUN_DLD (__voronoi__, args, , |
21966
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21942
diff
changeset
|
104 doc: /* -*- texinfo -*- |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21942
diff
changeset
|
105 @deftypefn {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts}) |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21942
diff
changeset
|
106 @deftypefnx {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts}, @var{options}) |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21942
diff
changeset
|
107 @deftypefnx {} {@var{C}, @var{F}, @var{Inf_Pts} =} __voronoi__ (@dots{}) |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21942
diff
changeset
|
108 Undocumented internal function. |
112b20240c87
move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents:
21942
diff
changeset
|
109 @end deftypefn */) |
6823 | 110 { |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
111 #if defined (HAVE_QHULL) |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
112 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
113 int nargin = args.length (); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
114 |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
115 if (nargin < 2 || nargin > 3) |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
116 print_usage (); |
6945 | 117 |
20700
68e3a747ca02
rename octave_value value extractors that accept error message args
John W. Eaton <jwe@octave.org>
parents:
20579
diff
changeset
|
118 std::string caller = args(0).xstring_value ("__voronoi__: CALLER must be a string"); |
13903
7b5da9754554
__voronoi__: avoid undeclared variable warning
John W. Eaton <jwe@octave.org>
parents:
13880
diff
changeset
|
119 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
120 octave_value_list retval; |
6823 | 121 |
13879
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
122 Matrix points = args(1).matrix_value (); |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
123 const octave_idx_type dim = points.columns (); |
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
124 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
|
125 |
18077
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
126 if (! octave_qhull_dims_ok (dim, num_points, "__voronoi__")) |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
127 return ovl (0.0); |
18077
ac74b0c4c564
avoid overflow when passing problem dimensions to qhull with --enable-64
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
128 |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
129 points = points.transpose (); |
6945 | 130 |
13879
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
131 std::string options; |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
132 |
16343
dda043ccad7c
__voronoi__.cc: Change QHull arguments for 4D inputs to match Matlab.
Rik <rik@octave.org>
parents:
15195
diff
changeset
|
133 if (dim <= 3) |
13879
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
134 options = " Qbb"; |
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 options = " Qbb Qx"; |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
137 |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
138 if (nargin == 3) |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
139 { |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
140 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
|
141 |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
142 if (opt_arg.is_string ()) |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
143 options = ' ' + opt_arg.string_value (); |
23577
80c42f4cca13
maint: Deprecate is_empty and replace with isempty.
Rik <rik@octave.org>
parents:
23575
diff
changeset
|
144 else if (opt_arg.isempty ()) |
13879
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
145 ; // Use default options. |
23575
e95738a119da
maint: Deprecate is_cellstr and replace with iscellstr.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
146 else if (opt_arg.iscellstr ()) |
13879
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
147 { |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
148 options = ""; |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
149 |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
150 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
|
151 |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
152 for (octave_idx_type i = 0; i < tmp.numel (); i++) |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
153 options += ' ' + tmp(i); |
13879
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
154 } |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
155 else |
20825
66cd994d1b79
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20790
diff
changeset
|
156 error ("%s: OPTIONS must be a string, cell array of strings, or empty", |
66cd994d1b79
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20790
diff
changeset
|
157 caller.c_str ()); |
13879
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
158 } |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
159 |
6823 | 160 boolT ismalloc = false; |
161 | |
21743
f4d7d0eb5b0c
use namespace for unwind_protect class
John W. Eaton <jwe@octave.org>
parents:
21724
diff
changeset
|
162 octave::unwind_protect frame; |
14339
3e4350f09a55
close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents:
14309
diff
changeset
|
163 |
14309
824e5d362aba
Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
164 // 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
|
165 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM) |
21942
aab79a1885cc
limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents:
21937
diff
changeset
|
166 FILE *outfile = std::fopen ("NUL", "w"); |
14309
824e5d362aba
Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
167 #else |
21942
aab79a1885cc
limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents:
21937
diff
changeset
|
168 FILE *outfile = std::fopen ("/dev/null", "w"); |
14309
824e5d362aba
Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
169 #endif |
6880 | 170 FILE *errfile = stderr; |
14339
3e4350f09a55
close temporary files opened for Qhull
John W. Eaton <jwe@octave.org>
parents:
14309
diff
changeset
|
171 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
172 if (! outfile) |
20825
66cd994d1b79
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20790
diff
changeset
|
173 error ("__voronoi__: unable to create temporary file for output"); |
6880 | 174 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
175 frame.add_fcn (close_fcn, outfile); |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
176 |
13879
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
177 // 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
|
178 |
440d7914cf01
fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents:
13871
diff
changeset
|
179 std::string cmd = "qhull v" + options; |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
180 |
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
181 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
|
182 |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
183 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
|
184 |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
185 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
|
186 ismalloc, cmd_str, outfile, errfile); |
24260
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
187 |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
188 frame.add_fcn (free_qhull_memory); |
0f2dc8d6c34d
Eliminate possible segfaults related to not cleaning up Qhull workspace.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
189 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
190 if (exitcode) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
191 error ("%s: qhull failed", caller.c_str ()); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
192 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
193 // Calling findgood_all provides the number of Voronoi vertices |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
194 // (sets qh num_good). |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
195 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
196 qh_findgood_all (qh facet_list); |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
197 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
198 octave_idx_type num_voronoi_regions |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
199 = qh num_vertices - qh_setsize (qh del_vertices); |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
200 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
201 octave_idx_type num_voronoi_vertices = qh num_good; |
13746
7ff0bdc3dc4c
Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents:
13203
diff
changeset
|
202 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
203 // Find the voronoi centers for all facets. |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
204 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
205 qh_setvoronoi_all (); |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
206 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
207 facetT *facet; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
208 vertexT *vertex; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
209 octave_idx_type k; |
6945 | 210 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
211 // Find the number of Voronoi vertices for each Voronoi cell and |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
212 // store them in NI so we can use them later to set the dimensions |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
213 // of the RowVector objects used to collect them. |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
18077
diff
changeset
|
214 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
215 FORALLfacets |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
216 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
217 facet->seen = false; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
218 } |
6945 | 219 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
220 OCTAVE_LOCAL_BUFFER (octave_idx_type, ni, num_voronoi_regions); |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
221 for (octave_idx_type i = 0; i < num_voronoi_regions; i++) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
222 ni[i] = 0; |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
18077
diff
changeset
|
223 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
224 k = 0; |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
225 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
226 FORALLvertices |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
227 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
228 if (qh hull_dim == 3) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
229 qh_order_vertexneighbors (vertex); |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
230 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
231 bool infinity_seen = false; |
6945 | 232 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
233 facetT *neighbor, **neighborp; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
234 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
235 FOREACHneighbor_ (vertex) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
236 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
237 if (neighbor->upperdelaunay) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
238 { |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
239 if (! infinity_seen) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
240 { |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
241 infinity_seen = true; |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
242 ni[k]++; |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
243 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
244 } |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
245 else |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
246 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
247 neighbor->seen = true; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
248 ni[k]++; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
249 } |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
250 } |
6945 | 251 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
252 k++; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
253 } |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
254 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
255 // If Qhull finds fewer regions than points, we will pad the end |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
256 // of the at_inf and C arrays so that they always contain at least |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
257 // as many elements as the given points array. |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
258 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
259 // FIXME: is it possible (or does it make sense) for |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
260 // num_voronoi_regions to ever be larger than num_points? |
13746
7ff0bdc3dc4c
Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents:
13203
diff
changeset
|
261 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
262 octave_idx_type nr = (num_points > num_voronoi_regions |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
263 ? num_points : num_voronoi_regions); |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
264 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
265 boolMatrix at_inf (nr, 1, false); |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
266 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
267 // The list of Voronoi vertices. The first element is always |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
268 // Inf. |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
269 Matrix F (num_voronoi_vertices+1, dim); |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
270 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
271 for (octave_idx_type d = 0; d < dim; d++) |
21723
bae585228161
use namespace for numeric_limits
John W. Eaton <jwe@octave.org>
parents:
21721
diff
changeset
|
272 F(0,d) = octave::numeric_limits<double>::Inf (); |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
273 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
274 // The cell array of vectors of indices into F that represent the |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
275 // vertices of the Voronoi regions (cells). |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
276 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
277 Cell C (nr, 1); |
13862
6d7e133a4bed
compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13746
diff
changeset
|
278 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
279 // Now loop through the list of vertices again and store the |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
280 // coordinates of the Voronoi vertices and the lists of indices |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
281 // for the cells. |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
282 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
283 FORALLfacets |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
284 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
285 facet->seen = false; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
286 } |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
287 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
288 octave_idx_type i = 0; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
289 k = 0; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
290 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
291 FORALLvertices |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
292 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
293 if (qh hull_dim == 3) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
294 qh_order_vertexneighbors (vertex); |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
295 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
296 bool infinity_seen = false; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
297 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
298 octave_idx_type idx = qh_pointid (vertex->point); |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
299 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
300 octave_idx_type num_vertices = ni[k++]; |
6945 | 301 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
302 // Qhull seems to sometimes produces regions with a single |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
303 // vertex. Is that a bug? How can a region have just one |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
304 // vertex? Let's skip it. |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
305 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
306 if (num_vertices == 1) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
307 continue; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
308 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
309 RowVector facet_list (num_vertices); |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
310 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
311 octave_idx_type m = 0; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
312 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
313 facetT *neighbor, **neighborp; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
314 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
315 FOREACHneighbor_(vertex) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
316 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
317 if (neighbor->upperdelaunay) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
318 { |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
319 if (! infinity_seen) |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
320 { |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
321 infinity_seen = true; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
322 facet_list(m++) = 1; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
323 at_inf(idx) = true; |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
324 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
325 } |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
326 else |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
327 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
328 if (! neighbor->seen) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
329 { |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
330 i++; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
331 for (octave_idx_type d = 0; d < dim; d++) |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
332 F(i,d) = neighbor->center[d]; |
13871
adf60d6dc1dd
more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents:
13862
diff
changeset
|
333 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
334 neighbor->seen = true; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
335 neighbor->visitid = i; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
336 } |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
337 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
338 facet_list(m++) = neighbor->visitid + 1; |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
339 } |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9786
diff
changeset
|
340 } |
6823 | 341 |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
342 C(idx) = facet_list; |
6823 | 343 } |
20866
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
344 |
2bd3b13e2c8e
2015 Code Sprint: __voronoi__.cc: use ovl().
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
345 retval = ovl (F, C, at_inf); |
6945 | 346 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
347 return retval; |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20866
diff
changeset
|
348 |
6823 | 349 #else |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
350 |
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
351 octave_unused_parameter (args); |
21937
55f7de37b618
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
352 |
21126
ba0a4b4f021d
include errwarn.h in files that use err_disabled_feature conditionally
John W. Eaton <jwe@octave.org>
parents:
21109
diff
changeset
|
353 std::string caller |
ba0a4b4f021d
include errwarn.h in files that use err_disabled_feature conditionally
John W. Eaton <jwe@octave.org>
parents:
21109
diff
changeset
|
354 = (args.length () > 0 |
ba0a4b4f021d
include errwarn.h in files that use err_disabled_feature conditionally
John W. Eaton <jwe@octave.org>
parents:
21109
diff
changeset
|
355 ? args(0).xstring_value ("__voronoi__: CALLER must be a string") |
23829
01899bdd2a3a
Eliminate unnecessary std::string ("...") constructor calls when "..." suffices.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
356 : "__voronoi__"); |
21126
ba0a4b4f021d
include errwarn.h in files that use err_disabled_feature conditionally
John W. Eaton <jwe@octave.org>
parents:
21109
diff
changeset
|
357 |
21109
bd1752782e56
Use err_disabled_feature, warn_disabled_feature throughout code base.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
358 err_disabled_feature (caller, "Qhull"); |
21691
263d18409fdf
Eliminate unused variable warnings for conditionally compiled code.
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
359 |
6823 | 360 #endif |
361 } | |
12805
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
362 |
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
363 /* |
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
364 ## 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
|
365 %!assert (1) |
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
366 */ |