From ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 15 Feb 2018 23:36:11 +1100 Subject: Cleanup: use '_len' instead of '_size' w/ BLI API - When returning the number of items in a collection use BLI_*_len() - Keep _size() for size in bytes. - Keep _count() for data structures that don't store length (hint this isn't a simple getter). See P611 to apply instead of manually resolving conflicts. --- tests/gtests/blenlib/BLI_ghash_performance_test.cc | 4 +-- tests/gtests/blenlib/BLI_ghash_test.cc | 32 +++++++++++----------- tests/gtests/blenlib/BLI_heap_test.cc | 22 +++++++-------- tests/gtests/blenlib/BLI_kdopbvh_test.cc | 4 +-- tests/gtests/blenlib/BLI_polyfill2d_test.cc | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'tests') diff --git a/tests/gtests/blenlib/BLI_ghash_performance_test.cc b/tests/gtests/blenlib/BLI_ghash_performance_test.cc index 924c84d72d0..0eca99ae542 100644 --- a/tests/gtests/blenlib/BLI_ghash_performance_test.cc +++ b/tests/gtests/blenlib/BLI_ghash_performance_test.cc @@ -35,7 +35,7 @@ extern "C" { printf("GHash stats (%u entries):\n\t" \ "Quality (the lower the better): %f\n\tVariance (the lower the better): %f\n\tLoad: %f\n\t" \ "Empty buckets: %.2f%%\n\tOverloaded buckets: %.2f%% (biggest bucket: %d)\n", \ - BLI_ghash_size(_gh), q, var, lf, pempty * 100.0, poverloaded * 100.0, bigb); \ + BLI_ghash_len(_gh), q, var, lf, pempty * 100.0, poverloaded * 100.0, bigb); \ } void (0) /* Str: whole text, lines and words from a 'corpus' text. */ @@ -214,7 +214,7 @@ static void int_ghash_tests(GHash *ghash, const char *id, const unsigned int nbr TIMEIT_END(int_pop); } - EXPECT_EQ(BLI_ghash_size(ghash), 0); + EXPECT_EQ(BLI_ghash_len(ghash), 0); BLI_ghash_free(ghash, NULL, NULL); diff --git a/tests/gtests/blenlib/BLI_ghash_test.cc b/tests/gtests/blenlib/BLI_ghash_test.cc index 6d075e29114..f73a13ce05a 100644 --- a/tests/gtests/blenlib/BLI_ghash_test.cc +++ b/tests/gtests/blenlib/BLI_ghash_test.cc @@ -21,7 +21,7 @@ extern "C" { printf("GHash stats (%d entries):\n\t" \ "Quality (the lower the better): %f\n\tVariance (the lower the better): %f\n\tLoad: %f\n\t" \ "Empty buckets: %.2f%%\n\tOverloaded buckets: %.2f%% (biggest bucket: %d)\n", \ - BLI_ghash_size(_gh), q, var, lf, pempty * 100.0, poverloaded * 100.0, bigb); \ + BLI_ghash_len(_gh), q, var, lf, pempty * 100.0, poverloaded * 100.0, bigb); \ } void (0) /* Note: for pure-ghash testing, nature of the keys and data have absolutely no importance! So here we just use mere @@ -62,7 +62,7 @@ TEST(ghash, InsertLookup) BLI_ghash_insert(ghash, SET_UINT_IN_POINTER(*k), SET_UINT_IN_POINTER(*k)); } - EXPECT_EQ(BLI_ghash_size(ghash), TESTCASE_SIZE); + EXPECT_EQ(BLI_ghash_len(ghash), TESTCASE_SIZE); for (i = TESTCASE_SIZE, k = keys; i--; k++) { void *v = BLI_ghash_lookup(ghash, SET_UINT_IN_POINTER(*k)); @@ -85,16 +85,16 @@ TEST(ghash, InsertRemove) BLI_ghash_insert(ghash, SET_UINT_IN_POINTER(*k), SET_UINT_IN_POINTER(*k)); } - EXPECT_EQ(BLI_ghash_size(ghash), TESTCASE_SIZE); - bkt_size = BLI_ghash_buckets_size(ghash); + EXPECT_EQ(BLI_ghash_len(ghash), TESTCASE_SIZE); + bkt_size = BLI_ghash_buckets_len(ghash); for (i = TESTCASE_SIZE, k = keys; i--; k++) { void *v = BLI_ghash_popkey(ghash, SET_UINT_IN_POINTER(*k), NULL); EXPECT_EQ(GET_UINT_FROM_POINTER(v), *k); } - EXPECT_EQ(BLI_ghash_size(ghash), 0); - EXPECT_EQ(BLI_ghash_buckets_size(ghash), bkt_size); + EXPECT_EQ(BLI_ghash_len(ghash), 0); + EXPECT_EQ(BLI_ghash_buckets_len(ghash), bkt_size); BLI_ghash_free(ghash, NULL, NULL); } @@ -113,16 +113,16 @@ TEST(ghash, InsertRemoveShrink) BLI_ghash_insert(ghash, SET_UINT_IN_POINTER(*k), SET_UINT_IN_POINTER(*k)); } - EXPECT_EQ(BLI_ghash_size(ghash), TESTCASE_SIZE); - bkt_size = BLI_ghash_buckets_size(ghash); + EXPECT_EQ(BLI_ghash_len(ghash), TESTCASE_SIZE); + bkt_size = BLI_ghash_buckets_len(ghash); for (i = TESTCASE_SIZE, k = keys; i--; k++) { void *v = BLI_ghash_popkey(ghash, SET_UINT_IN_POINTER(*k), NULL); EXPECT_EQ(GET_UINT_FROM_POINTER(v), *k); } - EXPECT_EQ(BLI_ghash_size(ghash), 0); - EXPECT_LT(BLI_ghash_buckets_size(ghash), bkt_size); + EXPECT_EQ(BLI_ghash_len(ghash), 0); + EXPECT_LT(BLI_ghash_buckets_len(ghash), bkt_size); BLI_ghash_free(ghash, NULL, NULL); } @@ -141,12 +141,12 @@ TEST(ghash, Copy) BLI_ghash_insert(ghash, SET_UINT_IN_POINTER(*k), SET_UINT_IN_POINTER(*k)); } - EXPECT_EQ(BLI_ghash_size(ghash), TESTCASE_SIZE); + EXPECT_EQ(BLI_ghash_len(ghash), TESTCASE_SIZE); ghash_copy = BLI_ghash_copy(ghash, NULL, NULL); - EXPECT_EQ(BLI_ghash_size(ghash_copy), TESTCASE_SIZE); - EXPECT_EQ(BLI_ghash_buckets_size(ghash_copy), BLI_ghash_buckets_size(ghash)); + EXPECT_EQ(BLI_ghash_len(ghash_copy), TESTCASE_SIZE); + EXPECT_EQ(BLI_ghash_buckets_len(ghash_copy), BLI_ghash_buckets_len(ghash)); for (i = TESTCASE_SIZE, k = keys; i--; k++) { void *v = BLI_ghash_lookup(ghash_copy, SET_UINT_IN_POINTER(*k)); @@ -171,7 +171,7 @@ TEST(ghash, Pop) BLI_ghash_insert(ghash, SET_UINT_IN_POINTER(*k), SET_UINT_IN_POINTER(*k)); } - EXPECT_EQ(BLI_ghash_size(ghash), TESTCASE_SIZE); + EXPECT_EQ(BLI_ghash_len(ghash), TESTCASE_SIZE); GHashIterState pop_state = {0}; @@ -186,7 +186,7 @@ TEST(ghash, Pop) } } - EXPECT_EQ(BLI_ghash_size(ghash), (TESTCASE_SIZE - TESTCASE_SIZE / 2 + TESTCASE_SIZE / 4)); + EXPECT_EQ(BLI_ghash_len(ghash), (TESTCASE_SIZE - TESTCASE_SIZE / 2 + TESTCASE_SIZE / 4)); { void *k, *v; @@ -194,7 +194,7 @@ TEST(ghash, Pop) EXPECT_EQ(k, v); } } - EXPECT_EQ(BLI_ghash_size(ghash), 0); + EXPECT_EQ(BLI_ghash_len(ghash), 0); BLI_ghash_free(ghash, NULL, NULL); } diff --git a/tests/gtests/blenlib/BLI_heap_test.cc b/tests/gtests/blenlib/BLI_heap_test.cc index 89e271d5167..82acdabd7eb 100644 --- a/tests/gtests/blenlib/BLI_heap_test.cc +++ b/tests/gtests/blenlib/BLI_heap_test.cc @@ -30,7 +30,7 @@ TEST(heap, Empty) heap = BLI_heap_new(); EXPECT_TRUE(BLI_heap_is_empty(heap)); - EXPECT_EQ(BLI_heap_size(heap), 0); + EXPECT_EQ(BLI_heap_len(heap), 0); BLI_heap_free(heap, NULL); } @@ -43,10 +43,10 @@ TEST(heap, One) BLI_heap_insert(heap, 0.0f, (void *)in); EXPECT_FALSE(BLI_heap_is_empty(heap)); - EXPECT_EQ(BLI_heap_size(heap), 1); - EXPECT_EQ(in, BLI_heap_popmin(heap)); + EXPECT_EQ(BLI_heap_len(heap), 1); + EXPECT_EQ(in, BLI_heap_pop_min(heap)); EXPECT_TRUE(BLI_heap_is_empty(heap)); - EXPECT_EQ(BLI_heap_size(heap), 0); + EXPECT_EQ(BLI_heap_len(heap), 0); BLI_heap_free(heap, NULL); } @@ -58,7 +58,7 @@ TEST(heap, Range) BLI_heap_insert(heap, (float)in, SET_INT_IN_POINTER(in)); } for (int out_test = 0; out_test < items_total; out_test++) { - EXPECT_EQ(out_test, GET_INT_FROM_POINTER(BLI_heap_popmin(heap))); + EXPECT_EQ(out_test, GET_INT_FROM_POINTER(BLI_heap_pop_min(heap))); } EXPECT_TRUE(BLI_heap_is_empty(heap)); @@ -73,7 +73,7 @@ TEST(heap, RangeReverse) BLI_heap_insert(heap, (float)-in, SET_INT_IN_POINTER(-in)); } for (int out_test = items_total - 1; out_test >= 0; out_test--) { - EXPECT_EQ(-out_test, GET_INT_FROM_POINTER(BLI_heap_popmin(heap))); + EXPECT_EQ(-out_test, GET_INT_FROM_POINTER(BLI_heap_pop_min(heap))); } EXPECT_TRUE(BLI_heap_is_empty(heap)); BLI_heap_free(heap, NULL); @@ -92,7 +92,7 @@ TEST(heap, RangeRemove) nodes[i] = NULL; } for (int out_test = 1; out_test < items_total; out_test += 2) { - EXPECT_EQ(out_test, GET_INT_FROM_POINTER(BLI_heap_popmin(heap))); + EXPECT_EQ(out_test, GET_INT_FROM_POINTER(BLI_heap_pop_min(heap))); } EXPECT_TRUE(BLI_heap_is_empty(heap)); BLI_heap_free(heap, NULL); @@ -107,7 +107,7 @@ TEST(heap, Duplicates) BLI_heap_insert(heap, 1.0f, 0); } for (int out_test = 0; out_test < items_total; out_test++) { - EXPECT_EQ(0, GET_INT_FROM_POINTER(BLI_heap_popmin(heap))); + EXPECT_EQ(0, GET_INT_FROM_POINTER(BLI_heap_pop_min(heap))); } EXPECT_TRUE(BLI_heap_is_empty(heap)); BLI_heap_free(heap, NULL); @@ -125,7 +125,7 @@ static void random_heap_helper( BLI_heap_insert(heap, values[i], SET_INT_IN_POINTER((int)values[i])); } for (int out_test = 0; out_test < items_total; out_test++) { - EXPECT_EQ(out_test, GET_INT_FROM_POINTER(BLI_heap_popmin(heap))); + EXPECT_EQ(out_test, GET_INT_FROM_POINTER(BLI_heap_pop_min(heap))); } EXPECT_TRUE(BLI_heap_is_empty(heap)); BLI_heap_free(heap, NULL); @@ -150,7 +150,7 @@ TEST(heap, ReInsertSimple) } for (int out_test = 0; out_test < items_total; out_test++) { - EXPECT_EQ(out_test, GET_INT_FROM_POINTER(BLI_heap_popmin(heap))); + EXPECT_EQ(out_test, GET_INT_FROM_POINTER(BLI_heap_pop_min(heap))); } EXPECT_TRUE(BLI_heap_is_empty(heap)); @@ -177,7 +177,7 @@ static void random_heap_reinsert_helper( HeapNode *node_top = BLI_heap_top(heap); float out = BLI_heap_node_value(node_top); EXPECT_EQ((float)out_test, out); - BLI_heap_popmin(heap); + BLI_heap_pop_min(heap); } EXPECT_TRUE(BLI_heap_is_empty(heap)); BLI_heap_free(heap, NULL); diff --git a/tests/gtests/blenlib/BLI_kdopbvh_test.cc b/tests/gtests/blenlib/BLI_kdopbvh_test.cc index 74db7cf20a0..48f4d7054da 100644 --- a/tests/gtests/blenlib/BLI_kdopbvh_test.cc +++ b/tests/gtests/blenlib/BLI_kdopbvh_test.cc @@ -34,7 +34,7 @@ TEST(kdopbvh, Empty) { BVHTree *tree = BLI_bvhtree_new(0, 0.0, 8, 8); BLI_bvhtree_balance(tree); - EXPECT_EQ(0, BLI_bvhtree_get_size(tree)); + EXPECT_EQ(0, BLI_bvhtree_get_len(tree)); BLI_bvhtree_free(tree); } @@ -46,7 +46,7 @@ TEST(kdopbvh, Single) BLI_bvhtree_insert(tree, 0, co, 1); } - EXPECT_EQ(BLI_bvhtree_get_size(tree), 1); + EXPECT_EQ(BLI_bvhtree_get_len(tree), 1); BLI_bvhtree_balance(tree); BLI_bvhtree_free(tree); diff --git a/tests/gtests/blenlib/BLI_polyfill2d_test.cc b/tests/gtests/blenlib/BLI_polyfill2d_test.cc index a58116c7b85..01ab400b5b7 100644 --- a/tests/gtests/blenlib/BLI_polyfill2d_test.cc +++ b/tests/gtests/blenlib/BLI_polyfill2d_test.cc @@ -101,7 +101,7 @@ static void test_polyfill_topology( } } } - EXPECT_EQ(BLI_edgehash_size(edgehash), poly_tot + (poly_tot - 3)); + EXPECT_EQ(BLI_edgehash_len(edgehash), poly_tot + (poly_tot - 3)); for (i = 0; i < poly_tot; i++) { const unsigned int v1 = i; -- cgit v1.2.3