--- trunk/src/utils/Tuple.hpp	2005/12/10 16:54:40	808
+++ branches/development/src/utils/Tuple.hpp	2010/07/09 23:08:25	1465
@@ -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,12 +28,21 @@
  * 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).                        
  */
  
 #ifndef UTILS_TUPLE_HPP
 #define UTILS_TUPLE_HPP
 
-namespace oopse {
+namespace OpenMD {
 
   template <class T1, class T2, class T3>
   struct tuple3 {
@@ -92,6 +92,25 @@ inline bool operator < (const tuple3<T1, T2, T3>& t1, 
              || (!(t2.first < t1.first) && !(t2.second < t2.second) && t1.third < t2.third);
 }
 
+
+inline bool operator < (const tuple3<int, int, std::vector<std::string> >& t1, const tuple3<int, int, std::vector<std::string> >& t2) {
+  
+  if (t1.first < t2.first)
+    return true;
+  else {
+    if (t1.first > t2.first) 
+      return false;
+    
+    if (t1.second < t2.second) 
+      return true;
+    else 
+      if (t1.second > t2.second) 
+	return false;
+    
+    return true;
+  }  
+}
+
 template<class T1, class T2, class T3, class T4>
 inline bool operator < (const tuple4<T1, T2, T3, T4>& t1, const tuple4<T1, T2, T3, T4>& t2) {