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

Comparing:
trunk/src/utils/StringUtils.cpp (file contents), Revision 406 by gezelter, Tue Mar 8 21:07:34 2005 UTC vs.
branches/development/src/utils/StringUtils.cpp (file contents), Revision 1654 by gezelter, Wed Sep 28 19:40:45 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 <
41 >
42 > #include <algorithm>
43 > #include <stdlib.h>
44   #include "utils/StringUtils.hpp"
45  
46 < namespace oopse {
46 > namespace OpenMD {
47    std::string UpperCase(const std::string& S) {
48      std::string uc = S;
49      unsigned int n = uc.size();
# Line 90 | Line 92 | namespace oopse {
92      return (str);
93    }
94  
95 <  int findBegin(std::istream &theStream, char* startText ){
95 >  int findBegin(std::istream &theStream, const char* startText ){
96      const int MAXLEN = 1024;
97      char readLine[MAXLEN];  
98      int foundText = 0;
# Line 178 | Line 180 | namespace oopse {
180      return 0;
181    }
182    
183 <  std::string OOPSE_itoa(int value, unsigned int base = 10) {    
183 >  std::string OpenMD_itoa(int value, unsigned int base) {    
184      const char digitMap[] = "0123456789abcdef";
185      std::string buf;
186  
# Line 216 | Line 218 | namespace oopse {
218    std::string getSuffix(const std::string& str) {
219      return str.substr(0, str.find('.'));
220    }
221 +  
222 +  bool isInteger(const std::string& str) {
223 +    
224 +    bool result = false;
225 +    
226 +    std::string::const_iterator i = str.begin();    
227 +    if (i != str.end() && (*i == '+' || *i == '-' || std::isdigit(*i) )) {
228 +      ++i;        
229 +      while (i != str.end() && std::isdigit(*i))
230 +        ++i;
231 +      if (i == str.end())
232 +        result = true;
233 +    }
234 +    
235 +    return result;
236 +  }
237  
238 +  bool CaseInsensitiveEquals(const char ch1, const char ch2) {
239 +    return std::toupper((unsigned char)ch1) == std::toupper((unsigned char)ch2);
240 +  }
241 +  
242 +  size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2) {
243 +    std::string::const_iterator pos = std::search(str1.begin(), str1.end(), str2.begin(), str2.end(), CaseInsensitiveEquals);
244 +    if (pos == str1.end())
245 +      return std::string::npos;
246 +    else
247 +      return pos - str1.begin();
248 +  }
249 +  
250 +  /**
251 +   *    memparse - parse a string with mem suffixes into a number
252 +   *    @ptr: Where parse begins
253 +   *    @retptr: (output) Pointer to next char after parse completes
254 +   *
255 +   *    Parses a string into a number.  The number stored at @ptr is
256 +   *    potentially suffixed with %K (for kilobytes, or 1024 bytes),
257 +   *    %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
258 +   *    1073741824).  If the number is suffixed with K, M, or G, then
259 +   *    the return value is the number multiplied by one kilobyte, one
260 +   *    megabyte, or one gigabyte, respectively.
261 +   */  
262 +  unsigned long long memparse (char *ptr,  char **retptr) {
263 +    unsigned long long ret = strtoull (ptr, retptr, 0);
264 +    
265 +    switch (**retptr) {
266 +    case 'G':
267 +    case 'g':
268 +      ret <<= 10;
269 +    case 'M':
270 +    case 'm':
271 +      ret <<= 10;
272 +    case 'K':
273 +    case 'k':
274 +      ret <<= 10;
275 +      (*retptr)++;
276 +    default:
277 +      break;
278 +    }
279 +    return ret;
280 +  }
281 +  
282   }

Comparing:
trunk/src/utils/StringUtils.cpp (property svn:keywords), Revision 406 by gezelter, Tue Mar 8 21:07:34 2005 UTC vs.
branches/development/src/utils/StringUtils.cpp (property svn:keywords), Revision 1654 by gezelter, Wed Sep 28 19:40:45 2011 UTC

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

Diff Legend

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