--- trunk/src/utils/StringUtils.cpp 2008/10/16 18:17:41 1305 +++ trunk/src/utils/StringUtils.cpp 2012/08/30 17:18:22 1790 @@ -6,19 +6,10 @@ * 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 + * 1. 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 + * 2. 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. @@ -37,12 +28,34 @@ * 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. + * + * SUPPORT OPEN SCIENCE! If you use OpenMD or its source code in your + * research, please cite the appropriate papers when you publish your + * work. Good starting points are: + * + * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). + * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ +#include "config.h" #include +#include +#include +#include +#include #include "utils/StringUtils.hpp" -namespace oopse { +#ifdef _MSC_VER +#define strcasecmp _stricmp +#define strdup _strdup +#define strtoull _strtoui64 +#endif + + +namespace OpenMD { std::string UpperCase(const std::string& S) { std::string uc = S; unsigned int n = uc.size(); @@ -97,7 +110,6 @@ namespace oopse { int foundText = 0; int lineNum; char* the_token; - char* eof_test; // rewind the stream theStream.seekg (0, std::ios::beg); @@ -179,7 +191,7 @@ namespace oopse { return 0; } - std::string OOPSE_itoa(int value, unsigned int base) { + std::string OpenMD_itoa(int value, unsigned int base) { const char digitMap[] = "0123456789abcdef"; std::string buf; @@ -217,33 +229,65 @@ namespace oopse { std::string getSuffix(const std::string& str) { return str.substr(0, str.find('.')); } - -bool isInteger(const std::string& str) { - + + bool isInteger(const std::string& str) { + bool result = false; - + std::string::const_iterator i = str.begin(); if (i != str.end() && (*i == '+' || *i == '-' || std::isdigit(*i) )) { - ++i; - while (i != str.end() && std::isdigit(*i)) - ++i; - if (i == str.end()) - result = true; + ++i; + while (i != str.end() && std::isdigit(*i)) + ++i; + if (i == str.end()) + result = true; } return result; -} + } -bool CaseInsensitiveEquals(const char ch1, const char ch2) { - return std::toupper((unsigned char)ch1) == std::toupper((unsigned char)ch2); + bool CaseInsensitiveEquals(const char ch1, const char ch2) { + return std::toupper((unsigned char)ch1) == std::toupper((unsigned char)ch2); + } + + size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2) { + std::string::const_iterator pos = std::search(str1.begin(), str1.end(), str2.begin(), str2.end(), CaseInsensitiveEquals); + if (pos == str1.end()) + return std::string::npos; + else + return pos - str1.begin(); + } + + /** + * memparse - parse a string with mem suffixes into a number + * @ptr: Where parse begins + * @retptr: (output) Pointer to next char after parse completes + * + * Parses a string into a number. The number stored at @ptr is + * potentially suffixed with %K (for kilobytes, or 1024 bytes), + * %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or + * 1073741824). If the number is suffixed with K, M, or G, then + * the return value is the number multiplied by one kilobyte, one + * megabyte, or one gigabyte, respectively. + */ + unsigned long long memparse (char *ptr, char **retptr) { + unsigned long long ret = strtoull (ptr, retptr, 0); + + switch (**retptr) { + case 'G': + case 'g': + ret <<= 10; + case 'M': + case 'm': + ret <<= 10; + case 'K': + case 'k': + ret <<= 10; + (*retptr)++; + default: + break; + } + return ret; + } + } - -size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2) { - std::string::const_iterator pos = std::search(str1.begin(), str1.end(), str2.begin(), str2.end(), CaseInsensitiveEquals); - if (pos == str1.end()) - return std::string::npos; - else - return pos - str1.begin(); -} - -}