--- trunk/OOPSE-4/src/utils/StringUtils.cpp 2004/10/19 20:40:30 1600 +++ trunk/OOPSE-4/src/utils/StringUtils.cpp 2005/01/12 22:41:40 1930 @@ -1,10 +1,49 @@ + /* + * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. + * + * The University of Notre Dame grants you ("Licensee") a + * non-exclusive, royalty free, license to use, modify and + * 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 + * notice, this list of conditions and the following disclaimer. + * + * 3. 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. + * + * This software is provided "AS IS," without a warranty of any + * kind. All express or implied conditions, representations and + * warranties, including any implied warranty of merchantability, + * fitness for a particular purpose or non-infringement, are hereby + * excluded. The University of Notre Dame and its licensors shall not + * be liable for any damages suffered by licensee as a result of + * using, modifying or distributing the software or its + * derivatives. In no event will the University of Notre Dame or its + * licensors be liable for any lost revenue, profit or data, or for + * direct, indirect, special, consequential, incidental or punitive + * damages, however caused and regardless of the theory of liability, + * 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. + */ + #include "utils/StringUtils.hpp" -using namespace std; -using namespace oopse; - -string UpperCase(const string& S) { - string uc = S; +namespace oopse { +std::string UpperCase(const std::string& S) { + std::string uc = S; unsigned int n = uc.size(); for (unsigned int j = 0; j < n; j++) { char sj = uc[j]; @@ -13,8 +52,8 @@ string LowerCase(const string& S) { return uc; } -string LowerCase(const string& S) { - string lc = S; +std::string LowerCase(const std::string& S) { + std::string lc = S; unsigned int n = lc.size(); for (unsigned int j = 0; j < n; j++) { char sj = lc[j]; @@ -51,7 +90,7 @@ int findBegin(istream &theStream, char* startText ){ return (str); } -int findBegin(istream &theStream, char* startText ){ +int findBegin(std::istream &theStream, char* startText ){ const int MAXLEN = 1024; char readLine[MAXLEN]; int foundText = 0; @@ -60,7 +99,7 @@ int findBegin(istream &theStream, char* startText ){ char* eof_test; // rewind the stream - theStream.seekg (0, ios::beg); + theStream.seekg (0, std::ios::beg); lineNum = 0; if (!theStream.eof()) { @@ -138,3 +177,14 @@ int isEndLine(char *line) { return 0; } + + +std::string getPrefix(const std::string& str) { + return str.substr(0, str.rfind('.')); +} + +std::string getSuffix(const std::string& str) { + return str.substr(0, str.find('.')); +} + +}