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

Comparing trunk/src/selection/NameFinder.hpp (file contents):
Revision 283 by tim, Thu Feb 3 23:14:05 2005 UTC vs.
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC

# Line 42 | Line 42
42   #define SELECTION_NAMEFINDER_HPP
43   #include <set>
44   #include <string>
45 <
46 < #include "utils/BitSet.hpp"
45 > #include <map>
46 > #include "brains/SimInfo.hpp"
47 > #include "utils/OOPSEBitSet.hpp"
48   namespace oopse {
49  
50 < enum NameNodeType {
51 <    rootNode,
52 <    molNode,
52 <    atomNode,
53 <    rbNode,
54 <    rbAtomNode,
55 < };
56 <
57 < struct NameNode{
50 >  class TreeNode{
51 >  public:
52 >    ~TreeNode();
53      std::string name;
54 <    BitSet bs;
55 <    std::vector<NameNode*> children;
56 <    NameNodeType type;
62 < };
54 >    OOPSEBitSet bs;
55 >    std::map<std::string, TreeNode*> children;
56 >  };
57  
58 < class NameFinder{
59 <    public:
60 <        NameFinder(SimInfo* info);
61 <        bool match(const std::string& name, BitSet& bs);
58 >  class NameFinder{
59 >  public:
60 >    NameFinder(SimInfo* info);
61 >    ~NameFinder();
62 >    OOPSEBitSet  match(const std::string& name);
63  
64 <    private:
65 <        void loadNames();
66 <        SimInfo* info_;
64 >  private:
65 >    void loadNames();
66 >    void matchMolecule(const std::string& molName, OOPSEBitSet& bs);
67 >    void matchStuntDouble(const std::string& molName, const std::string& sdName, OOPSEBitSet& bs);
68 >    void matchRigidAtoms(const std::string& molName, const std::string& rbName, const std::string& rbAtomName, OOPSEBitSet& bs);
69  
70 <        NameNode* root_;
74 < };
70 >    void matchInternalIndex(const std::string& name, int internalIndex, OOPSEBitSet& bs);
71  
72 +    TreeNode* createNode(TreeNode* parent, const std::string& name);
73 +    std::vector<TreeNode*> getMatchedChildren(TreeNode* node, const std::string& name);
74 +    bool isMatched(const std::string& str, const std::string& wildcard);
75 +
76 +    bool isInteger(const std::string str);
77 +
78 +    SimInfo* info_;
79 +    int nStuntDouble_;
80 +    TreeNode* root_;
81 +  };
82 +
83 +
84   }
85   #endif

Diff Legend

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