Changeset 1105

Timestamp:

Jun 20, 2010, 9:02:18 PM (11 years ago)

Author:

Peter Johansson

Message:

updating to latest yat

File:

• trunk/lib/yat/utility.h (modified) (6 diffs)

trunk/lib/yat/utility.h

@@ -2 +2 @@
 #define _theplu_yat_utility_utility_ 
 
-// $Id: utility.h 2248 2010-04-22 00:57:13Z peter $
+// $Id: utility.h 2273 2010-06-15 02:11:47Z peter $
 
 /*
@@ -8 +8 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -183 +183 @@
 // private namespace
 namespace detail {
+
+  /**
+     \brief convert s to t
+
+     used in function is<T> and convert<T>
+
+     \return true if conversion was successful
+
+     \internal
+   */
+  template<typename T>
+  bool convert(const std::string& s, T& t);
+
   /**
      Functor used in load function
@@ -249 +262 @@
   T convert(const std::string& s)
   {
-    if (is_nan(s))
-      return std::numeric_limits<T>::quiet_NaN();
-    if (is_equal(s, "inf"))
-      return std::numeric_limits<T>::infinity();
-    if (is_equal(s, "-inf")) {
-      if (std::numeric_limits<T>::is_signed)
-        return -std::numeric_limits<T>::infinity();
-      else
-        throw runtime_error(std::string("yat::utility::convert(\"")+s+
-                            std::string("\"): type is unsigned") );
-    }
-    std::stringstream ss(s);
-    T a;
-    ss >> a;
-    bool ok = true;
-    if(ss.fail()) 
-      ok = false;
-    // Check that nothing is left on stream
-    std::string b;
-    ss >> b;
-    if (!b.empty() || !ok)
+    T result;
+    if (!detail::convert(s, result))
       throw runtime_error(std::string("yat::utility::convert(\"")+s+
                           std::string("\")"));
-    return a;
-  }
+    return result;
+  }
+
 
   template<typename T>
   bool is(const std::string& s)
   {
-    if (is_nan(s))
-      return std::numeric_limits<T>::has_quiet_NaN;
-    if (is_equal(s, "inf"))
-      return std::numeric_limits<T>::has_infinity;
-    if (is_equal(s, "-inf"))
-      return std::numeric_limits<T>::has_infinity && 
-        std::numeric_limits<T>::is_signed;
-    std::stringstream ss(s);
-    T a;
-    ss >> a;
-    if(ss.fail())
-      return false;
-    // Check that nothing is left on stream
-    std::string b;
-    ss >> b;
-    return b.empty();
-  }
+    T tmp;
+    return detail::convert(s, tmp);
+  }
+
 
   template<typename T>
@@ -306 +288 @@
       if (line.empty() && ignore_empty)
         continue;
-      matrix.resize(matrix.size()+1);
-      std::vector<double>& v=matrix.back();
+      matrix.push_back(std::vector<T>());
+      std::vector<T>& v=matrix.back();
       v.reserve(nof_columns);
       std::stringstream ss(line);
       load(ss, v, sep);
-      // add NaN for final separator
+      // add NaN for final separator (or empty string if T=std::string)
+      detail::VectorPusher<T> pusher;
       if(sep!='\0' && !line.empty() && line[line.size()-1]==sep) 
-        v.push_back(std::numeric_limits<T>::quiet_NaN());
+        pusher("", v);
       
       if (rectangle && nof_columns && v.size()!=nof_columns) {
@@ -342 +325 @@
       if(!ok)
         break;
-      
       pusher(element, vec);
     }
   }           
 
+
+namespace detail {
+  template<typename T>
+  bool convert(const std::string& s, T& result)
+  {
+    std::istringstream ss(s);
+    ss >> result;
+    if (ss.fail()) {
+      if (is_nan(s)) {
+        result = std::numeric_limits<T>::quiet_NaN();
+        return true;
+      }
+      if (is_equal(s, "inf")) {
+        result = std::numeric_limits<T>::infinity();
+        return true;
+      }
+      if (std::numeric_limits<T>::is_signed && is_equal(s, "-inf")) {
+        result = -std::numeric_limits<T>::infinity();
+        return true;
+      }
+      return false;
+    }
+    // Check that nothing is left on stream
+    std::string b;
+    ss >> b;
+    return b.empty();
+  }
+} // of namespace detail
+
 }}} // of namespace utility, yat, and theplu