From ad17c18b8f280c006c0e8c16c2da999d84451dad Mon Sep 17 00:00:00 2001
From: Brad Barber <bradb@shore.net>
Date: Fri, 8 Jan 2010 19:15:04 -0500
Subject: [PATCH] Reviewing FIXUPs
---
README.txt | 2 +-
cpp/Coordinates.h | 8 +-
cpp/PointCoordinates.h | 8 +-
cpp/Qhull.cpp | 12 +-
cpp/Qhull.h | 8 +-
cpp/QhullFacet.cpp | 20 +-
cpp/QhullFacet.h | 16 +-
cpp/QhullFacetList.h | 10 +-
cpp/QhullFacetSet.h | 8 +-
cpp/QhullHyperplane.cpp | 8 +-
cpp/QhullHyperplane.h | 8 +-
cpp/QhullLinkedList.h | 6 +-
cpp/QhullLog.cpp | 6 +-
cpp/QhullPoint.cpp | 12 +-
cpp/QhullPoint.h | 12 +-
cpp/QhullPointSet.h | 12 +-
cpp/QhullPoints.h | 10 +-
cpp/QhullRidge.cpp | 10 +-
cpp/QhullRidge.h | 6 +-
cpp/QhullSet.cpp | 6 +-
cpp/QhullSet.h | 6 +-
cpp/QhullVertex.cpp | 6 +-
cpp/RboxPoints.cpp | 6 +-
cpp/UsingLibQhull.cpp | 8 +-
cpp/road/RoadError.cpp | 5 +-
cpp/road/RoadError.h | 6 +-
project/libqhull.vcproj | 1268 ++++++++++++++++++++-------------------
src/Changes.txt | 22 +-
src/io.c | 6 +-
src/libqhull.h | 8 +-
src/user.h | 2 +
31 files changed, 772 insertions(+), 759 deletions(-)
diff --git a/README.txt b/README.txt
index 2cfe53a..ad5ebf7 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
Name
- qhull, rbox 2010.1 2010/01/06
+ qhull, rbox 2010.1 2010/01/07
Convex hull, Delaunay triangulation, Voronoi diagrams, Halfspace intersection
diff --git a/cpp/Coordinates.h b/cpp/Coordinates.h
index cc6679c..1edb706 100644
--- a/cpp/Coordinates.h
+++ b/cpp/Coordinates.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Coordinates.h#32 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/Coordinates.h#33 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -180,7 +180,7 @@ public:
bool operator>(const Coordinates::const_iterator &other) const { return *this>reinterpret_cast<const iterator &>(other); }
bool operator>=(const Coordinates::const_iterator &other) const { return *this>=reinterpret_cast<const iterator &>(other); }
- iterator operator++() { return iterator(++i); } //FIXUP Should return reference, but get reference to temporary
+ iterator operator++() { return iterator(++i); } //FIXUP QH10000 Should return reference, but get reference to temporary
iterator operator++(int) { return iterator(i++); }
iterator operator--() { return iterator(--i); }
iterator operator--(int) { return iterator(i--); }
@@ -221,7 +221,7 @@ public:
bool operator>(const const_iterator &other) const { return i>other.i; }
bool operator>=(const const_iterator &other) const { return i>=other.i; }
- const_iterator operator++() { return const_iterator(++i); } //FIXUP -- too much copying
+ const_iterator operator++() { return const_iterator(++i); } //FIXUP QH10000 -- too much copying
const_iterator operator++(int) { return const_iterator(i++); }
const_iterator operator--() { return const_iterator(--i); }
const_iterator operator--(int) { return const_iterator(i--); }
diff --git a/cpp/PointCoordinates.h b/cpp/PointCoordinates.h
index 5b07c8a..4ded776 100644
--- a/cpp/PointCoordinates.h
+++ b/cpp/PointCoordinates.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/PointCoordinates.h#15 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/PointCoordinates.h#16 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -88,7 +88,7 @@ public:
PointCoordinates operator+(const PointCoordinates &other) const;
#//Modify
- //FIXUP 2009: Add clear() and other modify operators from Coordinates.h. Include QhullPoint::operator=()
+ //FIXUP QH10001: Add clear() and other modify operators from Coordinates.h. Include QhullPoint::operator=()
void append(int count, const coordT *c); //! Dimension previously defined
void append(const coordT &c) { append(1, &c); } //! Dimension previously defined
void append(const QhullPoint &p);
@@ -138,7 +138,7 @@ class PointCoordinatesIterator
return false; }
};//CoordinatesIterator
-// FIXUP 2009: Add MutablePointCoordinatesIterator after adding modify operators
+// FIXUP QH10002: Add MutablePointCoordinatesIterator after adding modify operators
\
}//namespace orgQhull
diff --git a/cpp/Qhull.cpp b/cpp/Qhull.cpp
index fcdae4d..23d9355 100644
--- a/cpp/Qhull.cpp
+++ b/cpp/Qhull.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Qhull.cpp#42 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/Qhull.cpp#43 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -134,7 +134,7 @@ Qhull::
qhull_run_id= UsingLibQhull::NOqhRunId;
// Except for cerr, does not throw errors
if(hasQhullMessage()){
- cerr<< "\nQhull output at end\n"; //FIXUP 2009: where should error and log messages go on ~Qhull?
+ cerr<< "\nQhull output at end\n"; //FIXUP QH10005: where should error and log messages go on ~Qhull?
cerr<<qhullMessage();
clearQhullMessage();
}
@@ -172,7 +172,7 @@ bool Qhull::
hasQhullMessage() const
{
return (!qhull_message.empty() || qhull_status!=qh_ERRnone);
- //FIXUP 2009 -- inconsistent usage with Rbox. hasRboxMessage just tests rbox_status. No appendRboxMessage()
+ //FIXUP QH10006 -- inconsistent usage with Rbox. hasRboxMessage just tests rbox_status. No appendRboxMessage()
}
//! qhullMessage does not throw errors (~Qhull)
@@ -417,7 +417,7 @@ maybeThrowQhullMessage(int exitCode)
if(qhull_status!=qh_ERRnone){
QhullError e(qhull_status, qhull_message);
clearQhullMessage();
- throw e; // FIXUP 2009: copy constructor is expensive if logging
+ throw e; // FIXUP QH10007: copy constructor is expensive if logging
}
}//maybeThrowQhullMessage
@@ -480,7 +480,7 @@ void qh_fprintf(FILE *fp, int msgcode, const char *fmt, ... ) {
va_end(args);
return;
}
- // FIXUP 2009: how do users trap messages and handle input? A callback?
+ // FIXUP QH10008: how do users trap messages and handle input? A callback?
char newMessage[MSG_MAXLEN];
vsnprintf(newMessage, sizeof(newMessage), fmt, args);
out->appendQhullMessage(newMessage);
diff --git a/cpp/Qhull.h b/cpp/Qhull.h
index db384e0..850760e 100644
--- a/cpp/Qhull.h
+++ b/cpp/Qhull.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Qhull.h#37 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/Qhull.h#38 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -59,7 +59,7 @@ private:
public:
Coordinates feasiblePoint; //! feasible point for half-space intersection
bool useOutputStream; //! Set if using outputStream
- // FIXUP 2009 feasiblePoint useOutputStream as field or getter?
+ // FIXUP QH10003 feasiblePoint useOutputStream as field or getter?
#//constructor, assignment, destructor, invariant
Qhull(); //! Qhull::runQhull() must be called next
@@ -73,7 +73,7 @@ private:
public:
#//virtual methods
- //FIXUP 2009 -- qh_memfree, etc. as virtual?
+ //FIXUP QH10004 -- qh_memfree, etc. as virtual?
#//Messaging
void appendQhullMessage(const std::string &s);
diff --git a/cpp/QhullFacet.cpp b/cpp/QhullFacet.cpp
index 180a3a6..c6d38bc 100644
--- a/cpp/QhullFacet.cpp
+++ b/cpp/QhullFacet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacet.cpp#34 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullFacet.cpp#35 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -124,7 +124,7 @@ tricoplanarOwner() const
}
return qh_facet->f.triowner;
}
- return 0; // FIXUP 2009 Should false be the NULL facet or empty facet
+ return 0; // FIXUP QH10009 Should false be the NULL facet or empty facet
}//tricoplanarOwner
QhullPoint QhullFacet::
@@ -251,11 +251,11 @@ operator<<(ostream &os, const QhullFacet::PrintCenter &pr)
f->center= qh_facetcenter(f->vertices);
}
for(int k=0; k<numCoords; k++){
- os << f->center[k] << " "; // FIXUP 2009 qh_REAL_1
+ os << f->center[k] << " "; // FIXUP QH10010 qh_REAL_1
}
}else{
for(int k=0; k<numCoords; k++){
- os << qh_INFINITE << " "; // FIXUP 2009 qh_REAL_1
+ os << qh_INFINITE << " "; // FIXUP QH10010 qh_REAL_1
}
}
}else{ // qh CENTERtype==qh_AScentrum
@@ -267,7 +267,7 @@ operator<<(ostream &os, const QhullFacet::PrintCenter &pr)
f->center= qh_getcentrum(f);
}
for(int k=0; k<numCoords; k++){
- os << f->center[k] << " "; // FIXUP 2009 qh_REAL_1
+ os << f->center[k] << " "; // FIXUP QH10010 qh_REAL_1
}
}
if(pr.print_format==qh_PRINTgeom && numCoords==2){
@@ -357,7 +357,7 @@ operator<<(ostream &os, const QhullFacet::PrintHeader &pr)
os << "- f" << facet.id() << endl;
os << facet.printFlags(" - flags:");
if(f->isarea){
- os << " - area: " << f->f.area << endl; //FIXUP 2009 2.2g
+ os << " - area: " << f->f.area << endl; //FIXUP QH10010 2.2g
}else if(qh NEWfacets && f->visible && f->f.replace){
os << " - replacement: f" << f->f.replace->id << endl;
}else if(f->newfacet){
@@ -374,13 +374,13 @@ operator<<(ostream &os, const QhullFacet::PrintHeader &pr)
if(f->nummerge){
os << " - merges: " << f->nummerge << endl;
}
- os << facet.hyperplane().print(" - normal: ", "\n - offset: "); // FIXUP 2009 %10.7g
+ os << facet.hyperplane().print(" - normal: ", "\n - offset: "); // FIXUP QH10010 %10.7g
if(qh CENTERtype==qh_ASvoronoi || f->center){
os << facet.printCenter(pr.run_id, qh_PRINTfacets, " - center: ");
}
#if qh_MAXoutside
if(f->maxoutside > qh DISTround){
- os << " - maxoutside: " << f->maxoutside << endl; //FIXUP 2009 %10.7g
+ os << " - maxoutside: " << f->maxoutside << endl; //FIXUP QH10010 %10.7g
}
#endif
QhullPointSet ps= facet.outsidePoints();
@@ -399,7 +399,7 @@ operator<<(ostream &os, const QhullFacet::PrintHeader &pr)
os << furthest.print(pr.run_id, " Furthest");
}
#if !qh_COMPUTEfurthest
- os << " - furthest distance= " << f->furthestdist << endl; //FIXUP 2009 %2.2g
+ os << " - furthest distance= " << f->furthestdist << endl; //FIXUP QH10010%2.2g
#endif
}
QhullPointSet cs= facet.coplanarPoints();
diff --git a/cpp/QhullFacet.h b/cpp/QhullFacet.h
index 85e6e42..72ced30 100644
--- a/cpp/QhullFacet.h
+++ b/cpp/QhullFacet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacet.h#36 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullFacet.h#37 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -99,7 +99,7 @@ public:
#//IO
struct PrintCenter{
- QhullFacet *facet; //! Not const due to facet.center()
+ QhullFacet *facet; // non-const due to facet.center()
const char *message;
int run_id;
qh_PRINT print_format;
@@ -108,28 +108,28 @@ public:
PrintCenter printCenter(int qhRunId, qh_PRINT printFormat, const char *message) { return PrintCenter(qhRunId, *this, printFormat, message); }
struct PrintFacet{
- QhullFacet *facet; //! FIXUP, non-const due to f->center()
+ QhullFacet *facet; // non-const due to f->center()
int run_id;
PrintFacet(int qhRunId, QhullFacet &f) : facet(&f), run_id(qhRunId) {}
};//PrintFacet
PrintFacet print(int qhRunId) { return PrintFacet(qhRunId, *this); }
struct PrintFlags{
- const QhullFacet *facet; // Pointer to allow as subclass
+ const QhullFacet *facet;
const char *message;
PrintFlags(const QhullFacet &f, const char *s) : facet(&f), message(s) {}
};//PrintFlags
PrintFlags printFlags(const char *message) const { return PrintFlags(*this, message); }
struct PrintHeader{
- QhullFacet *facet; //! FIXUP, non-const due to f->center()
+ QhullFacet *facet; // non-const due to f->center()
int run_id;
PrintHeader(int qhRunId, QhullFacet &f) : facet(&f), run_id(qhRunId) {}
};//PrintHeader
PrintHeader printHeader(int qhRunId) { return PrintHeader(qhRunId, *this); }
struct PrintRidges{
- QhullFacet *facet;
+ const QhullFacet *facet;
int run_id;
PrintRidges(int qhRunId, QhullFacet &f) : facet(&f), run_id(qhRunId) {}
};//PrintRidges
@@ -146,6 +146,6 @@ std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacet::PrintFlag
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacet::PrintHeader &pr);
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacet::PrintRidges &pr);
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacet::PrintFacet &pr);
-std::ostream &operator<<(std::ostream &os, orgQhull::QhullFacet &f); //FIXUP. No conversion! { os << f.print(orgQhull::UsingLibQhull::NOqhRunId); return os; } // FIXUP non-const due to center. Make it mutable?
+std::ostream &operator<<(std::ostream &os, orgQhull::QhullFacet &f); // non-const due to qh_getcenter()
#endif // QHULLFACET_H
diff --git a/cpp/QhullFacetList.h b/cpp/QhullFacetList.h
index 9a4ed79..2d678b3 100644
--- a/cpp/QhullFacetList.h
+++ b/cpp/QhullFacetList.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetList.h#22 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullFacetList.h#23 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -97,10 +97,6 @@ public:
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetList::PrintFacetList &p);
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetList::PrintFacets &p);
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetList::PrintVertices &p);
-
-// FIXUP -- why did <<facetList work and the others did not?
-// print() not available since printVertices() requires qhRunId.
-// [9/09] added const
-inline std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetList &fs) { os << fs.printFacets(orgQhull::UsingLibQhull::NOqhRunId); return os; }
+std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetList &fs) { os << fs.printFacets(orgQhull::UsingLibQhull::NOqhRunId); return os; }
#endif // QHULLFACETLIST_H
diff --git a/cpp/QhullFacetSet.h b/cpp/QhullFacetSet.h
index 7af7f9e..57bfa43 100644
--- a/cpp/QhullFacetSet.h
+++ b/cpp/QhullFacetSet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetSet.h#20 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullFacetSet.h#21 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -67,7 +67,7 @@ public:
// Not same as QhullFacetList#IO. A QhullFacetSet is a component of a QhullFacetList.
struct PrintFacetSet{
- const QhullFacetSet *facet_set; // FIXUP should Print... use pointers?
+ const QhullFacetSet *facet_set;
const char *message;
int run_id;
PrintFacetSet(int qhRunId, const char *message, const QhullFacetSet *s) : facet_set(s), message(message), run_id(qhRunId) {}
@@ -87,7 +87,7 @@ public:
#//== Global namespace =========================================
-std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetSet &fs); // FIXUP no 'const ...PrintFacetSet as below! { os << fs.print(orgQhull::UsingLibQhull::NOqhRunId, ""); }
+std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetSet &fs); // FIXUP QH10000 no 'const ...PrintFacetSet as below! { os << fs.print(orgQhull::UsingLibQhull::NOqhRunId, ""); }
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetSet::PrintFacetSet &pr);
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullFacetSet::PrintIdentifiers &p);
diff --git a/cpp/QhullHyperplane.cpp b/cpp/QhullHyperplane.cpp
index dc3e43f..406d96b 100644
--- a/cpp/QhullHyperplane.cpp
+++ b/cpp/QhullHyperplane.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.cpp#9 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.cpp#10 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -131,9 +131,9 @@ operator<<(ostream &os, const QhullHyperplane::PrintHyperplane &pr)
for(int k=p.dimension(); k--; ){
realT r= *c++;
if(pr.hyperplane_message){
- os << " " << r; // FIXUP %8.4g
+ os << " " << r; // FIXUP QH10010 %8.4g
}else{
- os << " " << r; // FIXUP qh_REAL_1
+ os << " " << r; // FIXUP QH10010 qh_REAL_1
}
}
if(pr.hyperplane_offset_message){
diff --git a/cpp/QhullHyperplane.h b/cpp/QhullHyperplane.h
index 3caac47..cde6f48 100644
--- a/cpp/QhullHyperplane.h
+++ b/cpp/QhullHyperplane.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.h#11 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.h#12 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -99,7 +99,7 @@ public:
#//IO
struct PrintHyperplane{
- const QhullHyperplane *hyperplane; //! FIXUP elsewhere. const is OK now
+ const QhullHyperplane *hyperplane;
const char *hyperplane_message;
const char *hyperplane_offset_message;
PrintHyperplane(const char *message, const char *offsetMessage, const QhullHyperplane &p) : hyperplane(&p), hyperplane_message(message), hyperplane_offset_message(offsetMessage) {}
@@ -116,7 +116,7 @@ QHULL_DECLARE_SEQUENTIAL_ITERATOR(QhullHyperplane, coordT)
#//Global functions
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullHyperplane::PrintHyperplane &pr);
-std::ostream &operator<<(std::ostream &os, const orgQhull::QhullHyperplane &p); //FIXUP -- multiple instances if define here
+std::ostream &operator<<(std::ostream &os, const orgQhull::QhullHyperplane &p); //FIXUP QH10000 -- multiple instances if define here
#endif // QHHYPERPLANE_H
diff --git a/cpp/QhullLinkedList.h b/cpp/QhullLinkedList.h
index d88a9e1..be22b80 100644
--- a/cpp/QhullLinkedList.h
+++ b/cpp/QhullLinkedList.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullLinkedList.h#31 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullLinkedList.h#32 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -177,7 +177,7 @@ public:
};//QhullLinkedList
template <typename T>
-class QhullLinkedListIterator // FiXUP define QhullMutableLinkedListIterator
+class QhullLinkedListIterator // FiXUP QH10000 define QhullMutableLinkedListIterator
{
typedef typename QhullLinkedList<T>::const_iterator const_iterator;
const QhullLinkedList<T> *c;
diff --git a/cpp/QhullLog.cpp b/cpp/QhullLog.cpp
index a8b26da..613206e 100644
--- a/cpp/QhullLog.cpp
+++ b/cpp/QhullLog.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullLog.cpp#10 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullLog.cpp#11 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -137,7 +137,7 @@ maybeCullEvents()
{
if(a_tail>=a_tail_end){
if(a_tail-a_tail_end > a_max_overrun){
- a_max_overrun= a_tail-a_tail_end; //FIXUP -- race condition
+ a_max_overrun= a_tail-a_tail_end; //FIXUP -- race condition, code not in Qhull
}
a_tail= 0;
}
diff --git a/cpp/QhullPoint.cpp b/cpp/QhullPoint.cpp
index e666041..1e6e257 100644
--- a/cpp/QhullPoint.cpp
+++ b/cpp/QhullPoint.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoint.cpp#26 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullPoint.cpp#27 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -61,7 +61,7 @@ operator==(const QhullPoint &other) const
dist2 += diff*diff;
}
double epsilon= UsingLibQhull::globalDistanceEpsilon();
- // std::cout << "FIXUP dist2 " << dist2 << " epsilon^2 " << epsilon*epsilon << std::endl;
+ // std::cout << "DEBUG dist2 " << dist2 << " epsilon^2 " << epsilon*epsilon << std::endl;
return (dist2<=(epsilon*epsilon));
}//operator==
@@ -133,7 +133,7 @@ operator<<(ostream &os, const QhullPoint &p)
ostream &
operator<<(ostream &os, const QhullPoint::PrintPoint &pr)
{
- QhullPoint p= *pr.point; // FIXUP null point
+ QhullPoint p= *pr.point;
int i= p.id(pr.run_id);
if(pr.point_message){
if(*pr.point_message){
@@ -147,9 +147,9 @@ operator<<(ostream &os, const QhullPoint::PrintPoint &pr)
for(int k=p.dimension(); k--; ){
realT r= *c++;
if(pr.point_message){
- os << " " << r; // FIXUP %8.4g
+ os << " " << r; // FIXUP QH10010 %8.4g
}else{
- os << " " << r; // FIXUP qh_REAL_1
+ os << " " << r; // FIXUP QH10010 qh_REAL_1
}
}
os << std::endl;
diff --git a/cpp/QhullPoint.h b/cpp/QhullPoint.h
index 2311a61..f0221e8 100644
--- a/cpp/QhullPoint.h
+++ b/cpp/QhullPoint.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoint.h#32 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullPoint.h#33 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -35,10 +35,6 @@ private:
#//Fields
coordT *point_coordinates; // Keep pointers aligned
int point_dimension;
- //FIXUP C2063: 'operator<<' : not a function
- //friend std::ostream & ::operator<<(std::ostream &os, QhullPoint &p);
- //FIXUP QhullFacet_test.cpp error C2679: binary '<<' : no operator found which takes a right-hand operand of type 'orgQhull::Coordinates'
- //friend std::ostream &operator<<(std::ostream &os, QhullPoint &p);
public:
#//Subtypes
@@ -108,7 +104,7 @@ public:
coordT &operator[](int idx) { QHULL_ASSERT(idx>=0 && idx<point_dimension); return *(point_coordinates+idx); }
struct PrintPoint{
- const QhullPoint *point; //! FIXUP elsewhere. const is OK now
+ const QhullPoint *point;
const char *point_message;
int run_id;
bool with_identifier;
@@ -128,7 +124,7 @@ QHULL_DECLARE_SEQUENTIAL_ITERATOR(QhullPoint, coordT)
#//Global functions
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullPoint::PrintPoint &pr);
-std::ostream &operator<<(std::ostream &os, const orgQhull::QhullPoint &p); // FIXUP OK in c program but not inline { os << p.print(orgQhull::UsingLibQhull::NOqhRunId, ""); return os; }
+std::ostream &operator<<(std::ostream &os, const orgQhull::QhullPoint &p); // FIXUP QH10000 OK in c program but not inline { os << p.print(orgQhull::UsingLibQhull::NOqhRunId, ""); return os; }
#endif // QHPOINT_H
diff --git a/cpp/QhullPointSet.h b/cpp/QhullPointSet.h
index a64bfcd..75d75bf 100644
--- a/cpp/QhullPointSet.h
+++ b/cpp/QhullPointSet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPointSet.h#18 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullPointSet.h#19 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -45,7 +45,7 @@ public:
typedef QhullPoint value_type;
typedef ptrdiff_t difference_type;
typedef int size_type;
- //typedef const value_type *const_pointer; // FIXUP: Pointers and reference types not available due to missing dimension
+ //typedef const value_type *const_pointer; // FIXUP QH10000: QhullPointSet does not define pointer or reference due to point_dimension
//typedef const value_type &const_reference;
//typedef value_type *pointer;
//typedef value_type &reference;
@@ -204,7 +204,7 @@ public:
#//IO
struct PrintIdentifiers{
- const QhullPointSet *point_set; // FIXUP should Print... use pointers?
+ const QhullPointSet *point_set;
const char *message;
int run_id;
PrintIdentifiers(const char *message, const QhullPointSet *s) : point_set(s), message(message) {}
@@ -212,7 +212,7 @@ public:
PrintIdentifiers printIdentifiers(const char *message) const { return PrintIdentifiers(message, this); }
struct PrintPointSet{
- const QhullPointSet *point_set; // FIXUP should Print... use pointers?
+ const QhullPointSet *point_set;
const char *message;
int run_id;
PrintPointSet(int qhRunId, const char *message, const QhullPointSet &s) : point_set(&s), message(message), run_id(qhRunId) {}
@@ -223,7 +223,7 @@ public:
};//QhullPointSet
//derived from qiterator.h
-class QhullPointSetIterator { // FiXUP define QhullMutablePointSetIterator
+class QhullPointSetIterator { // FiXUP QH10000 define QhullMutablePointSetIterator
typedef QhullPointSet::const_iterator const_iterator;
const QhullPointSet *c;
const_iterator i;
diff --git a/cpp/QhullPoints.h b/cpp/QhullPoints.h
index 05f8e3e..e5ddb3f 100644
--- a/cpp/QhullPoints.h
+++ b/cpp/QhullPoints.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoints.h#29 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullPoints.h#30 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -158,7 +158,7 @@ public:
difference_type operator-(iterator other) const { QHULL_ASSERT(dimension()==other.dimension()); return (coordinates()-other.coordinates())/dimension(); }
};//QhullPoints::iterator
-#//QhullPoints::const_iterator //FIXUP what does const_... mean?
+#//QhullPoints::const_iterator -- FIXUP QH10000 const_iterator same as iterator
class const_iterator : public QhullPoint {
public:
@@ -197,7 +197,7 @@ public:
#//IO
struct PrintPoints{
- const QhullPoints *points; //! FIXUP elsewhere. const is OK now
+ const QhullPoints *points;
const char *point_message;
int run_id;
bool with_identifier;
@@ -210,7 +210,7 @@ public:
//FIXUP remove message for print()?
};//QhullPoints
-// FIXUP -- can't use macro because next(),etc would return a reference to a temporary -- QHULL_DECLARE_SEQUENTIAL_ITERATOR(QhullPoints, QhullPoint)
+// can't use QHULL_DECLARE_SEQUENTIAL_ITERATOR because next(),etc would return a reference to a temporary
class QhullPointsIterator
{
typedef QhullPoints::const_iterator const_iterator;
diff --git a/cpp/QhullRidge.cpp b/cpp/QhullRidge.cpp
index 276e941..3f3ba49 100644
--- a/cpp/QhullRidge.cpp
+++ b/cpp/QhullRidge.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullRidge.cpp#16 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullRidge.cpp#17 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -76,9 +76,13 @@ operator<<(ostream &os, const QhullRidge::PrintRidge &pr)
}
os << endl;
os << r.vertices().print(pr.run_id, " vertices:");
- //FIXUP -- what if top or bottom are NULL?
if(r.getRidgeT()->top && r.getRidgeT()->bottom){
os << " between f" << r.topFacet().id() << " and f" << r.bottomFacet().id() << endl;
+ }else if(r.getRidgeT()->top){
+ os << " top f" << r.topFacet().id() << endl;
+ }else if(r.getRidgeT()->bottom){
+ os << " bottom f" << r.bottomFacet().id() << endl;
}
+
return os;
}//<< PrintRidge
diff --git a/cpp/QhullRidge.h b/cpp/QhullRidge.h
index 54dae99..ce35d52 100644
--- a/cpp/QhullRidge.h
+++ b/cpp/QhullRidge.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullRidge.h#23 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullRidge.h#24 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -102,7 +102,7 @@ public:
}//namespace orgQhull
-std::ostream &operator<<(std::ostream &os, const orgQhull::QhullRidge &r); //FIXUP no conversion. OK in .cpp { os << r.print(orgQhull::UsingLibQhull::NOqhRunId); return os; }
+std::ostream &operator<<(std::ostream &os, const orgQhull::QhullRidge &r);
std::ostream &operator<<(std::ostream &os, const orgQhull::QhullRidge::PrintRidge &pr);
#endif // QHULLRIDGE_H
diff --git a/cpp/QhullSet.cpp b/cpp/QhullSet.cpp
index 31c0618..f746b47 100644
--- a/cpp/QhullSet.cpp
+++ b/cpp/QhullSet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullSet.cpp#18 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullSet.cpp#19 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -33,9 +33,9 @@ int QhullSetBase::count(const setT *set)
if ((size= *sizep)) {
size--;
if (size > set->maxsize) {
+ // FIXUP QH10000 How to add additional output to a error? -- qh_setprint(qhmem.ferr, "set: ", set);
throw QhullError(10032, "QhullSet internal error: current set size %d is greater than maximum size %d\n",
size, set->maxsize);
- // FIXUP -- qh_setprint(qhmem.ferr, "set: ", set);
}
}else
size= set->maxsize;
diff --git a/cpp/QhullSet.h b/cpp/QhullSet.h
index 0335094..4d1e16b 100644
--- a/cpp/QhullSet.h
+++ b/cpp/QhullSet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullSet.h#37 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullSet.h#38 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -357,6 +357,4 @@ operator<<(std::ostream &os, const orgQhull::QhullSet<T> &qs)
return os;
}//operator<<
-//FIXUP add runId to set.operator<<
-
#endif // QhullSet_H
diff --git a/cpp/QhullVertex.cpp b/cpp/QhullVertex.cpp
index 6f1dd9b..59a98c2 100644
--- a/cpp/QhullVertex.cpp
+++ b/cpp/QhullVertex.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertex.cpp#23 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/QhullVertex.cpp#24 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -60,7 +60,7 @@ operator<<(ostream &os, const QhullVertex::PrintVertex &pr)
os << "- p" << p.id(pr.run_id) << " (v" << v.id() << "): ";
const realT *c= p.coordinates();
for(int k= p.dimension(); k--; ){
- os << " " << *c++; // FIXUP %5.2g
+ os << " " << *c++; // FIXUP QH10010 %5.2g
}
if(v.getVertexT()->deleted){
os << " deleted";
diff --git a/cpp/RboxPoints.cpp b/cpp/RboxPoints.cpp
index 3d221f1..04eb6fa 100644
--- a/cpp/RboxPoints.cpp
+++ b/cpp/RboxPoints.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/RboxPoints.cpp#33 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/RboxPoints.cpp#34 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -72,7 +72,7 @@ operator=(const RboxPoints &other)
RboxPoints::
-~RboxPoints() // FIXUP call destructor for PointCoordinates?
+~RboxPoints()
{}
#//Error
diff --git a/cpp/UsingLibQhull.cpp b/cpp/UsingLibQhull.cpp
index e62d6b1..c69461d 100644
--- a/cpp/UsingLibQhull.cpp
+++ b/cpp/UsingLibQhull.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/UsingLibQhull.cpp#5 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/UsingLibQhull.cpp#6 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -45,7 +45,7 @@ int UsingLibQhull::
s_points_dimension= 0;
int UsingLibQhull::
-s_vertex_dimension= 0; // FIXUP: required if dimension>15
+s_vertex_dimension= 0; // FIXUP QH10000: s_vertex_dimension is required if dimension>15. Cannot store in QhullVertex
bool UsingLibQhull::
s_has_points= false;
@@ -94,7 +94,7 @@ UsingLibQhull(Qhull *q)
qhullqh->old_qhstat= 0;
qhullqh->old_tempstack= 0;
#else
- #error FIXUP static qh_qh not tested. Delete the line to try.
+ #error FIXUP QH10000 static qh_qh not tested. Delete the line to try.
if(qhullqh!=&qh_qh){
throw QhullError(10040, "Qhull internal error: Qhull.qhullQh() is not qh_qh (%x, static). Overwrite?", 0,0,0.0, &qh_qh);
}
diff --git a/cpp/road/RoadError.cpp b/cpp/road/RoadError.cpp
index 03c2e15..e944647 100644
--- a/cpp/road/RoadError.cpp
+++ b/cpp/road/RoadError.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadError.cpp#16 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/road/RoadError.cpp#17 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -129,7 +129,6 @@ operator=(const RoadError &e)
error_code= e.error_code;
error_message= e.error_message;
log_event= e.log_event;
- cerr << "FIXUP RoadError assignment\n";
return *this;
}//operator=
diff --git a/cpp/road/RoadError.h b/cpp/road/RoadError.h
index 03abd21..795afe0 100644
--- a/cpp/road/RoadError.h
+++ b/cpp/road/RoadError.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadError.h#20 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //product/qhull/main/rel/cpp/road/RoadError.h#21 $$Change: 1167 $
+** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
**
****************************************************************************/
@@ -70,7 +70,7 @@ public:
#//GetSet
bool defined() const { return log_event.defined(); }
int errorCode() const { return error_code; };
- // FIXUP std::string errorMessage() const { return error_message; }; //! Populated by throw
+ // FIXUP QH10000 should RoadError provide errorMessage(). Currently what()
RoadLogEvent roadLogEvent() const { return log_event; };
#//Update
diff --git a/project/libqhull.vcproj b/project/libqhull.vcproj
index 6da46b9..8a9ad19 100644
--- a/project/libqhull.vcproj
+++ b/project/libqhull.vcproj
@@ -1,635 +1,639 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="libqhull"
- ProjectGUID="{D1377F6B-7868-460C-9FC5-489C32A3D08F}"
- RootNamespace="qhull"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\tmp\libqhull\Release"
- IntermediateDirectory="..\tmp\libqhull\Release"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../"
- PreprocessorDefinitions="_LIB;UNICODE=1;WIN32;NDEBUG"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile="..\tmp\libqhull\Release/libqhull.pch"
- AssemblerListingLocation="..\tmp\libqhull\Release/"
- ObjectFile="..\tmp\libqhull\Release/"
- ProgramDataBaseFileName="..\tmp\libqhull\Release/"
- WarningLevel="4"
- WarnAsError="true"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\tmp\libqhull\Release\qhull.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\tmp\libqhull\Debug"
- IntermediateDirectory="..\tmp\libqhull\Debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_LIB;UNICODE=1;WIN32;_DEBUG"
- ExceptionHandling="0"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- DisableLanguageExtensions="true"
- RuntimeTypeInfo="false"
- PrecompiledHeaderFile="..\tmp\libqhull\Debug/libqhull.pch"
- AssemblerListingLocation="..\tmp\libqhull\Debug/"
- ObjectFile="..\tmp\libqhull\Debug/"
- ProgramDataBaseFileName="..\tmp\libqhull\Debug/"
- WarningLevel="4"
- WarnAsError="true"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- ShowIncludes="false"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\tmp\libqhull\Debug\qhull.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\src\geom.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\geom2.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\global.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\io.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\mem.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\merge.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\poly.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\poly2.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\libqhull.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\qset.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\random.c"
- >
- </File>
- <File
- RelativePath="..\src\rboxlib.c"
- >
- </File>
- <File
- RelativePath="..\src\stat.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\user.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\usermem.c"
- >
- </File>
- <File
- RelativePath="..\src\userprintf.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\src\geom.h"
- >
- </File>
- <File
- RelativePath="..\src\io.h"
- >
- </File>
- <File
- RelativePath="..\src\mem.h"
- >
- </File>
- <File
- RelativePath="..\src\merge.h"
- >
- </File>
- <File
- RelativePath="..\src\poly.h"
- >
- </File>
- <File
- RelativePath="..\src\qhull_a.h"
- >
- </File>
- <File
- RelativePath="..\src\libqhull.h"
- >
- </File>
- <File
- RelativePath="..\src\qset.h"
- >
- </File>
- <File
- RelativePath="..\src\random.h"
- >
- </File>
- <File
- RelativePath="..\src\stat.h"
- >
- </File>
- <File
- RelativePath="..\src\user.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Other Files"
- Filter="txt,groovy,htm"
- >
- <File
- RelativePath="..\src\index.htm"
- >
- </File>
- <File
- RelativePath="..\src\Make-config.sh"
- >
- </File>
- <File
- RelativePath="..\src\Makefile.txt"
- >
- </File>
- <File
- RelativePath="..\src\Mborland"
- >
- </File>
- <File
- RelativePath="..\src\qh-geom.htm"
- >
- </File>
- <File
- RelativePath="..\src\qh-globa.htm"
- >
- </File>
- <File
- RelativePath="..\html\qh-impre.htm"
- DeploymentContent="true"
- >
- </File>
- <File
- RelativePath="..\html\qh-in.htm"
- DeploymentContent="true"
- >
- </File>
- <File
- RelativePath="..\src\qh-io.htm"
- >
- </File>
- <File
- RelativePath="..\src\qh-mem.htm"
- >
- </File>
- <File
- RelativePath="..\src\qh-merge.htm"
- >
- </File>
- <File
- RelativePath="..\html\qh-optf.htm"
- DeploymentContent="true"
- >
- </File>
- <File
- RelativePath="..\html\qh-opto.htm"
- DeploymentContent="true"
- >
- </File>
- <File
- RelativePath="..\src\qh-poly.htm"
- >
- </File>
- <File
- RelativePath="..\src\qh-qhull.htm"
- >
- </File>
- <File
- RelativePath="..\src\qh-set.htm"
- >
- </File>
- <File
- RelativePath="..\src\qh-stat.htm"
- >
- </File>
- <File
- RelativePath="..\src\qh-user.htm"
- >
- </File>
- <File
- RelativePath="..\html\qhalf.htm"
- DeploymentContent="true"
- >
- </File>
- <File
- RelativePath="..\html\qhull.htm"
- DeploymentContent="true"
- >
- </File>
- <File
- RelativePath="..\news\update-msgcode.groovy"
- >
- </File>
- </Filter>
- <File
- RelativePath="..\news\qhull-news.html"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="libqhull"
+ ProjectGUID="{D1377F6B-7868-460C-9FC5-489C32A3D08F}"
+ RootNamespace="qhull"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\tmp\libqhull\Release"
+ IntermediateDirectory="..\tmp\libqhull\Release"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../"
+ PreprocessorDefinitions="_LIB;UNICODE=1;WIN32;NDEBUG"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile="..\tmp\libqhull\Release/libqhull.pch"
+ AssemblerListingLocation="..\tmp\libqhull\Release/"
+ ObjectFile="..\tmp\libqhull\Release/"
+ ProgramDataBaseFileName="..\tmp\libqhull\Release/"
+ WarningLevel="4"
+ WarnAsError="true"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\tmp\libqhull\Release\qhull.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\tmp\libqhull\Debug"
+ IntermediateDirectory="..\tmp\libqhull\Debug"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_LIB;UNICODE=1;WIN32;_DEBUG"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ DisableLanguageExtensions="true"
+ RuntimeTypeInfo="false"
+ PrecompiledHeaderFile="..\tmp\libqhull\Debug/libqhull.pch"
+ AssemblerListingLocation="..\tmp\libqhull\Debug/"
+ ObjectFile="..\tmp\libqhull\Debug/"
+ ProgramDataBaseFileName="..\tmp\libqhull\Debug/"
+ WarningLevel="4"
+ WarnAsError="true"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ ShowIncludes="false"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="..\tmp\libqhull\Debug\qhull.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\src\geom.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\geom2.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\global.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\io.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\libqhull.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\mem.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\merge.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\poly.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\poly2.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\qset.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\random.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rboxlib.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\stat.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\user.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\usermem.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\userprintf.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="..\src\geom.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\io.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\libqhull.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\mem.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\merge.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\poly.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qhull_a.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qset.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\random.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\stat.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\user.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Other Files"
+ Filter="txt,groovy,htm"
+ >
+ <File
+ RelativePath="..\src\index.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Make-config.sh"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Makefile.txt"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Mborland"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-geom.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-globa.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\html\qh-impre.htm"
+ DeploymentContent="true"
+ >
+ </File>
+ <File
+ RelativePath="..\html\qh-in.htm"
+ DeploymentContent="true"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-io.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-mem.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-merge.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\html\qh-optf.htm"
+ DeploymentContent="true"
+ >
+ </File>
+ <File
+ RelativePath="..\html\qh-opto.htm"
+ DeploymentContent="true"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-poly.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-qhull.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-set.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-stat.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\src\qh-user.htm"
+ >
+ </File>
+ <File
+ RelativePath="..\html\qhalf.htm"
+ DeploymentContent="true"
+ >
+ </File>
+ <File
+ RelativePath="..\html\qhull.htm"
+ DeploymentContent="true"
+ >
+ </File>
+ <File
+ RelativePath="..\README.txt"
+ >
+ </File>
+ <File
+ RelativePath="..\news\update-msgcode.groovy"
+ >
+ </File>
+ </Filter>
+ <File
+ RelativePath="..\news\qhull-news.html"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
diff --git a/src/Changes.txt b/src/Changes.txt
index 80ac562..94caf7a 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -48,7 +48,7 @@ Qhull cpp questions
- How to avoid copy constructor while logging, maybeThrowQhullMessage()
- How to configure Qhull output. Trace and results should go to stdout/stderr
- Qhull and RboxPoints messaging. e.g., ~Qhull, hasQhullMessage()
- - rename as QhullErrorMessage?
+ - rename as QhullErrorMessage? How to add additional output, e.g., qh_setprint
- Is idx the best name for an index? It's rather cryptic, but BSD strings.h defines index().
- Qhull::feasiblePoint Qhull::useOutputStream as field or getter?
- Define virtual functions for user customization of Qhull (e.g., qh_fprintf, qh_memfree,etc.)
@@ -67,27 +67,41 @@ Qhull cpp questions
- Also --, +=, and -=
iterator &operator++() { return iterator(i++); }
- if vector<coordT> inheritance is bad, is QhullVertexSet OK?
+ - Should QhullPointSet define pointer and reference data types?
+ - Allow UsingQhullLib to work with static allocation of qh_qh
To do
- ConvexHull is a submodule to git. How to get rid of?
- - Review Warn64
- Abandon savannah
- - Measure performance of Qhull
+ - Measure performance of Qhull, seconds per point by dimension
- qhulltest --all added to output
- Add test of user_eg3, etc.
- - Check for wraparound of 64-bit ints -- e.g., a large set
+ - Check for wraparound of 64-bit ints -- e.g., a large set or points
- Add config directory to Qhull
+ - Remove user_eg and user_eg2 from distribution
+ - Add md5sum
- Generate vcproj from qtpro files
cd qtpro && qmake -spec win32-msvc2005 -tp vc -recursive
sed -i 's/C\:\/bash\/local\/qhull\/qtpro\///' qhull-all.sln
Change qhullcpp to libqhull.dll
Allow both builds on same host (keep /tmp separate)
- Make distribution -- remove tmp, news, .git, leftovers from project, change CRLF
+ - search for 2010.1, Dates
+ - update http://compgeom.cs.uiuc.edu/~jeffe/compgeom/code.html#topes
+ - Notify geom discussion list
+ - Develop patch for qh_gethash
+ - update FAQ and date.
+ - Notify Wolfram
+ - Review Warn64
- review all #pragma
- review all FIXUP [^0-9]
- Number the FIXUPS
- Review ptr_intT in qh_matchvertices [poly.c]
- clean up warnings for libqhullcpp
+ - user.h qh_qhPOINTER 0 for qhull -- need two static libraries
+ - review os << QhullFacetSet vs QhullFacetList vs. QhullHyperplane vs. QhullPoint QhullRidge
+ - generate static qhull for qhull.exe
+
qhull 2010.1 2010/01/07
- Assign type to qh.old_qhstat and memT.tempstack [amorilia]
diff --git a/src/io.c b/src/io.c
index 337c6e2..1ca1d9b 100644
--- a/src/io.c
+++ b/src/io.c
@@ -14,8 +14,8 @@
This allows the user to avoid loading io.o from qhull.a
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/io.c#35 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //product/qhull/main/rel/src/io.c#36 $$Change: 1167 $
+ $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
*/
#include "qhull_a.h"
@@ -3669,7 +3669,7 @@ int qh_readfeasible(int dim, const char *curline) {
notes:
dimension will change in qh_initqhull_globals if qh.PROJECTinput
uses malloc() since qh_mem not initialized
- FIXUP: this routine needs rewriting
+ FIXUP QH10000: qh_readpoints needs rewriting, too long
*/
coordT *qh_readpoints(int *numpoints, int *dimension, boolT *ismalloc) {
coordT *points, *coords, *infinity= NULL;
diff --git a/src/libqhull.h b/src/libqhull.h
index e56e719..bab9c4d 100644
--- a/src/libqhull.h
+++ b/src/libqhull.h
@@ -7,8 +7,8 @@
see qh-qhull.htm, qhull_a.h
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/libqhull.h#6 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //product/qhull/main/rel/src/libqhull.h#7 $$Change: 1167 $
+ $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
NOTE: access to qh_qh is via the 'qh' macro. This allows
qh_qh to be either a pointer or a structure. An example
@@ -771,8 +771,8 @@ struct qhT {
>--------------------------------</a><a name="getid_">-</a>
getid_(p)
- return ID for facet, ridge, or vertex
- FIXUP: return MAXINT if NULL (-1 causes type conversion error )
+ return int ID for facet, ridge, or vertex
+ return -1 if NULL
*/
#define getid_(p) ((p) ? (int)((p)->id) : -1)
diff --git a/src/user.h b/src/user.h
index 9adc6bb..4a36cb7 100644
--- a/src/user.h
+++ b/src/user.h
@@ -48,6 +48,7 @@ Code flags --
If add new messages, assign these values and increment.
def counters = [27, 1047, 2059, 3025, 4068, 5003, 6233, 7079, 8143, 9410]
+ 10011-10016 available
See: qh_ERR* [libqhull.h]
*/
@@ -62,6 +63,7 @@ Code flags --
#define MSG_WARNING 7000
#define MSG_STDERR 8000 /* log messages Written to qh.ferr */
#define MSG_OUTPUT 9000
+#define MSG_FIXUP 10000
#define MSG_MAXLEN 3000 /* qh_printhelp_degenerate() in user.c */
--
GitLab