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

Comparing:
trunk/src/utils/StringUtils.hpp (file contents), Revision 749 by tim, Wed Nov 16 23:10:02 2005 UTC vs.
branches/development/src/utils/StringUtils.hpp (file contents), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 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 49 | Line 49
49   #ifndef UTILS_STRINGUTILS_HPP
50   #define UTILS_STRINGUTILS_HPP
51   #include <string>
52 + #include <string.h>
53   #include <iostream>
54   #include <fstream>
55   #include <sstream>
56  
57 < namespace oopse {
57 > namespace OpenMD {
58  
59    /**
60     * Converts a string to UPPER CASE
# Line 83 | Line 84 | namespace oopse {
84     *
85     * @return the line number of the block within the theStream
86     */
87 <  int findBegin(std::istream &theStream, char* startText );
87 >  int findBegin(std::istream &theStream, const char* startText );
88  
89    /**
90     * Counts the number of tokens on line which are delimited by the characters
# Line 102 | Line 103 | namespace oopse {
103     */
104    int isEndLine(char *line);
105  
106 +  bool CaseInsensitiveEquals(char ch1, char ch2);
107  
108 +  size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2);
109 +
110 +
111    /**
112     * Convert a variable to a string
113     * @param T data type
# Line 139 | Line 144 | namespace oopse {
144      }
145      return ret;
146    }
147 +
148 +  bool isInteger(const std::string& str);
149    
150 <  std::string OOPSE_itoa(int value, unsigned int base = 10);
150 >  std::string OpenMD_itoa(int value, unsigned int base = 10);
151    
152    /**@todo need implementation */
153    std::string getPrefix(const std::string& str);
# Line 148 | Line 155 | namespace oopse {
155    /**@todo need implementation */
156    std::string getSuffix(const std::string& str);
157    
151 –  
158  
159 <  
159 > template<class ContainerType>
160 > std::string containerToString(const ContainerType& cont) {
161 >    std::ostringstream oss;
162 >    oss << "(";
163 >    typename ContainerType::const_iterator i = cont.begin();
164 >    if (i != cont.end()) {
165 >        oss << *i;
166 >        ++i;
167 >    }
168 >    for (; i != cont.end();++i) {
169 >        oss << ", ";
170 >        oss << *i;
171 >    }
172 >    oss << ")";
173 >    return oss.str();
174   }  
175 +
176 +  unsigned long long memparse (char *ptr,  char **retptr);
177 + }  
178   #endif

Comparing:
trunk/src/utils/StringUtils.hpp (property svn:keywords), Revision 749 by tim, Wed Nov 16 23:10:02 2005 UTC vs.
branches/development/src/utils/StringUtils.hpp (property svn:keywords), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

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

Diff Legend

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