From 80d72c6b039f53acbf68ca55e292ea30c8d3c9f4 Mon Sep 17 00:00:00 2001
From: Ryan Curtin <ryan@ratml.org>
Date: Mon, 15 Aug 2022 08:55:48 -0400
Subject: [PATCH] Fix various includes.

---
 src/mlpack/core/data/data.hpp                          | 1 +
 src/mlpack/core/tree/tree.hpp                          | 1 +
 src/mlpack/methods/bias_svd/bias_svd.hpp               | 3 +--
 src/mlpack/methods/decision_tree/decision_tree.hpp     | 1 +
 src/mlpack/methods/kmeans/kmeans.hpp                   | 5 ++++-
 src/mlpack/methods/regularized_svd/regularized_svd.hpp | 1 -
 src/mlpack/methods/svdplusplus/svdplusplus.hpp         | 1 -
 src/mlpack/tests/callback_test.cpp                     | 5 +++++
 src/mlpack/tests/cv_test.cpp                           | 2 +-
 src/mlpack/tests/krann_search_test.cpp                 | 1 +
 src/mlpack/tests/ub_tree_test.cpp                      | 1 +
 src/mlpack/tests/vantage_point_tree_test.cpp           | 1 +
 12 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/mlpack/core/data/data.hpp b/src/mlpack/core/data/data.hpp
index b1ee752f96..767ed6f83f 100644
--- a/src/mlpack/core/data/data.hpp
+++ b/src/mlpack/core/data/data.hpp
@@ -26,6 +26,7 @@
 #include "confusion_matrix.hpp"
 #include "dataset_mapper.hpp"
 #include "image_info.hpp"
+#include "imputer.hpp"
 #include "is_naninf.hpp"
 #include "normalize_labels.hpp"
 #include "one_hot_encoding.hpp"
diff --git a/src/mlpack/core/tree/tree.hpp b/src/mlpack/core/tree/tree.hpp
index 421dca08ee..f1f049fb2c 100644
--- a/src/mlpack/core/tree/tree.hpp
+++ b/src/mlpack/core/tree/tree.hpp
@@ -10,6 +10,7 @@
 #include "bounds.hpp"
 
 #include "binary_space_tree.hpp"
+#include "cosine_tree/cosine_tree.hpp"
 #include "cover_tree.hpp"
 #include "example_tree.hpp"
 #include "octree.hpp"
diff --git a/src/mlpack/methods/bias_svd/bias_svd.hpp b/src/mlpack/methods/bias_svd/bias_svd.hpp
index c1127a875e..ec9d6e8790 100644
--- a/src/mlpack/methods/bias_svd/bias_svd.hpp
+++ b/src/mlpack/methods/bias_svd/bias_svd.hpp
@@ -14,9 +14,8 @@
 #ifndef MLPACK_METHODS_BIAS_SVD_BIAS_SVD_HPP
 #define MLPACK_METHODS_BIAS_SVD_BIAS_SVD_HPP
 
-#include <mlpack/prereqs.hpp>
+#include <mlpack/core.hpp>
 #include <ensmallen.hpp>
-#include <mlpack/methods/cf/cf.hpp>
 
 #include "bias_svd_function.hpp"
 
diff --git a/src/mlpack/methods/decision_tree/decision_tree.hpp b/src/mlpack/methods/decision_tree/decision_tree.hpp
index dea35fb555..33067e2ffb 100644
--- a/src/mlpack/methods/decision_tree/decision_tree.hpp
+++ b/src/mlpack/methods/decision_tree/decision_tree.hpp
@@ -27,6 +27,7 @@
 
 #include "all_dimension_select.hpp"
 #include "random_dimension_select.hpp"
+#include "multiple_random_dimension_select.hpp"
 
 #include <type_traits>
 
diff --git a/src/mlpack/methods/kmeans/kmeans.hpp b/src/mlpack/methods/kmeans/kmeans.hpp
index 2534cb3c36..0395a277b0 100644
--- a/src/mlpack/methods/kmeans/kmeans.hpp
+++ b/src/mlpack/methods/kmeans/kmeans.hpp
@@ -17,7 +17,6 @@
 // Include initialization strategies.
 #include "sample_initialization.hpp"
 #include "kmeans_plus_plus_initialization.hpp"
-#include "refined_start.hpp"
 #include "random_partition.hpp"
 
 // Include empty cluster policies.
