--- trunk/src/utils/StringUtils.hpp	2006/01/09 19:11:52	838
+++ trunk/src/utils/StringUtils.hpp	2010/05/10 17:28:26	1442
@@ -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,15 @@
  * 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, 24107 (2008).          
+ * [4]  Vardeman & Gezelter, in progress (2009).                        
  */
  
 /**
@@ -49,11 +49,12 @@
 #ifndef UTILS_STRINGUTILS_HPP
 #define UTILS_STRINGUTILS_HPP
 #include <string>
+#include <string.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
 
-namespace oopse {
+namespace OpenMD {
  
   /**
    * Converts a string to UPPER CASE
@@ -83,7 +84,7 @@ namespace oopse {
    *
    * @return the line number of the block within the theStream
    */
-  int findBegin(std::istream &theStream, char* startText );
+  int findBegin(std::istream &theStream, const char* startText );
 
   /**
    * Counts the number of tokens on line which are delimited by the characters 
@@ -102,7 +103,11 @@ namespace oopse {
    */
   int isEndLine(char *line);
 
+  bool CaseInsensitiveEquals(char ch1, char ch2);
 
+  size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2);
+
+
   /**
    * Convert a variable to a string
    * @param T data type
@@ -142,7 +147,7 @@ namespace oopse {
 
   bool isInteger(const std::string& str);
   
-  std::string OOPSE_itoa(int value, unsigned int base = 10);
+  std::string OpenMD_itoa(int value, unsigned int base = 10);
   
   /**@todo need implementation */
   std::string getPrefix(const std::string& str);
@@ -150,8 +155,24 @@ namespace oopse {
   /**@todo need implementation */
   std::string getSuffix(const std::string& str);
   
-  
 
+template<class ContainerType>
+std::string containerToString(const ContainerType& cont) {
+    std::ostringstream oss;
+    oss << "(";
+    typename ContainerType::const_iterator i = cont.begin();
+    if (i != cont.end()) {
+        oss << *i;
+        ++i;
+    }
+    for (; i != cont.end();++i) {
+        oss << ", ";
+        oss << *i;
+    }
+    oss << ")";
+    return oss.str();
+}  
+
   
 }  
 #endif