Changeset 597 for trunk/se/lu/thep/wenni/lib/c++_tools/gslapi/vector.h

Timestamp:

Feb 28, 2008, 12:36:46 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Improved memory usage of NNIFileConverter.

File:

• trunk/se/lu/thep/wenni/lib/c++_tools/gslapi/vector.h (modified) (4 diffs)

trunk/se/lu/thep/wenni/lib/c++_tools/gslapi/vector.h

@@ +1 @@
+#ifndef _theplu_gslapi_vector_
+#define _theplu_gslapi_vector_
+
 // $Id$
 
@@ -5 +8 @@
   Copyright (C) 2004 Jari Häkkinen, Peter Johansson
   Copyright (C) 2005 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2006 Jari Häkkinen
+  Copyright (C) 2006, 2008 Jari Häkkinen
 
   This file is part of the thep c++ tools library,
@@ -26 +29 @@
 */
 
-#ifndef _theplu_gslapi_vector_
-#define _theplu_gslapi_vector_
-
 #include <c++_tools/utility/Exception.h>
 
 #include <iostream>
+#include <string>
+#include <utility>
 #include <vector>
-#include <utility>
 
 #include <gsl/gsl_vector.h>
@@ -179 +180 @@
     ///
     explicit vector(std::istream &, char sep='\0') throw (utility::IO_error,std::exception);
+
+    ///
+    /// The string constructor.
+    ///
+    /// Either elements should be separated 
+    /// with white space characters (default), or elements should be separated
+    /// by the delimiter \a sep. When delimiter \a sep is used empty elements
+    /// are stored as NaN's (except that empty lines are ignored). The
+    /// end of input to the vector is at end of file marker.
+    ///
+    explicit vector(std::string &, char sep='\0') throw (utility::IO_error,std::exception);