ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/selection/TokenMap.hpp
(Generate patch)

Comparing trunk/src/selection/TokenMap.hpp (file contents):
Revision 349 by tim, Tue Feb 15 17:35:30 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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   #ifndef SELECTION_TOKENMAP_HPP
43   #define SELECTION_TOKENMAP_HPP
44  
45 < #include "selection/Token.hpp"
45 > #include "selection/SelectionToken.hpp"
46  
47 < namespace oopse {
47 > namespace OpenMD {
48  
49  
50 < class TokenMap{
51 <    public:
52 <        typedef std::map<std::string, Token> TokenMapType;
53 <        static TokenMap* getInstance(){
54 <            if (instance_ == NULL) {
55 <                instance_ = new TokenMap();
56 <            }
50 >  class TokenMap{
51 >  public:
52 >    typedef std::map<std::string, Token> TokenMapType;
53 >    static TokenMap* getInstance(){
54 >      if (instance_ == NULL) {
55 >        instance_ = new TokenMap();
56 >      }
57  
58 <            return instance_;
59 <        }
58 >      return instance_;
59 >    }
60  
61 <        Token* getToken(const std::string& ident);
61 >    Token* getToken(const std::string& ident);
62          
63 <    private:
63 >  private:
64          
65 <        TokenMap();
65 >    TokenMap();
66          
67 <        static TokenMap* instance_;
67 >    static TokenMap* instance_;
68  
69 <        TokenMapType tokenMap_;        
69 >    TokenMapType tokenMap_;        
70          
71 < };
71 >  };
72  
73   }
74   #endif

Diff Legend

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