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

Comparing trunk/src/lattice/LatticeFactory.cpp (file contents):
Revision 482 by gezelter, Tue Apr 12 21:27:33 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   #include "lattice/LatticeFactory.hpp"
43 – #include "lattice/BaseLattice.hpp"
43   #include "lattice/LatticeCreator.hpp"
44  
45 < namespace oopse {
45 > namespace OpenMD {
46  
47 < LatticeFactory* LatticeFactory::instance = NULL;
48 < LatticeFactory::~LatticeFactory(){
50 <   std::map<std::string, BaseLatticeCreator*>::iterator mapIter;
51 <        for (mapIter = creatorMap.begin(); mapIter == creatorMap.end(); ++mapIter) {
52 <                delete mapIter->second;
53 <        }  
54 < }
47 >  //initialize instance of LatticeFactory
48 >  LatticeFactory* LatticeFactory::instance_ = NULL;
49  
50 < LatticeFactory* LatticeFactory::getInstance(){
51 <        if (instance == NULL)
52 <      instance = new LatticeFactory();
53 <        
54 <        return instance;
55 < }
50 >  LatticeFactory::~LatticeFactory() {
51 >    CreatorMapType::iterator i;
52 >    for (i = creatorMap_.begin(); i != creatorMap_.end(); ++i) {
53 >      delete i->second;
54 >    }
55 >    creatorMap_.clear();
56 >  }
57  
58 < bool LatticeFactory::registerCreator( BaseLatticeCreator*  latCreator ){  
59 <   std::string latticeType = latCreator->getType();
60 <   std::map<std::string, BaseLatticeCreator*>::iterator mapIter;
58 >  bool LatticeFactory::registerLattice(LatticeCreator* creator) {
59 >    return creatorMap_.insert(
60 >                              CreatorMapType::value_type(creator->getIdent(), creator)).second;
61 >  }
62  
63 <  mapIter = creatorMap.find(latticeType);
63 >  bool LatticeFactory::unregisterLattice(const std::string& id) {
64 >    return creatorMap_.erase(id) == 1;
65 >  }
66  
67 <  if (mapIter == creatorMap.end()) {
68 <    creatorMap[ latticeType ] = latCreator;
69 <    return true;
67 >  Lattice* LatticeFactory::createLattice(const std::string& id) {
68 >    CreatorMapType::iterator i = creatorMap_.find(id);
69 >    if (i != creatorMap_.end()) {
70 >      //invoke functor to create object
71 >      return (i->second)->create();
72 >    } else {
73 >      return NULL;
74 >    }
75    }
73 –  else{
74 –    delete mapIter->second;
75 –    mapIter->second = latCreator;
76 –    return false;
77 –  }
78 – }
76  
77 < BaseLattice* LatticeFactory::createLattice( const std::string& latticeType ){
78 <   std::map<std::string, BaseLatticeCreator*>::iterator mapIter;
79 <  
83 <  mapIter = creatorMap.find(latticeType);
77 >  std::vector<std::string> LatticeFactory::getIdents() {
78 >    IdentVectorType idents;
79 >    CreatorMapType::iterator i;
80  
81 <  if (mapIter != creatorMap.end()) {
82 <     return (mapIter->second)->createLattice();
81 >    for (i = creatorMap_.begin(); i != creatorMap_.end(); ++i) {
82 >      idents.push_back(i->first);
83 >    }
84 >    
85 >    return idents;
86    }
88 –  else
89 –    return NULL;
90 – }
87  
88 < bool LatticeFactory::hasLatticeCreator( const std::string& latticeType ){
89 <   std::map<std::string, BaseLatticeCreator*>::iterator mapIter;
88 >  std::ostream& operator <<(std::ostream& o, LatticeFactory& factory) {
89 >    LatticeFactory::IdentVectorType idents;
90 >    LatticeFactory::IdentVectorIterator i;
91  
92 <  mapIter = creatorMap.find(latticeType);
92 >    idents = factory.getIdents();
93  
94 <  if (mapIter != creatorMap.end())
95 <    return true;
96 <  else
97 <    return false;
101 < }
94 >    o << "Avaliable type identifiers in this factory: " << std::endl;
95 >    for (i = idents.begin(); i != idents.end(); ++i) {
96 >      o << *i << std::endl;
97 >    }
98  
99 < const  std::string LatticeFactory::toString(){
104 <   std::string result;
105 <   std::map<std::string, BaseLatticeCreator*>::iterator mapIter;
106 <
107 <  result = "Avaliable lattice creators in LatticeFactory are:\n";
108 <  
109 <  for(mapIter = creatorMap.begin(); mapIter != creatorMap.end(); ++mapIter){
110 <    result += mapIter->first + " ";
99 >    return o;
100    }
112 –  
113 –  result += "\n";
101  
115 –  return result;
102   }
117 –
118 –
119 – }

Diff Legend

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