[mathic] 16/62: Changed remaining ASSERT to MATHIC_ASSERT in all installed files.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Wed Apr 1 11:36:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository mathic.
commit 9ae04a35f5bb95a3a9c57003c531e3b12d46b7b2
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date: Sun Jul 22 19:37:48 2012 -0400
Changed remaining ASSERT to MATHIC_ASSERT in all installed files.
---
src/mathic/BinaryKDTree.h | 12 ++++++------
src/mathic/GeoFront.h | 2 +-
src/mathic/Geobucket.h | 2 +-
src/mathic/KDEntryArray.h | 8 ++++----
src/mathic/PackedKDTree.h | 8 ++++----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/mathic/BinaryKDTree.h b/src/mathic/BinaryKDTree.h
index 3d23c72..05e67ff 100755
--- a/src/mathic/BinaryKDTree.h
+++ b/src/mathic/BinaryKDTree.h
@@ -317,7 +317,7 @@ namespace mathic {
if (leaf->entries().size() == C::LeafSize) {
Interior& interior = leaf->splitInsert(extEntry, parent, _arena, _conf);
if (parent == 0) {
- ASSERT(leaf == _root);
+ MATHIC_ASSERT(leaf == _root);
_root = &interior;
}
} else {
@@ -370,7 +370,7 @@ namespace mathic {
}
if (parent == 0) {
- ASSERT(_root == 0);
+ MATHIC_ASSERT(_root == 0);
_root = node;
} else if (isEqualOrLessChild)
parent->setEqualOrLess(node);
@@ -394,7 +394,7 @@ namespace mathic {
// continue with equal-or-less as next item
}
}
- ASSERT(_root != 0);
+ MATHIC_ASSERT(_root != 0);
if (C::UseTreeDivMask) {
// record nodes in tree using breadth first search
@@ -647,14 +647,14 @@ next:
for (size_t i = 0; i < nodes.size(); ++i) {
Node* nodei = nodes[i];
if (nodei->isLeaf()) {
- ASSERT(nodei->asLeaf().entries().debugIsValid());
+ MATHIC_ASSERT(nodei->asLeaf().entries().debugIsValid());
continue;
}
Interior& interior = nodei->asInterior();
size_t var = interior.getVar();
Exponent exp = interior.getExponent();
- ASSERT(_tmp.empty());
+ MATHIC_ASSERT(_tmp.empty());
// check equal or less than sub tree
_tmp.push_back(&interior.getEqualOrLess());
while (!_tmp.empty()) {
@@ -770,7 +770,7 @@ next:
interior.updateToLowerBound(extEntry);
Leaf* insertLeaf = &interior.getChildFor(extEntry, conf).asLeaf();
- ASSERT(insertLeaf->entries().size() < C::LeafSize);
+ MATHIC_ASSERT(insertLeaf->entries().size() < C::LeafSize);
insertLeaf->entries().insert(extEntry, conf);
return interior;
diff --git a/src/mathic/GeoFront.h b/src/mathic/GeoFront.h
old mode 100644
new mode 100755
index 9fc145a..194a63a
--- a/src/mathic/GeoFront.h
+++ b/src/mathic/GeoFront.h
@@ -203,7 +203,7 @@ namespace mathic {
template<class C, class B>
void GeoFront<C, B, true>::reserveCapacity(size_t newCapacity) {
- ASSERT(newCapacity >= size());
+ MATHIC_ASSERT(newCapacity >= size());
if (newCapacity == 0)
newCapacity = 1;
size_t const oldSize = size();
diff --git a/src/mathic/Geobucket.h b/src/mathic/Geobucket.h
index 4947cc7..f741b8e 100755
--- a/src/mathic/Geobucket.h
+++ b/src/mathic/Geobucket.h
@@ -320,7 +320,7 @@ namespace mathic {
_front(_conf, _entryCount) {
MATHIC_ASSERT(_conf.geoBase > 1);
addBucket(); // this avoids the special case of no buckets.
- ASSERT(_front.debugIsValid(_bucketBegin, _bucketEnd));
+ MATHIC_ASSERT(_front.debugIsValid(_bucketBegin, _bucketEnd));
}
template<class C>
diff --git a/src/mathic/KDEntryArray.h b/src/mathic/KDEntryArray.h
index 92e3eea..6ca3cc3 100755
--- a/src/mathic/KDEntryArray.h
+++ b/src/mathic/KDEntryArray.h
@@ -353,7 +353,7 @@ namespace mathic {
return end();
if (C::LeafSize == 1) { // special case for performance
- ASSERT(C::AllowRemovals || !empty());
+ MATHIC_ASSERT(C::AllowRemovals || !empty());
if ((!C::AllowRemovals || !empty()) &&
begin()->divides(extMonomial, conf))
return begin();
@@ -387,7 +387,7 @@ namespace mathic {
return end();
if (C::LeafSize == 1) { // special case for performance
- ASSERT(C::AllowRemovals || !empty());
+ MATHIC_ASSERT(C::AllowRemovals || !empty());
return (C::AllowRemovals && empty()) ||
!begin()->divides(extMonomial, conf) ||
out.proceed(begin()->get());
@@ -414,7 +414,7 @@ namespace mathic {
bool KDEntryArray<C, EE>::
findAllMultiples(const EM& extMonomial, DO& out, const C& conf) {
if (C::LeafSize == 1) { // special case for performance
- ASSERT(C::AllowRemovals || !empty());
+ MATHIC_ASSERT(C::AllowRemovals || !empty());
return (C::AllowRemovals && empty()) ||
!extMonomial.divides(*begin(), conf) ||
out.proceed(begin()->get());
@@ -433,7 +433,7 @@ namespace mathic {
template<class EO>
bool KDEntryArray<C, EE>::forAll(EO& output) {
if (C::LeafSize == 1) { // special case for performance
- ASSERT(C::AllowRemovals || !empty());
+ MATHIC_ASSERT(C::AllowRemovals || !empty());
return (C::AllowRemovals && empty()) || output.proceed(begin()->get());
}
const iterator stop = end();
diff --git a/src/mathic/PackedKDTree.h b/src/mathic/PackedKDTree.h
index 374807b..1300147 100755
--- a/src/mathic/PackedKDTree.h
+++ b/src/mathic/PackedKDTree.h
@@ -390,7 +390,7 @@ stopped:;
else
child->updateToLowerBound(child->node->entries());
}
- ASSERT(node->debugIsValid());
+ MATHIC_ASSERT(node->debugIsValid());
}
}
MATHIC_ASSERT(debugIsValid());
@@ -590,7 +590,7 @@ next:
nodes.push_back(_root);
for (size_t i = 0; i < nodes.size(); ++i) {
Node* node = nodes[i];
- ASSERT(node->entries().debugIsValid());
+ MATHIC_ASSERT(node->entries().debugIsValid());
for (typename Node::iterator it = node->childBegin();
it != node->childEnd(); ++it) {
MATHIC_ASSERT(it->var < _conf.getVarCount());
@@ -738,8 +738,8 @@ next:
#ifdef MATHIC_DEBUG
template<class C>
bool PackedKDTree<C>::Node::debugIsValid() const {
- ASSERT(entries().debugIsValid());
- ASSERT(childBegin() <= childEnd());
+ MATHIC_ASSERT(entries().debugIsValid());
+ MATHIC_ASSERT(childBegin() <= childEnd());
if (C::UseTreeDivMask) {
for (const_iterator child = childBegin(); child != childEnd(); ++child) {
if (child != childEnd() - 1)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathic.git
More information about the debian-science-commits
mailing list