--- trunk/src/utils/StringTokenizer.cpp	2006/05/17 21:51:42	963
+++ trunk/src/utils/StringTokenizer.cpp	2015/03/07 23:52:07	2073
@@ -6,19 +6,10 @@
  * redistribute this software in source and binary code form, provided
  * that the following conditions are met:
  *
- * 1. Acknowledgement of the program authors must be made in any
- *    publication of scientific results based in part on use of the
- *    program.  An acceptable form of acknowledgement is citation of
- *    the article in which the program was described (Matthew
- *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
- *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
- *    Parallel Simulation Engine for Molecular Dynamics,"
- *    J. Comput. Chem. 26, pp. 252-271 (2005))
- *
- * 2. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 3. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the
  *    distribution.
@@ -37,6 +28,16 @@
  * arising out of the use of or inability to use software, even if the
  * University of Notre Dame has been advised of the possibility of
  * such damages.
+ *
+ * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
+ * research, please cite the appropriate papers when you publish your
+ * work.  Good starting points are:
+ *                                                                      
+ * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
+ * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
+ * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
+ * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
  
 #include <iostream>
@@ -44,28 +45,28 @@
 #include <sstream>
 #include "utils/StringTokenizer.hpp"
 
-namespace oopse {
+namespace OpenMD {
 
 
   StringTokenizer::StringTokenizer(const std::string & str, const std::string & delim) 
     : tokenString_(str), delim_(delim), returnTokens_(false),
       currentPos_(tokenString_.begin()), end_(tokenString_.end()){
 
-    }
+  }
 
   StringTokenizer::StringTokenizer(std::string::const_iterator& first, std::string::const_iterator& last,
 				   const std::string & delim)  
     : tokenString_(first, last) , delim_(delim), returnTokens_(false),
       currentPos_(tokenString_.begin()), end_(tokenString_.end()) {
 
-    }
+  }
 
   StringTokenizer::StringTokenizer(const std::string&str, const std::string&delim,
 				   bool returnTokens)
     : tokenString_(str), delim_(delim), returnTokens_(returnTokens),
       currentPos_(tokenString_.begin()), end_(tokenString_.end()) {
 
-    }
+  }
 
   bool StringTokenizer::isDelimiter(const char c) {
     return delim_.find(c) == std::string::npos ? false : true;
@@ -113,7 +114,8 @@ namespace oopse {
     } else {
       std::string::const_iterator i = currentPos_;
 
-      //walk through the remaining string to check whether it contains non-delimeter or not
+      //walk through the remaining string to check whether it contains
+      //non-delimeter or not
       while(i != end_ && isDelimiter(*i)) {
 	++i;
       }
@@ -147,6 +149,25 @@ namespace oopse {
     return result;
   }
 
+  void StringTokenizer::skipToken() {
+
+    if(currentPos_ != end_) {
+      while( currentPos_ != end_ && isDelimiter(*currentPos_)) {
+
+	if (returnTokens_) {
+	  *currentPos_++;
+          return;
+	}
+            
+	++currentPos_;
+      }
+
+      while (currentPos_ != end_ && !isDelimiter(*currentPos_)) {
+	*currentPos_++;
+      }
+    }
+  }
+
   bool StringTokenizer::nextTokenAsBool() {
     std::string token = nextToken();
     std::istringstream iss(token);
@@ -205,13 +226,13 @@ namespace oopse {
     return result;    
   }
 
- std::vector<std::string>  StringTokenizer::getAllTokens() {
+  std::vector<std::string>  StringTokenizer::getAllTokens() {
     std::vector<std::string> tokens;
     while (hasMoreTokens()) {
-        tokens.push_back(nextToken());
+      tokens.push_back(nextToken());
     }
     return tokens;
- }
+  }
   void StringTokenizer::convertFortranNumber(std::string& fortranNumber) {
     std::string::iterator i;
     for(i = fortranNumber.begin(); i != fortranNumber.end(); ++i) {
@@ -221,5 +242,20 @@ namespace oopse {
     }
   }
 
-}//end namespace oopse
+  std::string  StringTokenizer::getRemainingString() {
+    std::string result;
+    std::string::const_iterator tmpIter = currentPos_;
+    if(tmpIter != end_) {
+      std::insert_iterator<std::string> insertIter(result, result.begin());
+      
+      while (tmpIter != end_) {
+	*insertIter++ = *tmpIter++;
+      }
+    }
+    
+    return result;
+  }
 
+  
+}//end namespace OpenMD
+