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

Comparing trunk/src/utils/StringTokenizer.hpp (file contents):
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 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, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 51 | Line 51
51   #define UTIL_STRINGTOKENIZER_HPP
52  
53   #include <string>
54 + #include <stdlib.h>
55   #include <vector>
56 + #include "config.h"
57 + namespace OpenMD {
58  
56 – namespace oopse {
57 –
59    /**
60     * @class StringTokenizer.hpp "util/StringTokenizer.hpp"
61     * @brief The string tokenizer class allows an application to break a string into tokens
# Line 147 | Line 148 | namespace oopse {
148      float nextTokenAsFloat();
149  
150      /**
151 <     * Returns the next token from this string tokenizer as a double.
152 <     * @return the next token from this string tokenizer as a double.
151 >     * Returns the next token from this string tokenizer as a RealType.
152 >     * @return the next token from this string tokenizer as a RealType.
153       */
154 <    double nextTokenAsDouble();
154 >    RealType nextTokenAsDouble();
155  
156      /**
157       * Returns the next token without advancing the position of the StringTokenizer.
# Line 202 | Line 203 | namespace oopse {
203      std::string::const_iterator end_;
204    };
205  
206 < }                               //namespace oopse
206 > }                               //namespace OpenMD
207  
208   #endif                          //UTIL_STRINGTOKENIZER_HPP

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines