[mlpack] 147/207: support tsv

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch master
in repository mlpack.

commit d9c76da5c15f8ff3216fbac74c9bc268204a5e39
Author: stereomatchingkiss <stereomatchingkiss at gmail.com>
Date:   Sun Jun 5 10:52:24 2016 +0800

    support tsv
---
 src/mlpack/core/data/load_csv.hpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/mlpack/core/data/load_csv.hpp b/src/mlpack/core/data/load_csv.hpp
index 91a81ab..5f4bad2 100644
--- a/src/mlpack/core/data/load_csv.hpp
+++ b/src/mlpack/core/data/load_csv.hpp
@@ -29,7 +29,9 @@ namespace data /** Functions to load and save matrices and models. */ {
 class LoadCSV
 {      
 public:
-  explicit LoadCSV(std::string const &file) : inFile(file)
+  explicit LoadCSV(const std::string &file) :
+    extension(Extension(file)),
+    inFile(file)
   {
     if(!inFile.is_open())
     {
@@ -292,10 +294,20 @@ private:
   boost::spirit::qi::rule<std::string::iterator, iter_type()> CreateCharRule() const
   {
     using namespace boost::spirit;
-    return -qi::omit[*qi::char_(" ")] >> qi::raw[*~qi::char_(" ,\r\n")]
-        >> -qi::omit[*qi::char_(" ")];
+
+    if(extension == "csv")
+    {
+      return -qi::omit[*qi::char_(" ")] >> qi::raw[*~qi::char_(" ,\r\n")]
+          >> -qi::omit[*qi::char_(" ")];
+    }
+    else
+    {
+      return -qi::omit[*qi::char_(" ")] >> qi::raw[*~qi::char_(" \t\r\n")]
+          >> -qi::omit[*qi::char_(" ")];
+    }
   }
 
+  std::string extension;
   std::ifstream inFile;
 };
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git