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

Comparing:
trunk/src/lattice/LatticeFactory.cpp (property svn:keywords), Revision 482 by gezelter, Tue Apr 12 21:27:33 2005 UTC vs.
branches/development/src/lattice/LatticeFactory.cpp (property svn:keywords), Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines