Mercurial > octave-nkf

annotate src/DLD-FUNCTIONS/__voronoi__.cc @ 14309:824e5d362aba stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Qhull calling convention by passing true file pointer to qh_new_qhull * __delaunayn__.cc, __voronoi__.cc, convhulln.cc: Pass file pointer to "/dev/null" for output of Qhull rather than 0.
author Rik <octave@nomad.inbox5.com>
date Wed, 01 Feb 2012 10:37:25 -0800
parents 72c96de7a403
children 3e4350f09a55
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
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 14043
diff changeset
3 Copyright (C) 2000-2012 Kai Habel
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
4
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
5 This file is part of Octave.
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
6
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6945
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6945
diff changeset
10 option) any later version.
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
11
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
15 for more details.
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
16
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6945
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6945
diff changeset
19 <http://www.gnu.org/licenses/>.
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
20
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
21 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
22
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
23 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
24 20. Augiust 2000 - Kai Habel: first release
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
25 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
26
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
27 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
28 2003-12-14 Rafael Laboissiere <rafael@laboissiere.net>
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
29 Added optional second argument to pass options to the underlying
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
30 qhull command
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
31 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
32
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
33 #ifdef HAVE_CONFIG_H
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
34 #include <config.h>
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
35 #endif
9786
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents: 9003
diff changeset
36
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents: 9003
diff changeset
37 #include <cstdio>
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents: 9003
diff changeset
38
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
39 #include <list>
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
40
9003
0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
41 #include "lo-ieee.h"
9786
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents: 9003
diff changeset
42
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
43 #include "Cell.h"
9786
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents: 9003
diff changeset
44 #include "defun-dld.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents: 9003
diff changeset
45 #include "error.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files
John W. Eaton <jwe@octave.org>
parents: 9003
diff changeset
46 #include "oct-obj.h"
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
47
14043
f913363318e0 handle new names and locations of qhull include files (bug #33712)
John W. Eaton <jwe@octave.org>
parents: 13903
diff changeset
48 #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
49 # 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
50 # if defined (NEED_QHULL_VERSION)
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
51 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
52 # endif
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
53 #endif
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
54
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
55 DEFUN_DLD (__voronoi__, args, ,
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
56 "-*- texinfo -*-\n\
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
57 @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
58 @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
59 @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
60 Undocumented internal function.\n\
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
61 @end deftypefn")
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
62 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
63 octave_value_list retval;
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
64
13903
7b5da9754554 __voronoi__: avoid undeclared variable warning
John W. Eaton <jwe@octave.org>
parents: 13880
diff changeset
65 std::string caller = args(0).string_value ();
7b5da9754554 __voronoi__: avoid undeclared variable warning
John W. Eaton <jwe@octave.org>
parents: 13880
diff changeset
66
14043
f913363318e0 handle new names and locations of qhull include files (bug #33712)
John W. Eaton <jwe@octave.org>
parents: 13903
diff changeset
67 #if defined (HAVE_QHULL)
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
68
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
69 retval(0) = 0.0;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
70
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
71 int nargin = args.length ();
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
72 if (nargin < 2 || nargin > 3)
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
73 {
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
74 print_usage ();
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
75 return retval;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
76 }
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
77
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
78 Matrix points = args(1).matrix_value ();
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
79 const octave_idx_type dim = points.columns ();
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
80 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
81
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
82 points = points.transpose ();
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
83
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
84 std::string options;
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
85
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
86 if (dim <= 4)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
87 options = " Qbb";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
88 else
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
89 options = " Qbb Qx";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
90
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
91 if (nargin == 3)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
92 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
93 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
94
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
95 if (opt_arg.is_string ())
13880
1dc120c06ce0 finish previous change to __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13879
diff changeset
96 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
97 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
98 ; // Use default options.
13880
1dc120c06ce0 finish previous change to __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13879
diff changeset
99 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
100 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
101 options = "";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
102
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
103 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
104
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
105 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
106 options += " " + tmp(i);
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
107 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
108 else
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
109 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
110 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
111 caller.c_str ());
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
112 return retval;
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
113 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
114 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
115
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
116 boolT ismalloc = false;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
117
14309
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
118 // 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
119 #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
120 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
121 #else
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
122 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
123 #endif
6880
e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman]
dbateman
parents: 6823
diff changeset
124 FILE *errfile = stderr;
14309
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
125
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
126 if (! outfile)
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
127 {
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
128 error ("__voronoi__: Unable to create temporary file for output.");
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
129 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
130 }
6880
e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman]
dbateman
parents: 6823
diff changeset
131
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
132 // 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
133
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
134 std::string cmd = "qhull v" + options;
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
135
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
136 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
137
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
138 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
139
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
140 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
141 ismalloc, cmd_str, outfile, errfile);
13746
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
142 if (! exitcode)
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
143 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
144 // 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
145 // (sets qh num_good).
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
146
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
147 qh_findgood_all (qh facet_list);
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
148
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
149 octave_idx_type num_voronoi_regions
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
150 = qh num_vertices - qh_setsize (qh del_vertices);
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
151
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
152 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
153
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
154 // Find the voronoi centers for all facets.
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
155
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
156 qh_setvoronoi_all ();
13746
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
157
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
158 facetT *facet;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
159 vertexT *vertex;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
160 octave_idx_type k;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
161
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
162 // 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
163 // 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
164 // of the RowVector objects used to collect them.
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
165
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
166 FORALLfacets
10154
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 facet->seen = false;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
169 }
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
170
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
171 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
172 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
173 ni[i] = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
174
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
175 k = 0;
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
176
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
177 FORALLvertices
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
178 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
179 if (qh hull_dim == 3)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
180 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
181
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
182 bool infinity_seen = false;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
183
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
184 facetT *neighbor, **neighborp;
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
185
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
186 FOREACHneighbor_ (vertex)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
187 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
188 if (neighbor->upperdelaunay)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
189 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
190 if (! infinity_seen)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
191 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
192 infinity_seen = true;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
193 ni[k]++;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
194 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
195 }
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
196 else
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
197 {
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
198 neighbor->seen = true;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
199 ni[k]++;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
200 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
201 }
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
202
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
203 k++;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
204 }
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
205
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
206 // 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
207 // 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
208 // as many elements as the given points array.
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
209
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
210 // FIXME -- is it possible (or does it make sense) for
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
211 // 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
212
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
213 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
214 ? num_points : num_voronoi_regions);
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
215
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
216 boolMatrix at_inf (nr, 1, false);
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
217
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
218 // 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
219 // Inf.
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
220 Matrix F (num_voronoi_vertices+1, dim);
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
221
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
222 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
223 F(0,d) = octave_Inf;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
224
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
225 // 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
226 // vertices of the Voronoi regions (cells).
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
227
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
228 Cell C (nr, 1);
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
229
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
230 // 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
231 // 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
232 // for the cells.
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
233
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
234 FORALLfacets
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
235 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
236 facet->seen = false;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
237 }
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
238
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
239 octave_idx_type i = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
240 k = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
241
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
242 FORALLvertices
10154
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 if (qh hull_dim == 3)
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
245 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
246
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
247 bool infinity_seen = false;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
248
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
249 octave_idx_type idx = qh_pointid (vertex->point);
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
250
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
251 octave_idx_type num_vertices = ni[k++];
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
252
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
253 // 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
254 // 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
255 // vertex? Let's skip it.
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
256
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
257 if (num_vertices == 1)
13862
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
258 continue;
6d7e133a4bed compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13746
diff changeset
259
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
260 RowVector facet_list (num_vertices);
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
261
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
262 octave_idx_type m = 0;
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
263
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
264 facetT *neighbor, **neighborp;
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
265
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
266 FOREACHneighbor_(vertex)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
267 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
268 if (neighbor->upperdelaunay)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
269 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
270 if (! infinity_seen)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
271 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
272 infinity_seen = true;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
273 facet_list(m++) = 1;
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
274 at_inf(idx) = true;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
275 }
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
276 }
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11553
diff changeset
277 else
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
278 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
279 if (! neighbor->seen)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
280 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
281 i++;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
282 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
283 F(i,d) = neighbor->center[d];
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
284
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
285 neighbor->seen = true;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
286 neighbor->visitid = i;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
287 }
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
288
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
289 facet_list(m++) = neighbor->visitid + 1;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
290 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
291 }
13871
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 C(idx) = facet_list;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9786
diff changeset
294 }
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
295
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
296 retval(2) = at_inf;
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
297 retval(1) = C;
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
298 retval(0) = F;
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
299 }
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
300 else
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
301 error ("%s: qhull failed", caller.c_str ());
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
302
13871
adf60d6dc1dd more compatibility fixes for __voronoi__
John W. Eaton <jwe@octave.org>
parents: 13862
diff changeset
303 // 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
304 qh_freeqhull (! qh_ALL);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
305
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
306 int curlong, totlong;
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
307 qh_memfreeshort (&curlong, &totlong);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
308
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346)
Rik <octave@nomad.inbox5.com>
parents: 13203
diff changeset
309 if (curlong || totlong)
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
310 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
311 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
312
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
313 #else
13879
440d7914cf01 fix regression in __voronoi__ and convhulln option processing
John W. Eaton <jwe@octave.org>
parents: 13871
diff changeset
314 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
315 #endif
6945
6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe]
jwe
parents: 6880
diff changeset
316
6823
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
317 return retval;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman]
dbateman
parents:
diff changeset
318 }
12805
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
319
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
320 /*
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
321
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
322 ## 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
323 %!assert (1)
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
324
3641167e5b75 codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
325 */