@@ -208,4 +207,8 @@ class KMeans
 // Include implementation.
 #include "kmeans_impl.hpp"
 
+// The refined start initialization strategy uses KMeans, so it must be included
+// afterwards.
+#include "refined_start.hpp"
+
 #endif // MLPACK_METHODS_KMEANS_KMEANS_HPP
diff --git a/src/mlpack/methods/regularized_svd/regularized_svd.hpp b/src/mlpack/methods/regularized_svd/regularized_svd.hpp
index fbd21c8699..1335d93603 100644
--- a/src/mlpack/methods/regularized_svd/regularized_svd.hpp
+++ b/src/mlpack/methods/regularized_svd/regularized_svd.hpp
@@ -15,7 +15,6 @@
 
 #include <mlpack/prereqs.hpp>
 #include <ensmallen.hpp>
-#include <mlpack/methods/cf/cf.hpp>
 
 #include "regularized_svd_function.hpp"
 
diff --git a/src/mlpack/methods/svdplusplus/svdplusplus.hpp b/src/mlpack/methods/svdplusplus/svdplusplus.hpp
index 4d8997e5de..309463bd0d 100644
--- a/src/mlpack/methods/svdplusplus/svdplusplus.hpp
+++ b/src/mlpack/methods/svdplusplus/svdplusplus.hpp
@@ -15,7 +15,6 @@
 #define MLPACK_METHODS_SVDPLUSPLUS_SVDPLUSPLUS_HPP
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/cf/cf.hpp>
 
 #include <ensmallen.hpp>
 
diff --git a/src/mlpack/tests/callback_test.cpp b/src/mlpack/tests/callback_test.cpp
index a0170619dd..6d18555b0e 100644
--- a/src/mlpack/tests/callback_test.cpp
+++ b/src/mlpack/tests/callback_test.cpp
@@ -12,6 +12,11 @@
 #include <ensmallen_bits/callbacks/callbacks.hpp>
 #include <mlpack/core.hpp>
 #include <mlpack/methods/ann/ann.hpp>
+#include <mlpack/methods/lmnn/lmnn.hpp>
+#include <mlpack/methods/logistic_regression/logistic_regression.hpp>
+#include <mlpack/methods/nca/nca.hpp>
+#include <mlpack/methods/softmax_regression/softmax_regression.hpp>
+#include <mlpack/methods/sparse_autoencoder/sparse_autoencoder.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/cv_test.cpp b/src/mlpack/tests/cv_test.cpp
index b9980baa1d..70d2452cf4 100644
--- a/src/mlpack/tests/cv_test.cpp
+++ b/src/mlpack/tests/cv_test.cpp
@@ -11,7 +11,7 @@
 
 #include <type_traits>
 
-#include <mlpack/core/core.hpp>
+#include <mlpack/core.hpp>
 #include <mlpack/methods/ann/ann.hpp>
 #include <mlpack/methods/decision_tree/decision_tree.hpp>
 #include <mlpack/methods/hoeffding_trees/hoeffding_trees.hpp>
diff --git a/src/mlpack/tests/krann_search_test.cpp b/src/mlpack/tests/krann_search_test.cpp
index 987ba21fc5..a45b001ae7 100644
--- a/src/mlpack/tests/krann_search_test.cpp
+++ b/src/mlpack/tests/krann_search_test.cpp
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <mlpack/core.hpp>
 #include <mlpack/methods/rann/rann.hpp>
+#include <mlpack/methods/rann/ra_model.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/ub_tree_test.cpp b/src/mlpack/tests/ub_tree_test.cpp
index 4fe17e888b..a7591ce092 100644
--- a/src/mlpack/tests/ub_tree_test.cpp
+++ b/src/mlpack/tests/ub_tree_test.cpp
@@ -10,6 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
+#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
 
 #include "catch.hpp"
 
diff --git a/src/mlpack/tests/vantage_point_tree_test.cpp b/src/mlpack/tests/vantage_point_tree_test.cpp
index a5a4c81151..8025c6902c 100644
--- a/src/mlpack/tests/vantage_point_tree_test.cpp
+++ b/src/mlpack/tests/vantage_point_tree_test.cpp
@@ -9,6 +9,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
+#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
 
 #include "catch.hpp"
 #include "test_catch_tools.hpp"