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

Comparing trunk/src/utils/StringTokenizer.cpp (file contents):
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 2045 by gezelter, Fri Nov 28 20:10:17 2014 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, 234107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include <iostream>
# Line 44 | Line 45
45   #include <sstream>
46   #include "utils/StringTokenizer.hpp"
47  
48 < namespace oopse {
48 > namespace OpenMD {
49  
50  
51    StringTokenizer::StringTokenizer(const std::string & str, const std::string & delim)
52      : tokenString_(str), delim_(delim), returnTokens_(false),
53        currentPos_(tokenString_.begin()), end_(tokenString_.end()){
54  
55 <    }
55 >  }
56  
57    StringTokenizer::StringTokenizer(std::string::const_iterator& first, std::string::const_iterator& last,
58                                     const std::string & delim)  
59      : tokenString_(first, last) , delim_(delim), returnTokens_(false),
60        currentPos_(tokenString_.begin()), end_(tokenString_.end()) {
61  
62 <    }
62 >  }
63  
64    StringTokenizer::StringTokenizer(const std::string&str, const std::string&delim,
65                                     bool returnTokens)
66      : tokenString_(str), delim_(delim), returnTokens_(returnTokens),
67        currentPos_(tokenString_.begin()), end_(tokenString_.end()) {
68  
69 <    }
69 >  }
70  
71    bool StringTokenizer::isDelimiter(const char c) {
72      return delim_.find(c) == std::string::npos ? false : true;
# Line 113 | Line 114 | namespace oopse {
114      } else {
115        std::string::const_iterator i = currentPos_;
116  
117 <      //walk through the remaining string to check whether it contains non-delimeter or not
117 >      //walk through the remaining string to check whether it contains
118 >      //non-delimeter or not
119        while(i != end_ && isDelimiter(*i)) {
120          ++i;
121        }
# Line 174 | Line 176 | namespace oopse {
176      return (float) (atof(token.c_str()));
177    }
178  
179 <  double StringTokenizer::nextTokenAsDouble() {
179 >  RealType StringTokenizer::nextTokenAsDouble() {
180      std::string token = nextToken();
181      convertFortranNumber(token);
182      return atof(token.c_str());
# Line 205 | Line 207 | namespace oopse {
207      return result;    
208    }
209  
210 < std::vector<std::string>  StringTokenizer::getAllTokens() {
210 >  std::vector<std::string>  StringTokenizer::getAllTokens() {
211      std::vector<std::string> tokens;
212      while (hasMoreTokens()) {
213 <        tokens.push_back(nextToken());
213 >      tokens.push_back(nextToken());
214      }
215      return tokens;
216 < }
216 >  }
217    void StringTokenizer::convertFortranNumber(std::string& fortranNumber) {
218      std::string::iterator i;
219      for(i = fortranNumber.begin(); i != fortranNumber.end(); ++i) {
# Line 221 | Line 223 | namespace oopse {
223      }
224    }
225  
226 < }//end namespace oopse
226 >  std::string  StringTokenizer::getRemainingString() {
227 >    std::string result;
228 >    std::string::const_iterator tmpIter = currentPos_;
229 >    if(tmpIter != end_) {
230 >      std::insert_iterator<std::string> insertIter(result, result.begin());
231 >      
232 >      while (tmpIter != end_) {
233 >        *insertIter++ = *tmpIter++;
234 >      }
235 >    }
236 >    
237 >    return result;
238 >  }
239  
240 +  
241 + }//end namespace OpenMD
242 +

Comparing trunk/src/utils/StringTokenizer.cpp (property svn:keywords):
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 2045 by gezelter, Fri Nov 28 20:10:17 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines