[ML] Replace boost functions by their std equivalents (#508) (#510)

Following boost functions have been raplaced with their std equivalents: boost::array, boost::begin, boost::end, boost::is_pod, boost::ref, boost::cref, boost::reference_wrapper, boost::make_unique, boost::algorithm::is_sorted, boost::bind.

Due to the limitations of the std::ref implementation, boost::ref cannot be removed where it is used in Input and Output filters (e.g. lib/core/CCompressOStream.cc and lib/core/CStateDecompressor.cc).

Author: valeriy42

bin/autoconfig/Main.cc

@@ -32,8 +32,6 @@
 
 #include "CCmdLineParser.h"
 
-#include <boost/bind.hpp>
-
 #include <memory>
 #include <string>
 

bin/autodetect/Main.cc

@@ -46,8 +46,7 @@
 
 #include "CCmdLineParser.h"
 
-#include <boost/bind.hpp>
-
+#include <functional>
 #include <memory>
 #include <string>
 
@@ -242,8 +241,8 @@ int main(int argc, char** argv) {
 
     // The anomaly job knows how to detect anomalies
     ml::api::CAnomalyJob job(jobId, limits, fieldConfig, modelConfig, wrappedOutputStream,
-                             boost::bind(&ml::api::CModelSnapshotJsonWriter::write,
-                                         &modelSnapshotWriter, _1),
+                             std::bind(&ml::api::CModelSnapshotJsonWriter::write,
+                                       &modelSnapshotWriter, std::placeholders::_1),
                              periodicPersister.get(), maxQuantileInterval,
                              timeField, timeFormat, maxAnomalyRecords);
 
@@ -274,8 +273,9 @@ int main(int argc, char** argv) {
     }
 
     if (periodicPersister != nullptr) {
-        periodicPersister->firstProcessorPeriodicPersistFunc(boost::bind(
-            &ml::api::CDataProcessor::periodicPersistState, firstProcessor, _1));
+        periodicPersister->firstProcessorPeriodicPersistFunc(
+            std::bind(&ml::api::CDataProcessor::periodicPersistState,
+                      firstProcessor, std::placeholders::_1));
     }
 
     // The skeleton avoids the need to duplicate a lot of boilerplate code

bin/categorize/Main.cc

@@ -42,8 +42,7 @@
 
 #include "CCmdLineParser.h"
 
-#include <boost/bind.hpp>
-
+#include <functional>
 #include <memory>
 #include <string>
 
@@ -177,8 +176,8 @@ int main(int argc, char** argv) {
                                    outputWriter, periodicPersister.get());
 
     if (periodicPersister != nullptr) {
-        periodicPersister->firstProcessorPeriodicPersistFunc(boost::bind(
-            &ml::api::CFieldDataTyper::periodicPersistState, &typer, _1));
+        periodicPersister->firstProcessorPeriodicPersistFunc(std::bind(
+            &ml::api::CFieldDataTyper::periodicPersistState, &typer, std::placeholders::_1));
     }
 
     // The skeleton avoids the need to duplicate a lot of boilerplate code

bin/normalize/Main.cc

@@ -32,8 +32,7 @@
 
 #include "CCmdLineParser.h"
 
-#include <boost/bind.hpp>
-
+#include <functional>
 #include <memory>
 #include <string>
 
@@ -128,8 +127,9 @@ int main(int argc, char** argv) {
     }
 
     // Now handle the numbers to be normalised from stdin
-    if (inputParser->readStreamIntoMaps(boost::bind(
-            &ml::api::CResultNormalizer::handleRecord, &normalizer, _1)) == false) {
+    if (inputParser->readStreamIntoMaps(
+            std::bind(&ml::api::CResultNormalizer::handleRecord, &normalizer,
+                      std::placeholders::_1)) == false) {
         LOG_FATAL(<< "Failed to handle input to be normalized");
         return EXIT_FAILURE;
     }

include/api/CBackgroundPersister.h

@@ -47,7 +47,7 @@ namespace api {
 //! This class expects to call a persistence function taking
 //! just the data adder as an argument.  It's easy to wrap up
 //! extra data to be passed to a function that requires more by
-//! using a boost:bind.  boost::bind copies its arguments, which
+//! using a std::bind.  std::bind copies its arguments, which
 //! is generally what is required for access in a separate
 //! thread.  However, note that a couple of copies are made, so
 //! if the bound data is very large then binding a

include/api/CInputParser.h

@@ -10,7 +10,6 @@
 
 #include <api/ImportExport.h>
 
-#include <boost/ref.hpp>
 #include <boost/unordered_map.hpp>
 
 #include <functional>
@@ -43,7 +42,7 @@ class API_EXPORT CInputParser : private core::CNonCopyable {
 
     //! For fast access to the field values without repeatedly computing the
     //! hash, we maintain references to the values in the hash map
-    using TStrRef = boost::reference_wrapper<std::string>;
+    using TStrRef = std::reference_wrapper<std::string>;
     using TStrRefVec = std::vector<TStrRef>;
     using TStrRefVecItr = TStrRefVec::iterator;
     using TStrRefVecCItr = TStrRefVec::const_iterator;

include/api/CLengthEncodedInputParser.h

@@ -116,7 +116,7 @@ class API_EXPORT CLengthEncodedInputParser : public CInputParser {
 
     //! Attempt to parse a single length encoded record from the stream into
     //! the strings in the vector provided.  The vector is a template
-    //! argument so that it may be a vector of boost::reference_wrappers
+    //! argument so that it may be a vector of std::reference_wrappers
     //! of std::strings instead of std::strings.  The first template
     //! argument indicates whether the vector must have the correct size
     //! when the function is called or whether the function is allowed to

include/api/COutputChainer.h

@@ -9,8 +9,7 @@
 #include <api/COutputHandler.h>
 #include <api/ImportExport.h>
 
-#include <boost/ref.hpp>
-
+#include <functional>
 #include <string>
 
 namespace ml {
@@ -102,7 +101,7 @@ class API_EXPORT COutputChainer : public COutputHandler {
     //! processor
     TStrStrUMap m_WorkRecordFields;
 
-    using TStrRef = boost::reference_wrapper<std::string>;
+    using TStrRef = std::reference_wrapper<std::string>;
     using TStrRefVec = std::vector<TStrRef>;
     using TStrRefVecCItr = TStrRefVec::const_iterator;
 

include/config/CAutoconfigurerDetectorPenalties.h

@@ -9,8 +9,7 @@
 
 #include <config/ImportExport.h>
 
-#include <boost/ref.hpp>
-
+#include <functional>
 #include <memory>
 #include <vector>
 
@@ -43,9 +42,9 @@ class CONFIG_EXPORT CAutoconfigurerDetectorPenalties {
     TPenaltyPtr penaltyFor(const CDetectorSpecification& spec);
 
 private:
-    using TAutoconfigurerParamsCRef = boost::reference_wrapper<const CAutoconfigurerParams>;
+    using TAutoconfigurerParamsCRef = std::reference_wrapper<const CAutoconfigurerParams>;
     using TAutoconfigurerFieldRolePenaltiesCRef =
-        boost::reference_wrapper<const CAutoconfigurerFieldRolePenalties>;
+        std::reference_wrapper<const CAutoconfigurerFieldRolePenalties>;
     using TPenaltyPtrVec = std::vector<TPenaltyPtr>;
 
 private:

include/config/CDataCountStatistics.h

@@ -19,11 +19,11 @@
 #include <config/ImportExport.h>
 
 #include <boost/optional.hpp>
-#include <boost/ref.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
 
 #include <cstddef>
+#include <functional>
 #include <stdint.h>
 #include <vector>
 
@@ -203,7 +203,7 @@ class CONFIG_EXPORT CDataCountStatistics {
     using TSizeSizePr = std::pair<std::size_t, std::size_t>;
     using TSizeSizePrUSet = boost::unordered_set<TSizeSizePr>;
     using TOptionalTime = boost::optional<core_t::TTime>;
-    using TAutoconfigurerParamsCRef = boost::reference_wrapper<const CAutoconfigurerParams>;
+    using TAutoconfigurerParamsCRef = std::reference_wrapper<const CAutoconfigurerParams>;
     using TMinTimeAccumulator =
         maths::CBasicStatistics::COrderStatisticsStack<core_t::TTime, 1>;
     using TMaxTimeAccumulator =
@@ -340,7 +340,7 @@ class CONFIG_EXPORT CDataCountStatisticsDirectAddressTable {
     using TSizeVec = std::vector<std::size_t>;
     using TPtrDiffVec = std::vector<ptrdiff_t>;
     using TPtrDiffVecVec = std::vector<TPtrDiffVec>;
-    using TAutoconfigurerParamsCRef = boost::reference_wrapper<const CAutoconfigurerParams>;
+    using TAutoconfigurerParamsCRef = std::reference_wrapper<const CAutoconfigurerParams>;
     using TDataCountStatisticsPtr = std::shared_ptr<CDataCountStatistics>;
     using TDataCountStatisticsPtrVec = std::vector<TDataCountStatisticsPtr>;
 

include/config/CDetectorEnumerator.h

@@ -11,8 +11,8 @@
 #include <config/ImportExport.h>
 
 #include <boost/optional.hpp>
-#include <boost/ref.hpp>
 
+#include <functional>
 #include <string>
 #include <vector>
 
@@ -72,7 +72,7 @@ class CONFIG_EXPORT CDetectorEnumerator {
     using TStrVec = std::vector<std::string>;
     using TOptionalStr = boost::optional<std::string>;
     using TFunctionCategoryVec = std::vector<config_t::EFunctionCategory>;
-    using TAutoconfigurerParamsCRef = boost::reference_wrapper<const CAutoconfigurerParams>;
+    using TAutoconfigurerParamsCRef = std::reference_wrapper<const CAutoconfigurerParams>;
 
 private:
     //! Add the detectors with no partitioning fields.

include/config/CDetectorRecord.h

@@ -13,9 +13,9 @@
 #include <config/Constants.h>
 #include <config/ImportExport.h>
 
-#include <boost/array.hpp>
 #include <boost/unordered_map.hpp>
 
+#include <array>
 #include <string>
 #include <utility>
 #include <vector>
@@ -32,8 +32,8 @@ class CDetectorSpecification;
 //! and partitioning field(s) used by the detector.
 class CONFIG_EXPORT CDetectorRecord {
 public:
-    using TSizeAry = boost::array<std::size_t, constants::NUMBER_FIELD_INDICES>;
-    using TStrCPtrAry = boost::array<const std::string*, constants::NUMBER_FIELD_INDICES>;
+    using TSizeAry = std::array<std::size_t, constants::NUMBER_FIELD_INDICES>;
+    using TStrCPtrAry = std::array<const std::string*, constants::NUMBER_FIELD_INDICES>;
     using TStrStrUMap = boost::unordered_map<std::string, std::string>;
 
 public:
@@ -138,7 +138,7 @@ class CONFIG_EXPORT CDetectorRecordDirectAddressTable {
     using TSizeVec = std::vector<std::size_t>;
     using TStrSizePr = std::pair<std::string, std::size_t>;
     using TStrSizePrVec = std::vector<TStrSizePr>;
-    using TSizeAry = boost::array<std::size_t, constants::NUMBER_FIELD_INDICES>;
+    using TSizeAry = std::array<std::size_t, constants::NUMBER_FIELD_INDICES>;
     using TSizeAryVec = std::vector<TSizeAry>;
     using TStrCPtrVec = std::vector<const std::string*>;
 

include/config/CDetectorSpecification.h

@@ -13,11 +13,11 @@
 #include <config/Constants.h>
 #include <config/ImportExport.h>
 
-#include <boost/array.hpp>
 #include <boost/operators.hpp>
 #include <boost/optional.hpp>
-#include <boost/ref.hpp>
 
+#include <array>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -203,8 +203,8 @@ class CONFIG_EXPORT CDetectorSpecification
 private:
     using TStrVecVec = std::vector<TStrVec>;
     using TOptionalTime = boost::optional<core_t::TTime>;
-    using TSizeVecCPtrAry = boost::array<const TSizeVec*, 2>;
-    using TAutoconfigurerParamsCRef = boost::reference_wrapper<const CAutoconfigurerParams>;
+    using TSizeVecCPtrAry = std::array<const TSizeVec*, 2>;
+    using TAutoconfigurerParamsCRef = std::reference_wrapper<const CAutoconfigurerParams>;
 
 private:
     //! Get the parameters.

include/config/CFieldStatistics.h

@@ -12,12 +12,12 @@
 #include <config/ConfigTypes.h>
 #include <config/ImportExport.h>
 
+#include <boost/variant.hpp>
+
+#include <functional>
 #include <string>
 #include <vector>
 
-#include <boost/ref.hpp>
-#include <boost/variant.hpp>
-
 namespace ml {
 namespace config {
 class CAutoconfigurerParams;
@@ -30,7 +30,7 @@ class CPenalty;
 //! and gather the appropriate summary statistics.
 class CONFIG_EXPORT CFieldStatistics {
 public:
-    using TAutoconfigurerParamsCRef = boost::reference_wrapper<const CAutoconfigurerParams>;
+    using TAutoconfigurerParamsCRef = std::reference_wrapper<const CAutoconfigurerParams>;
 
 public:
     CFieldStatistics(const std::string& fieldName, const CAutoconfigurerParams& params);

include/config/CLongTailPenalty.h

@@ -10,7 +10,6 @@
 #include <config/CPenalty.h>
 #include <config/ImportExport.h>
 
-#include <boost/ref.hpp>
 #include <boost/unordered_map.hpp>
 
 namespace ml {

include/config/CPenalty.h

@@ -13,9 +13,9 @@
 #include <config/ImportExport.h>
 
 #include <boost/operators.hpp>
-#include <boost/ref.hpp>
 
 #include <cstddef>
+#include <functional>
 #include <memory>
 #include <vector>
 
@@ -125,7 +125,7 @@ class CONFIG_EXPORT CPenalty {
     static bool scoreIsZeroFor(double penalty);
 
 protected:
-    using TAutoconfigurerParamsCRef = boost::reference_wrapper<const CAutoconfigurerParams>;
+    using TAutoconfigurerParamsCRef = std::reference_wrapper<const CAutoconfigurerParams>;
 
 protected:
     //! Get the parameters.

include/core/CCompressedDictionary.h

@@ -11,11 +11,11 @@
 #include <core/CHashing.h>
 #include <core/CStringUtils.h>
 
-#include <boost/array.hpp>
 #include <boost/operators.hpp>
 #include <boost/unordered/unordered_map_fwd.hpp>
 #include <boost/unordered/unordered_set_fwd.hpp>
 
+#include <array>
 #include <map>
 #include <set>
 #include <string>
@@ -42,7 +42,7 @@ namespace core {
 template<std::size_t N>
 class CCompressedDictionary {
 public:
-    using TUInt64Array = boost::array<uint64_t, N>;
+    using TUInt64Array = std::array<uint64_t, N>;
     using TStrCPtr = const std::string*;
 
     //! \brief A hash representation of a string in the dictionary