Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dfd3762

Browse files
committed
Qhull 8.1-alpha4 GitHub 2024/07/21
Build changes - CMakeLists.txt: properly express dependency of qhullcpp to qhullstatic_r [SpaceIm, M. Valgur #128] - qhull-exports.def,*.def: Add DATA after qh_version and qh_version2 [B. Sanders #139] - other symbols in *.def are CODE symbols exported to Windows Documentation changes - qconvex,qhalf.htm: OFF format 'o' is points instead of vertices [B. Guang #134] - libqhull_r.h,global_r,merge_r.c: Change Q15-check-duplicates to 'Q17' as coded [djerius #140] - libqhull.h,global,merge.c: Change Q15-check-duplicates to 'Q17' as coded (pre-Q2019.0.1) - qconvex_r,qdelaun_r,qhalf_r,unix_r,qvoronoi_r.c::hidden_options: Change Q15 to Q17 - qconvex,qdelaun,qhalf,unix,qvoronoi.c::hidden_options: Change Q15 to Q17 - Qhull::s_not_output_options: Change Q15 to Q17 - q_test-ok.txt,qh-code,qh-optq,qh-quick,qhull.htm,qhull.man,qhull.txt: Change to Q17
1 parent 41dcda7 commit dfd3762

27 files changed

Lines changed: 82 additions & 68 deletions

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
# Backup and data files
55
eg/eg.*
6+
eg/qhull-benchmark*.*
67
*~
78
*.bak
89
*.off
@@ -41,6 +42,7 @@ build/*/Debug/*
4142
build/*/MinSizeRel/*
4243
build/*/RelWithDebInfo/*
4344
libq
45+
lib
4446
*.a
4547
*.autosave
4648
*.dll

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
# Remove CMAKE_INTDIR from PreprocessorDefinitions
6666
# Adjust target names and destinations (e.g., lib/libqhullstatic_rd.a)
6767
#
68-
# $Id: //main/2019/qhull/CMakeLists.txt#22 $$Change: 3396 $
69-
# $DateTime: 2023/01/02 16:59:48 $$Author: bbarber $
68+
# $Id: //main/2019/qhull/CMakeLists.txt#23 $$Change: 3664 $
69+
# $DateTime: 2024/07/22 23:55:01 $$Author: bbarber $
7070

7171
cmake_minimum_required(VERSION 3.0)
7272
project(qhull)

eg/q_test-ok.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6363,7 +6363,7 @@ Except for 'F.' and 'PG', upper-case options take an argument.
63636363
Q0-no-premerge Q1-angle-merge Q2-no-independ Q3-no-redundant
63646364
Q4-no-old Q5-no-check-out Q6-no-concave Q7-depth-first
63656365
Q8-no-near-in Q9-pick-furthest Q10-no-narrow Q11-trinormals
6366-
Q12-allow-wide Q14-merge-pinched Q15-duplicates
6366+
Q12-allow-wide Q14-merge-pinched Q17-duplicates
63676367

63686368
TFacet-log TInput-file TOutput-file Tstatistics Tverify
63696369
Tz-stdout
@@ -14378,7 +14378,7 @@ Qhull extra options:
1437814378
Q11 - copy normals and recompute centrums for tricoplanar facets
1437914379
Q12 - allow wide facets and wide dupridge
1438014380
Q14 - merge pinched vertices that create a dupridge
14381-
Q15 - check for duplicate ridges with the same vertices
14381+
Q17 - check for duplicate ridges with the same vertices
1438214382

1438314383
T options:
1438414384
TFn - report summary when n or more facets created
@@ -15558,7 +15558,7 @@ qhull(1) qhull(1)
1555815558

1555915559
Q14 With 'Q14', Qhull merges pinched vertices that create a dupridge.
1556015560

15561-
Q15 With 'Q15', Qhull checks for duplicate ridges with the same vertices.
15561+
Q17 With 'Q17', Qhull checks for duplicate ridges with the same vertices.
1556215562

1556315563
Trace options
1556415564

html/qh-code.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ <h2><a href="#TOC">&#187;</a><a name="debug">How to debug</a> Qhull</h2>
819819

820820
<p>Qhull continually checks its execution, so most errors will stop Qhull with an error message.
821821
Additional checking occurs for verified output ('<a href="qh-optt.htm#Tv">Tv</a>'), check
822-
frequently ('<a href="qh-optt.htm#Tc">Tc</a>'), check for duplicate ridges ('<a href="qh-optq.htm#Q15">Q15</a>'),
822+
frequently ('<a href="qh-optt.htm#Tc">Tc</a>'), check for duplicate ridges ('<a href="qh-optq.htm#Q17">Q17</a>'),
823823
and tracing at level 4 ('<a href="qh-optt.htm#Tn">T4</a>'). </p>
824824

825825
<p>If Qhull detects an error, it writes a descriptive error message to stderr, and exits with an exit status code (see following).
@@ -1252,7 +1252,7 @@ <h2><a href="#TOC">&#187;</a><a name="enhance">Enhancements to Qhull</a></h2>
12521252
- Develop a theory for merging Qhull's non-simplicial facets
12531253
A merge creates constraints on subsequent merges, what are these constraints?
12541254
Identify topological errors in qh_findbest_test (merge_r.c)f
1255-
Prevent duplicate ridges (Q15-check-duplicates) or facets with the same vertices
1255+
Prevent duplicate ridges (Q17-check-duplicates) or facets with the same vertices
12561256
Preserve facet-ridge orientation for nonsimplicial facets (ridge top/bot)
12571257
Produce conformant triangulations for nonsimplicial facets (option 'Qt', QH2088)
12581258
Should vertex merge account for facet orientation?

html/qh-optq.htm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ <h2>Qhull control options</h2>
137137
<dd>allow wide facets and wide dupridge</dd>
138138
<dt><a href="#Q14">Q14</a></dt>
139139
<dd>merge pinched vertices that create a dupridge</dd>
140-
<dt><a href="#Q15">Q15</a></dt>
140+
<dt><a href="#Q17">Q17</a></dt>
141141
<dd>check for duplicate ridges with the same vertices</dd>
142142
</dl>
143143

@@ -757,15 +757,15 @@ <h3><a href="#qhull">&#187;</a><a name="Q14">Q14 - merge pinched vertices due to
757757
"Nearly adjacent vertices within 1e-13" in <a href="qh-impre.htm">Imprecision in Qhull</a>).
758758
With option 'Q14', Qhull merges nearly adjacent vertices when they create a dupridge.
759759

760-
<h3><a href="#qhull">&#187;</a><a name="Q15">Q15 - check for duplicate ridges with the same vertices</a></h3>
760+
<h3><a href="#qhull">&#187;</a><a name="Q17">Q17 - check for duplicate ridges with the same vertices</a></h3>
761761

762-
<p>Option 'Q15' (qh.CHECKduplicates) checks for duplicate ridges after each merge (qh_maybe_duplicateridges,
762+
<p>Option 'Q17' (qh.CHECKduplicates) checks for duplicate ridges after each merge (qh_maybe_duplicateridges,
763763
qh_checkfacet).
764764
Duplicate ridges have the same vertices. It is a topological error for convex hulls.
765765
Qhull resolves a duplicate ridge by merging vertices and partitioning the deleted vertex as a coplanar
766766
point (qh_renamevertex).
767767

768-
<p>Option 'Q15' does not prevent duplicate ridges for non-neighboring facets, nor does it prevent other topological
768+
<p>Option 'Q17' does not prevent duplicate ridges for non-neighboring facets, nor does it prevent other topological
769769
errors such as inconsistent facet orientation. Resolving a duplicate ridge may itself lead to topological errors
770770
and wide facets.
771771

html/qh-quick.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,8 @@ <h1><a
397397
Q12-allow-wide
398398
</nobr></td><td><nobr>'<a href="qh-optq.htm#Q14">Q14</a>'
399399
Q14-merge-pinched
400-
</nobr></td><td><nobr>'<a href="qh-optq.htm#Q15">Q15</a>'
401-
Q15-duplicate-ridges
400+
</nobr></td><td><nobr>'<a href="qh-optq.htm#Q17">Q17</a>'
401+
Q17-duplicate-ridges
402402

403403
</nobr></td></tr>
404404
<tr><td>&nbsp;</td></tr><tr>

html/qhull.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ <h3><a href="#TOP">&#187;</a><a name="options">qhull options</a></h3>
335335
Q11 - copy normals and recompute centrums for tricoplanar facets
336336
Q12 - allow wide facets and wide dupridge
337337
Q14 - merge pinched vertices that create a dupridge
338-
Q15 - check for duplicate ridges with the same vertices
338+
Q17 - check for duplicate ridges with the same vertices
339339

340340
T options:
341341
TFn - report summary when n or more facets created

html/qhull.man

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,8 @@ With 'Q12', Qhull allows wide facets and wide dupridge.
869869
Q14
870870
With 'Q14', Qhull merges pinched vertices that create a dupridge.
871871
.TP
872-
Q15
873-
With 'Q15', Qhull checks for duplicate ridges with the same vertices.
872+
Q17
873+
With 'Q17', Qhull checks for duplicate ridges with the same vertices.
874874
.PP
875875
.TP
876876
Trace options

html/qhull.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ qhull(1) qhull(1)
10411041

10421042
Q14 With 'Q14', Qhull merges pinched vertices that create a dupridge.
10431043

1044-
Q15 With 'Q15', Qhull checks for duplicate ridges with the same vertices.
1044+
Q17 With 'Q17', Qhull checks for duplicate ridges with the same vertices.
10451045

10461046
Trace options
10471047

src/Changes.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$Id: //main/2019/qhull/src/Changes.txt#85 $$Date: 2023/01/09 $
1+
$Id: //main/2019/qhull/src/Changes.txt#86 $$Date: 2024/07/22 $
22

33
.............This file lists all changes to qhull and rbox.....................
44

@@ -45,9 +45,21 @@ Qhull 2.0 (1994-1995)
4545
==================
4646
== Qhull 2018-2023
4747
==================
48+
Qhull 8.1-alpha4 GitHub 2024/07/21
4849

49-
next release
50+
Build changes
51+
- CMakeLists.txt: properly express dependency of qhullcpp to qhullstatic_r [SpaceIm, M. Valgur #128]
52+
- qhull-exports.def,*.def: Add DATA after qh_version and qh_version2 [B. Sanders #139]
53+
- other symbols in *.def are CODE symbols exported to Windows
54+
55+
Documentation changes
5056
- qconvex,qhalf.htm: OFF format 'o' is points instead of vertices [B. Guang #134]
57+
- libqhull_r.h,global_r,merge_r.c: Change Q15-check-duplicates to 'Q17' as coded [djerius #140]
58+
- libqhull.h,global,merge.c: Change Q15-check-duplicates to 'Q17' as coded (pre-Q2019.0.1)
59+
- qconvex_r,qdelaun_r,qhalf_r,unix_r,qvoronoi_r.c::hidden_options: Change Q15 to Q17
60+
- qconvex,qdelaun,qhalf,unix,qvoronoi.c::hidden_options: Change Q15 to Q17
61+
- Qhull::s_not_output_options: Change Q15 to Q17
62+
- q_test-ok.txt,qh-code,qh-optq,qh-quick,qhull.htm,qhull.man,qhull.txt: Change to Q17
5163

5264
------------
5365
Qhull 8.1-alpha3 GitHub 2023/01/02
@@ -427,7 +439,7 @@ Qhull options
427439
- New option 'Tf': flush after qh_fprintf for debugging segfaults
428440
- New experimental option 'Q14-merge-pinched-vertices': merge pinched vertices due to dupridge
429441
Excessive merging leads to additional topological and wide facet errors
430-
- New experimental option 'Q15-check-duplicates': check for duplicate ridges with the same vertices
442+
- New experimental option 'Q17-check-duplicates': check for duplicate ridges with the same vertices
431443
- Option 'Q1' merges by mergetype/angle instead of mergetype/distance, coplanar merges first
432444
In 2015.2 by default, Qhull merged by mergetype/angle with lower angles first
433445
- Option 'TP-1' turns on tracing after qh_buildhull and qh_postmerge

0 commit comments

Comments
 (0)