Changeset 723 for trunk/yat/utility/stl_utility.cc

Timestamp:

Jan 1, 2007, 4:58:01 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Fixes #10. Removed read_to*(std::vector..) functionality.

File:

• trunk/yat/utility/stl_utility.cc (modified) (2 diffs)

trunk/yat/utility/stl_utility.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2006 Jari Häkkinen
+  Copyright (C) 2006, 2007 Jari Häkkinen
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -36 +36 @@
 namespace utility {
 
-  bool read_to_double(std::istream& is, std::vector<double>& vec)
-  {
-    vec.resize(0);
-    std::vector<std::string> vec_str;
-    if (read_to_string(is,vec_str)){
-      for (size_t i=0; i<vec_str.size(); i++) {
-        if (is_double(vec_str[i])) {
-          vec.push_back(atof(vec_str[i].c_str()));
-        }
-        else if (is_nan(vec_str[i])) {
-          vec.push_back(std::numeric_limits<double>::quiet_NaN());
-        }
-        else {
-          // Jari, this should be communicated with as an exception.
-          //          std::cerr << "Warning: '" << vec_str[i] 
-          //                    << "' is not a number." << std::endl;
-        }
-      }
-      return true;
-    }
-    else 
-      return false;
-  }
-
-
-  bool read_to_int(std::istream& is, std::vector<int>& vec)
-  {
-    vec.resize(0);
-    std::vector<std::string> vec_str;
-    if (read_to_string(is,vec_str)){
-      for (size_t i=0; i<vec_str.size(); i++) {
-        if (is_int(vec_str[i])) {
-          vec.push_back(atoi(vec_str[i].c_str()));
-        }
-        else if (is_nan(vec_str[i])) {
-          vec.push_back(std::numeric_limits<int>::quiet_NaN());
-        }
-        else {
-          // Jari, this should be communicated with as an exception.
-          //          std::cerr << "Warning: '" << vec_str[i] 
-          //                    << "' is not an integer." << std::endl;
-        }
-      }
-      return true;
-    }
-    else 
-      return false;
-  }
-
-
-  bool read_to_string(std::istream& is, std::vector<std::string>& vec)
-  {
-    vec.resize(0);
-    std::string s;
-    if (getline(is, s, '\n')){
-      std::istringstream line(s);
-      std::string tmp_string;
-      while (line >> tmp_string) 
-        vec.push_back(tmp_string);
-      return true;
-    }
-    else 
-      return false;
-  }
-
-
   void to_lower(std::string& s)
   {