1 |
|
|
2 |
< |
#include "integrators/IntegratorFactory" |
2 |
> |
#include "integrators/IntegratorFactory.hpp" |
3 |
|
namespace oopse { |
4 |
|
|
5 |
|
//initialize instance of IntegratorFactory |
6 |
< |
IntegratorFactory::instance_ = NULL; |
6 |
> |
IntegratorFactory* IntegratorFactory::instance_ = NULL; |
7 |
|
|
8 |
|
bool IntegratorFactory::registerIntegrator(const std::string& id, IntegratorCreatorType creator) { |
9 |
|
return creatorMap_.insert( |
15 |
|
} |
16 |
|
|
17 |
|
Integrator* IntegratorFactory::createIntegrator(const std::string& id, SimInfo* info) { |
18 |
< |
typename CreatorMapType::iterator i = creatorMap_.find(id); |
18 |
> |
CreatorMapType::iterator i = creatorMap_.find(id); |
19 |
|
if (i != creatorMap_.end()) { |
20 |
|
//invoke functor to create object |
21 |
|
return (i->second)(info); |
26 |
|
|
27 |
|
std::vector<std::string> IntegratorFactory::getIdents() { |
28 |
|
IdentVectorType idents; |
29 |
< |
typename CreatorMapType::iterator i; |
29 |
> |
CreatorMapType::iterator i; |
30 |
|
|
31 |
|
for (i = creatorMap_.begin(); i != creatorMap_.end(); ++i) { |
32 |
|
idents.push_back(i->first); |
36 |
|
} |
37 |
|
|
38 |
|
std::ostream& operator <<(std::ostream& o, IntegratorFactory& factory) { |
39 |
< |
typename IntegratorFactory::IdentVectorType idents; |
40 |
< |
typename IntegratorFactory::IdentVectorIterator i; |
39 |
> |
IntegratorFactory::IdentVectorType idents; |
40 |
> |
IntegratorFactory::IdentVectorIterator i; |
41 |
|
|
42 |
|
idents = factory.getIdents(); |
43 |
|
|