Changeset 1057

Timestamp:

Feb 7, 2008, 10:37:14 PM (16 years ago)

Author:

Peter

Message:

extended convert function to accept nan and int (and -int if type is signed)

File:

• trunk/yat/utility/utility.h (modified) (2 diffs)

trunk/yat/utility/utility.h

@@ -51 +51 @@
    */
   template<typename T>
-  T convert(const std::string& s)
-  {
-    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)
-      throw std::runtime_error(std::string("convert(\"")+s+std::string("\")"));
-    return a;
-  }
+  T convert(const std::string& s);
 
   ///
@@ -94 +80 @@
   bool is_nan(const std::string& s);
 
+
+  // template implementations
+  template<typename T>
+  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 std::runtime_error(std::string("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)
+      throw std::runtime_error(std::string("convert(\"")+s+std::string("\")"));
+    return a;
+  }
+
 }}} // of namespace utility, yat, and theplu