Using boost for prefix/suffix checks /Jeroen Vermeulen

2 files changed, 7 insertions, 2 deletions

diff --git a/vw/ClassifierFactory.cpp b/vw/ClassifierFactory.cpp
index 286bf84a6..4d8ee4e54 100644
--- a/vw/ClassifierFactory.cpp
+++ b/vw/ClassifierFactory.cpp
@@ -2,6 +2,9 @@
 #include "vw.h"
 #include "../moses/Util.h"
 #include <iostream>
+#include <boost/algorithm/string/predicate.hpp>
+
+using namespace boost::algorithm;
 
 namespace Discriminative
 {
@@ -15,7 +18,7 @@ ClassifierFactory::ClassifierFactory(const std::string &modelFile, const std::st
 ClassifierFactory::ClassifierFactory(const std::string &modelFilePrefix)
   : m_lastId(0), m_train(true)
 {
-  if (modelFilePrefix.size() > 3 && modelFilePrefix.substr(modelFilePrefix.size() - 3, 3) == ".gz") {
+  if (ends_with(modelFilePrefix, ".gz")) {
     m_modelFilePrefix = modelFilePrefix.substr(0, modelFilePrefix.size() - 3);
     m_gzip = true;
   } else {
diff --git a/vw/VWTrainer.cpp b/vw/VWTrainer.cpp
index dff58a1de..e513de3d2 100644
--- a/vw/VWTrainer.cpp
+++ b/vw/VWTrainer.cpp
@@ -1,8 +1,10 @@
 #include "Util.h"
 #include "Classifier.h"
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/iostreams/device/file.hpp>
 
 using namespace std;
+using namespace boost::algorithm;
 using namespace Moses;
 
 namespace Discriminative
@@ -10,7 +12,7 @@ namespace Discriminative
 
 VWTrainer::VWTrainer(const std::string &outputFile)
 {
-  if (outputFile.size() > 3 && outputFile.substr(outputFile.size() - 3, 3) == ".gz") {
+  if (ends_with(outputFile, ".gz")) {
     m_bfos.push(boost::iostreams::gzip_compressor());
   }
   m_bfos.push(boost::iostreams::file_sink(outputFile));