ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/minimizers/MinimizerFactory.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/minimizers/MinimizerFactory.cpp (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 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 44 | Line 44 | namespace oopse {
44  
45   namespace oopse {
46  
47 < //initialize instance of MinimizerFactory
48 < MinimizerFactory* MinimizerFactory::instance_ = NULL;
47 >  //initialize instance of MinimizerFactory
48 >  MinimizerFactory* MinimizerFactory::instance_ = NULL;
49  
50 < MinimizerFactory::~MinimizerFactory() {
50 >  MinimizerFactory::~MinimizerFactory() {
51      CreatorMapType::iterator i;
52      for (i = creatorMap_.begin(); i != creatorMap_.end(); ++i) {
53 <        delete i->second;
53 >      delete i->second;
54      }
55      creatorMap_.clear();
56 < }
56 >  }
57  
58 < bool MinimizerFactory::registerMinimizer(MinimizerCreator* creator) {
58 >  bool MinimizerFactory::registerMinimizer(MinimizerCreator* creator) {
59      return creatorMap_.insert(
60 <        CreatorMapType::value_type(creator->getIdent(), creator)).second;
61 < }
60 >                              CreatorMapType::value_type(creator->getIdent(), creator)).second;
61 >  }
62  
63 < bool MinimizerFactory::unregisterMinimizer(const std::string& id) {
63 >  bool MinimizerFactory::unregisterMinimizer(const std::string& id) {
64      return creatorMap_.erase(id) == 1;
65 < }
65 >  }
66  
67 < Minimizer* MinimizerFactory::createMinimizer(const std::string& id, SimInfo* info) {
67 >  Minimizer* MinimizerFactory::createMinimizer(const std::string& id, SimInfo* info) {
68      CreatorMapType::iterator i = creatorMap_.find(id);
69      if (i != creatorMap_.end()) {
70 <        //invoke functor to create object
71 <        return (i->second)->create(info);
70 >      //invoke functor to create object
71 >      return (i->second)->create(info);
72      } else {
73 <        return NULL;
73 >      return NULL;
74      }
75 < }
75 >  }
76  
77 < std::vector<std::string> MinimizerFactory::getIdents() {
77 >  std::vector<std::string> MinimizerFactory::getIdents() {
78      IdentVectorType idents;
79      CreatorMapType::iterator i;
80  
81      for (i = creatorMap_.begin(); i != creatorMap_.end(); ++i) {
82 <        idents.push_back(i->first);
82 >      idents.push_back(i->first);
83      }
84      
85      return idents;
86 < }
86 >  }
87  
88 < std::ostream& operator <<(std::ostream& o, MinimizerFactory& factory) {
88 >  std::ostream& operator <<(std::ostream& o, MinimizerFactory& factory) {
89      MinimizerFactory::IdentVectorType idents;
90      MinimizerFactory::IdentVectorIterator i;
91  
# Line 93 | Line 93 | std::ostream& operator <<(std::ostream& o, MinimizerFa
93  
94      o << "Avaliable type identifiers in this factory: " << std::endl;
95      for (i = idents.begin(); i != idents.end(); ++i) {
96 <        o << *i << std::endl;
96 >      o << *i << std::endl;
97      }
98  
99      return o;
100 < }
100 >  }
101  
102   }
103  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines