From 45eb41dde29f4238cba1e4edff0a2f09e15b51f0 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Wed, 28 Jun 2017 18:33:42 +0300
Subject: [indexer] Increase subtypes limit to 128

---
 indexer/classificator.cpp           |  6 ++----
 indexer/indexer_tests/test_type.cpp | 16 ++++++++--------
 indexer/tree_structure.hpp          |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index 23a95adea3..a75932a86a 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -137,8 +137,8 @@ Classificator & classif()
 
 namespace ftype
 {
-  uint8_t const bits_count = 6;
-  uint8_t const levels_count = 5;
+  uint8_t const bits_count = 7;
+  uint8_t const levels_count = 4;
   uint8_t const max_value = (1 << bits_count) - 1;
 
   void set_value(uint32_t & type, uint8_t level, uint8_t value)
@@ -196,8 +196,6 @@ namespace ftype
 
   bool GetValue(uint32_t type, uint8_t level, uint8_t & value)
   {
-    ASSERT ( level < levels_count, ("invalid input level", level) );
-
     if (level < get_control_level(type))
     {
       value = get_value(type, level);
diff --git a/indexer/indexer_tests/test_type.cpp b/indexer/indexer_tests/test_type.cpp
index dfa6892ccf..eaa44d1639 100644
--- a/indexer/indexer_tests/test_type.cpp
+++ b/indexer/indexer_tests/test_type.cpp
@@ -37,19 +37,19 @@ namespace
 
 UNIT_TEST(SetGetTypes)
 {
-  uint8_t v1[] = { 6, 30, 50, 0, 1 };
-  check_values_array(v1, 5);
+  uint8_t v1[] = { 6, 30, 0, 1 };
   check_values_array(v1, 4);
+  check_values_array(v1, 3);
 
-  uint8_t v2[] = { 0, 0, 0, 0, 0 };
-  check_values_array(v2, 5);
+  uint8_t v2[] = { 0, 0, 0, 0 };
   check_values_array(v2, 4);
+  check_values_array(v2, 3);
 
-  uint8_t v3[] = { 1, 1, 1, 1, 1 };
-  check_values_array(v3, 5);
+  uint8_t v3[] = { 1, 1, 1, 1 };
   check_values_array(v3, 4);
+  check_values_array(v3, 3);
 
-  uint8_t v4[] = { 63, 63, 63, 63, 63 };
-  check_values_array(v4, 5);
+  uint8_t v4[] = { 63, 63, 63, 63 };
   check_values_array(v4, 4);
+  check_values_array(v4, 3);
 }
diff --git a/indexer/tree_structure.hpp b/indexer/tree_structure.hpp
index 525e1d9eb2..3db8b4c710 100644
--- a/indexer/tree_structure.hpp
+++ b/indexer/tree_structure.hpp
@@ -43,7 +43,7 @@ namespace tree
         }
       }
 
-      ASSERT ( i <= 64, ("too many features at level = ", name) );
+      ASSERT ( i <= 128, ("too many features at level = ", name) );
     }
 
     return true;
-- 
cgit v1.2.3