Test.

dmlc · May 16, 2022 · b846b6b · b846b6b
1 parent 4850df0
commit b846b6b
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/tests/cpp/common/test_column_matrix.cc b/tests/cpp/common/test_column_matrix.cc
@@ -15,6 +15,7 @@ TEST(DenseColumn, Test) {
   int32_t max_num_bins[] = {static_cast<int32_t>(std::numeric_limits<uint8_t>::max()) + 1,
                             static_cast<int32_t>(std::numeric_limits<uint16_t>::max()) + 1,
                             static_cast<int32_t>(std::numeric_limits<uint16_t>::max()) + 2};
+  BinTypeSize last{kUint8BinsTypeSize};
   for (int32_t max_num_bin : max_num_bins) {
     auto dmat = RandomDataGenerator(100, 10, 0.0).GenerateDMatrix();
     auto sparse_thresh = 0.2;
@@ -24,28 +25,25 @@ TEST(DenseColumn, Test) {
     for (auto const& page : dmat->GetBatches<SparsePage>()) {
       column_matrix.Init(page, gmat, sparse_thresh, common::OmpGetNumThreads(0));
     }
-
+    ASSERT_GE(column_matrix.GetTypeSize(), last);
+    ASSERT_LE(column_matrix.GetTypeSize(), kUint32BinsTypeSize);
+    last = column_matrix.GetTypeSize();
+    ASSERT_FALSE(column_matrix.AnyMissing());
     for (auto i = 0ull; i < dmat->Info().num_row_; i++) {
       for (auto j = 0ull; j < dmat->Info().num_col_; j++) {
-          switch (column_matrix.GetTypeSize()) {
-            case kUint8BinsTypeSize: {
-                auto col = column_matrix.GetColumn<uint8_t, false>(j);
-                ASSERT_EQ(gmat.index[i * dmat->Info().num_col_ + j],
-                          (*col.get()).GetGlobalBinIdx(i));
-              }
-              break;
-            case kUint16BinsTypeSize: {
-                auto col = column_matrix.GetColumn<uint16_t, false>(j);
-                ASSERT_EQ(gmat.index[i * dmat->Info().num_col_ + j],
-                          (*col.get()).GetGlobalBinIdx(i));
-              }
-              break;
-            case kUint32BinsTypeSize: {
-                auto col = column_matrix.GetColumn<uint32_t, false>(j);
-                ASSERT_EQ(gmat.index[i * dmat->Info().num_col_ + j],
-                          (*col.get()).GetGlobalBinIdx(i));
-              }
-              break;
+        switch (column_matrix.GetTypeSize()) {
+          case kUint8BinsTypeSize: {
+            auto col = column_matrix.GetColumn<uint8_t, false>(j);
+            ASSERT_EQ(gmat.index[i * dmat->Info().num_col_ + j], (*col.get()).GetGlobalBinIdx(i));
+          } break;
+          case kUint16BinsTypeSize: {
+            auto col = column_matrix.GetColumn<uint16_t, false>(j);
+            ASSERT_EQ(gmat.index[i * dmat->Info().num_col_ + j], (*col.get()).GetGlobalBinIdx(i));
+          } break;
+          case kUint32BinsTypeSize: {
+            auto col = column_matrix.GetColumn<uint32_t, false>(j);
+            ASSERT_EQ(gmat.index[i * dmat->Info().num_col_ + j], (*col.get()).GetGlobalBinIdx(i));
+          } break;
         }
       }
     }
@@ -115,6 +113,7 @@ TEST(DenseColumnWithMissing, Test) {
     for (auto const& page : dmat->GetBatches<SparsePage>()) {
       column_matrix.Init(page, gmat, 0.2, common::OmpGetNumThreads(0));
     }
+    ASSERT_TRUE(column_matrix.AnyMissing());
     switch (column_matrix.GetTypeSize()) {
       case kUint8BinsTypeSize: {
           auto col = column_matrix.GetColumn<uint8_t, true>(0);