ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/utils/next_combination.hpp
(Generate patch)

Comparing trunk/src/utils/next_combination.hpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 52 | Line 53
53   #include <vector>
54   #include <iterator>
55   #include <iostream>
56 < namespace oopse {
56 > namespace OpenMD {
57  
58    /**
59 <   * @brief STL next_permuationtation like combination sequence generator.
59 >   * @brief STL next_permuation-like combination sequence generator.
60     * Given the first and last iterator of a sequence, next_combination iteratively generates all
61     * possible combinations.
62     * @return if more combination is availiable, otherwise return false
# Line 110 | Line 111 | namespace oopse {
111        //For instance, sequence may contain 6, 7, 8, 9 at this time, we need to increase the size
112        // of combination to 5
113        typename std::vector<RandomAccessIterator>::iterator j = i;
114 <      j--;
114 >      --j;
115        while( j >= iterContainer.begin() && *i == *j + 1){
116 <        i--;
117 <        j--;
116 >        --i;
117 >        --j;
118        };
119  
120        RandomAccessIterator raIter;
# Line 146 | Line 147 | namespace oopse {
147      }
148    } //end next_combination
149  
150 < } //end namespace oopse
150 > } //end namespace OpenMD
151   #endif //UTILS_NEXT_COMBINATION_HPP
152  

Comparing trunk/src/utils/next_combination.hpp (property svn:keywords):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines