Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Unified Diff: tests/RTreeTest.cpp

Issue 734723002: Prune SkRTree (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: nits Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/core/SkRTree.h ('K') | « src/core/SkRTree.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/RTreeTest.cpp
diff --git a/tests/RTreeTest.cpp b/tests/RTreeTest.cpp
index 5d5c1cb8735e8fe552da541bb3c6d375c6e68e91..50eaacb603fd3610047d082dbb438c7f66dd6448 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -7,12 +7,8 @@
#include "SkRTree.h"
#include "SkRandom.h"
-#include "SkTSort.h"
#include "Test.h"
-static const size_t MIN_CHILDREN = 6;
-static const size_t MAX_CHILDREN = 11;
-
static const int NUM_RECTS = 200;
static const size_t NUM_ITERATIONS = 100;
static const size_t NUM_QUERIES = 50;
@@ -30,11 +26,7 @@ static SkRect random_rect(SkRandom& rand) {
}
static bool verify_query(SkRect query, SkRect rects[], SkTDArray<unsigned>& found) {
- // TODO(mtklein): no need to do this after everything's SkRects
- query.roundOut();
-
SkTDArray<unsigned> expected;
-
// manually intersect with every rectangle
for (int i = 0; i < NUM_RECTS; ++i) {
if (SkRect::Intersects(query, rects[i])) {
@@ -45,19 +37,14 @@ static bool verify_query(SkRect query, SkRect rects[], SkTDArray<unsigned>& foun
if (expected.count() != found.count()) {
return false;
}
-
if (0 == expected.count()) {
return true;
}
-
- // skia:2834. RTree doesn't always return results in order.
- SkTQSort(expected.begin(), expected.end() -1);
- SkTQSort(found.begin(), found.end() -1);
return found == expected;
}
static void run_queries(skiatest::Reporter* reporter, SkRandom& rand, SkRect rects[],
- SkRTree& tree) {
+ const SkRTree& tree) {
for (size_t i = 0; i < NUM_QUERIES; ++i) {
SkTDArray<unsigned> hits;
SkRect query = random_rect(rand);
@@ -66,53 +53,39 @@ static void run_queries(skiatest::Reporter* reporter, SkRandom& rand, SkRect rec
}
}
-static void rtree_test_main(SkRTree* rtree, skiatest::Reporter* reporter) {
- SkASSERT(rtree);
-
+DEF_TEST(RTree, reporter) {
int expectedDepthMin = -1;
- int expectedDepthMax = -1;
-
int tmp = NUM_RECTS;
while (tmp > 0) {
- tmp -= static_cast<int>(pow(static_cast<double>(MAX_CHILDREN),
- static_cast<double>(expectedDepthMin + 1)));
+ tmp -= static_cast<int>(pow(static_cast<double>(SkRTree::kMaxChildren),
+ static_cast<double>(expectedDepthMin + 1)));
++expectedDepthMin;
}
+ int expectedDepthMax = -1;
tmp = NUM_RECTS;
while (tmp > 0) {
- tmp -= static_cast<int>(pow(static_cast<double>(MIN_CHILDREN),
- static_cast<double>(expectedDepthMax + 1)));
+ tmp -= static_cast<int>(pow(static_cast<double>(SkRTree::kMinChildren),
+ static_cast<double>(expectedDepthMax + 1)));
++expectedDepthMax;
}
SkRandom rand;
SkAutoTMalloc<SkRect> rects(NUM_RECTS);
for (size_t i = 0; i < NUM_ITERATIONS; ++i) {
- rtree->clear();
- REPORTER_ASSERT(reporter, 0 == rtree->getCount());
+ SkRTree rtree;
+ REPORTER_ASSERT(reporter, 0 == rtree.getCount());
for (int j = 0; j < NUM_RECTS; j++) {
rects[j] = random_rect(rand);
}
- rtree->insert(&rects, NUM_RECTS);
+ rtree.insert(&rects, NUM_RECTS);
SkASSERT(rects); // SkRTree doesn't take ownership of rects.
- run_queries(reporter, rand, rects, *rtree);
- REPORTER_ASSERT(reporter, NUM_RECTS == rtree->getCount());
- REPORTER_ASSERT(reporter, expectedDepthMin <= rtree->getDepth() &&
- expectedDepthMax >= rtree->getDepth());
+ run_queries(reporter, rand, rects, rtree);
+ REPORTER_ASSERT(reporter, NUM_RECTS == rtree.getCount());
+ REPORTER_ASSERT(reporter, expectedDepthMin <= rtree.getDepth() &&
+ expectedDepthMax >= rtree.getDepth());
}
}
-
-DEF_TEST(RTree, reporter) {
- SkRTree* rtree = SkRTree::Create(MIN_CHILDREN, MAX_CHILDREN);
- SkAutoUnref au(rtree);
- rtree_test_main(rtree, reporter);
-
- // Rtree that orders input rectangles on deferred insert.
- SkRTree* unsortedRtree = SkRTree::Create(MIN_CHILDREN, MAX_CHILDREN, 1, false);
- SkAutoUnref auo(unsortedRtree);
- rtree_test_main(unsortedRtree, reporter);
-}
« src/core/SkRTree.h ('K') | « src/core/SkRTree.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698