Changeset 1499

Timestamp:

Aug 27, 2012, 11:54:38 PM (10 years ago)

Author:

Peter Johansson

Message:

refs #519. Update to latest yat/utility.h. Limit the fetch to one file only as a full fetch seemed intrusive (and belong in trunk).

File:

• branches/0.9-stable/yat/utility.h (modified) (9 diffs)

branches/0.9-stable/yat/utility.h

@@ -2 +2 @@
 #define _theplu_yat_utility_utility_ 
 
-// $Id: utility.h 2273 2010-06-15 02:11:47Z peter $
+// $Id: utility.h 2673 2011-12-03 00:30:12Z peter $
 
 /*
@@ -8 +8 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009, 2010 Peter Johansson
+  Copyright (C) 2009, 2010, 2011 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -35 +35 @@
 #include "Exception.h"
 
+#include <algorithm>
+#include <cctype>
 #include <cmath>
+#include <functional>
 #include <limits>
+#include <locale>
 #include <istream>
 #include <string>
@@ -62 +66 @@
                      OutputIterator result);
 
+  /**
+     \brief convert T to a string
+
+     T is supposed to be a numerical type.
+
+     \since new in yat 0.8
+   */
+  template<typename T>
+  std::string convert(T input);
 
   /**
@@ -72 +85 @@
 
   /**
-     \brief check if string is convertible to (numerical) type
+     \brief check if string is convertible to (numerical) type \c T
 
      \since New in yat 0.5
@@ -259 +272 @@
 
   // template implementations
+  template<typename T>
+  std::string convert(T input)
+  {
+    std::ostringstream ss;
+    ss << input;
+    return ss.str();
+  }
+
+
   template<typename T>
   T convert(const std::string& s)
@@ -300 +322 @@
       if (rectangle && nof_columns && v.size()!=nof_columns) {
         std::ostringstream s;
-        s << "load data file error: "
+        s << "load stream error: "
           << "line " << matrix.size() << " has " << v.size()
           << " columns; expected " << nof_columns << " columns.";
@@ -313 +335 @@
 
   template<typename T>
-  void load(std::istream& is, std::vector<T>& vec, char sep='\0')
+  void load(std::istream& is, std::vector<T>& vec, char sep)
   {
     detail::VectorPusher<T> pusher;
@@ -334 +356 @@
   bool convert(const std::string& s, T& result)
   {
+    if (!std::numeric_limits<T>::is_signed) {
+      // first non-whitespace character
+      std::string::const_iterator iter = s.begin();
+      while (iter!=s.end() && std::isspace(*iter))
+        ++iter;
+      // unsigned int cannot start with a '-' and with some compilers
+      // operation ss >> result won't fail so catch it like this instead.
+      if (iter==s.end() || *iter=='-')
+        return false;
+    }
     std::istringstream ss(s);
     ss >> result;