Changes in src/Patterns/Registry_impl.hpp [311d688:b59da6]

File:

• src/Patterns/Registry_impl.hpp (modified) (7 diffs)

src/Patterns/Registry_impl.hpp

@@ -15 +15 @@
 
 #include "Helpers/Assert.hpp"
-#include <iosfwd>
+#include <iostream>
 
 /** Constructor for class Registry.
@@ -25 +25 @@
  */
 template <class T> Registry<T>::~Registry()
-{
-  typename std::map<const std::string,T*>::iterator iter;
-  for(iter=InstanceMap.begin();iter!=InstanceMap.end();++iter) {
-    delete iter->second;
-  }
-  InstanceMap.clear();
-}
+{}
 
 /** Returns pointer to an instance named by \a name.
@@ -37 +31 @@
  * \return pointer to instance
  */
-template <class T> T* Registry<T>::getByName(const std::string name){
-  typename std::map<const std::string,T*>::iterator iter;
+template <class T> T* Registry<T>::getByName(const std::string name) const
+{
+  typename std::map<const std::string,T*>::const_iterator iter;
   iter = InstanceMap.find(name);
-  ASSERT(iter!=InstanceMap.end(),"Query for an instance not stored in registry");
+  ASSERT(iter!=InstanceMap.end(),"Query for an instance "+name+" not stored in registry");
   return iter->second;
 }
@@ -47 +42 @@
  * \note This is needed as Registry<T>::getByName() ASSERT()s that instance is in std::map.
  * \param name name of instance
- * \return true - v present, false - instance absent
+ * \return true - present, false - instance absent
  */
-template <class T>bool Registry<T>::isPresentByName(const std::string name){
-  typename std::map<const std::string,T*>::iterator iter;
+template <class T>bool Registry<T>::isPresentByName(const std::string name) const
+{
+  typename std::map<const std::string,T*>::const_iterator iter;
   iter = InstanceMap.find(name);
   return iter!=InstanceMap.end();
@@ -60 +56 @@
 template <class T>void Registry<T>::registerInstance(T* instance){
   std::pair<typename std::map<const std::string,T*>::iterator,bool> ret;
-  //cout << "Trying to register instance with name " << instance->getName() << "." << endl;
+  //std::cout << "Trying to register instance of type " << typeid(T).name() << " with name " << instance->getName() << "." << std::endl;
   ret = InstanceMap.insert(typename std::pair<const std::string,T*>(instance->getName(),instance));
-  ASSERT(ret.second,"Two instances with the same name added to registry");
+  ASSERT(ret.second,"Two instances with the same name "+instance->getName()+" added to registry");
 }
 
@@ -69 +65 @@
  */
 template <class T>void Registry<T>::unregisterInstance(T* instance){
-  //cout << "Unregistering instance with name " << instance->getName() << "." << endl;
+  //std::cout << "Unregistering instance of type " << typeid(T).name() << " with name " << instance->getName() << "." << std::endl;
   InstanceMap.erase(instance->getName());
 }
+
+/** Removes every instance from the registry.
+ */
+template <class T>void Registry<T>::cleanup()
+{
+  typename std::map<const std::string,T*>::iterator iter;
+  for(iter=InstanceMap.begin();iter!=InstanceMap.end();++iter) {
+    delete iter->second;
+  }
+  InstanceMap.clear();
+}
+
 
 /** Returns an iterator pointing to the start of the std::map of instance's.
@@ -128 +136 @@
  * at a chosen place.
  */
-#define CONSTRUCT_REGISTRY(name) \
-    template name* Registry<name>::getByName(const std::string name); \
-    template bool Registry<name>::isPresentByName(const std::string name); \
-    template void Registry<name>::registerInstance(name*); \
-    template void Registry<name>::unregisterInstance(name*); \
-    template std::map<const std::string,name*>::iterator Registry<name>::getBeginIter(); \
-    template std::map<const std::string,name*>::const_iterator Registry<name>::getBeginIter() const; \
-    template std::map<const std::string,name*>::iterator Registry<name>::getEndIter(); \
-    template std::map<const std::string,name*>::const_iterator Registry<name>::getEndIter() const;
+#define CONSTRUCT_REGISTRY(InstanceType) \
+    template InstanceType* Registry<InstanceType>::getByName(const std::string) const; \
+    template bool Registry<InstanceType>::isPresentByName(const std::string) const; \
+    template void Registry<InstanceType>::registerInstance(InstanceType*); \
+    template void Registry<InstanceType>::unregisterInstance(InstanceType*); \
+    template std::map<const std::string,InstanceType*>::iterator Registry<InstanceType>::getBeginIter(); \
+    template std::map<const std::string,InstanceType*>::const_iterator Registry<InstanceType>::getBeginIter() const; \
+    template std::map<const std::string,InstanceType*>::iterator Registry<InstanceType>::getEndIter(); \
+    template std::map<const std::string,InstanceType*>::const_iterator Registry<InstanceType>::getEndIter() const;