--- trunk/OOPSE-2.0/src/utils/next_combination.hpp	2004/10/28 22:34:01	1682
+++ trunk/OOPSE-2.0/src/utils/next_combination.hpp	2005/01/12 22:41:40	1930
@@ -1,28 +1,44 @@
-/*
- * Copyright (C) 2000-2004  Object Oriented Parallel Simulation Engine (OOPSE) project
- * 
- * Contact: oopse@oopse.org
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- * All we ask is that proper credit is given for our work, which includes
- * - but is not limited to - adding the above copyright notice to the beginning
- * of your source code files, and to any copyright notice that you may distribute
- * with programs based on this work.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ /*
+ * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
+ * The University of Notre Dame grants you ("Licensee") a
+ * non-exclusive, royalty free, license to use, modify and
+ * 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
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 3. 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.
+ *
+ * This software is provided "AS IS," without a warranty of any
+ * kind. All express or implied conditions, representations and
+ * warranties, including any implied warranty of merchantability,
+ * fitness for a particular purpose or non-infringement, are hereby
+ * excluded.  The University of Notre Dame and its licensors shall not
+ * be liable for any damages suffered by licensee as a result of
+ * using, modifying or distributing the software or its
+ * derivatives. In no event will the University of Notre Dame or its
+ * licensors be liable for any lost revenue, profit or data, or for
+ * direct, indirect, special, consequential, incidental or punitive
+ * damages, however caused and regardless of the theory of liability,
+ * 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.
  */
-
+ 
 /**
  * @file next_combination.hpp
  * @author    tlin
@@ -130,62 +146,6 @@ bool next_combination(IteratorContainer<RandomAccessIt
     }
 } //end next_combination
 
-/**
- * @brief iteratively replace the sequence with wild cards
- * @return true if more combination sequence is avaliable, otherwise return true
- * @param cont iterator container, if expect the whole series of combinations,  pass an empty iterator 
- * container. The user should not modify this iterator container
- * @param sequence the whole sequence used to generate combination
- * @param result a possible combination sequence which is set on return
- * @param wildCard the wild card string. Its value is "X" by default
- * @note since next_combination never returns an empty sequence, replaceWildCard will not generate 
- * one special combination, which is n identical wild cards (n is equal to the size of the passing sequence)
- * 
- * @code
- * std::vector<std::string> sv;
- * std::vector<std::vector<std::string>::iterator> sic;
- * std::vector<std::string> resultString;
- * sv.push_back("H");
- * sv.push_back("C");
- * sv.push_back("N");
-
- * while (replaceWildCard(sic, sv, resultString)) {   
- *     for(std::vector<std::string>::iterator i = resultString.begin(); i != resultString.end(); ++i) {
- *         std::cout << *i << "\t";
- *     }
- *     std::cout << std::endl;
- * }
- * //output
- * //H X X
- * //X C X
- * //X X N
- * //H C X
- * //H X N
- * //X C N
- * //H C N
- * @endcode
- */
-bool replaceWildCard(std::vector<std::vector<std::string>::iterator>& cont,
-                                             std::vector<std::string>& sequence, std::vector<std::string>& result,
-                                             const std::string& wildCard = "X") {
-    if (cont.size() > sequence.size()) {
-        std::cerr << "the size of iterator container is greater than the size of sequence";
-    }
-
-    bool hasMoreCombination = next_combination(cont, sequence.begin(), sequence.end());
-    if (hasMoreCombination) {
-        result.clear();
-        result.insert(result.begin(), sequence.size(), wildCard);
-        std::vector<std::vector<std::string>::iterator>::iterator i;
-        for ( i = cont.begin(); i != cont.end(); i++){
-            result[*i - sequence.begin()] = **i;
-        }
-    }
-
-     return hasMoreCombination;
-    
-}//end replaceWildCard
-
 } //end namespace oopse
 #endif //UTILS_NEXT_COMBINATION_HPP