Changed factory singleton to reference

Config.cpp

@@ -88,25 +88,25 @@ void Config::SetPopulationSize(const unsigned int populationSize)
 void Config::SetHeight(const unsigned int Height)
 {
     m_Height = Height;
-    Factory::Instance()->update();
+    Factory::Instance().update();
 }
 
 void Config::SetMaxGeneSize(const unsigned int MaxGeneSize)
 {
     m_MaxGeneSize = MaxGeneSize;
-    Factory::Instance()->update();
+    Factory::Instance().update();
 }
 
 void Config::SetMinGeneSize(const unsigned int MinGeneSize)
 {
     m_MinGeneSize = MinGeneSize;
-    Factory::Instance()->update();
+    Factory::Instance().update();
 }
 
 void Config::SetWidth(const unsigned int Width)
 {
     m_Width = Width;
-    Factory::Instance()->update();
+    Factory::Instance().update();
 }
 
 std::string Config::GetTestImageName()

Factory.cpp

@@ -17,8 +17,6 @@
 #include <ctime>
 #include <iostream>
 
-FactoryPtr Factory::m_Instance;
-
 Factory::Factory()
 		: m_gen(boost::rand48(std::time(0))),
 		  m_randPrimary(
@@ -65,15 +63,11 @@ Factory::~Factory() {
 	delete m_randGenomeIndex;
 }
 
-FactoryPtr Factory::Instance() {
-	if(Factory::m_Instance.get() == NULL) {
+Factory& Factory::Instance() {
 #ifdef QT_YES
-		std::cout << "[ Factory::Instance() ] Using QtFactory" << std::endl;
-		Factory::m_Instance.reset(new QtFactory());
+		static QtFactory factory;
+		return factory;
 #endif
-	}
-
-	return Factory::m_Instance;
 }
 
 void Factory::update() {

Factory.h

@@ -24,9 +24,6 @@
 #include <boost/random/variate_generator.hpp>
 
 
-class Factory;
-typedef boost::shared_ptr<Factory> FactoryPtr;
-
 /**
  * Abstract factory for producing Genes and ImageImps. This is a singleton class.
  */
@@ -35,7 +32,7 @@ class Factory
 public:
 	virtual ~Factory();
 
-	static FactoryPtr Instance();
+	static Factory& Instance();
 
 	Gene makeRandomGene();
 
@@ -76,11 +73,6 @@ class Factory
 	unsigned int randGeneSize();
 
 private:
-	/**
-	 * Pointer to only instance.
-	 */
-	static FactoryPtr m_Instance;
-
 	/**
 	 * Fastest random number generator in the boost library.
 	 */

Image.cpp

@@ -16,15 +16,20 @@
 
 #include <iostream>
 
-void Image::clear()
+
+Image::Image()
 {
-	m_imp->clear();
+	m_imp = Factory::Instance().makeImageImp();
 }
 
-Image::Image()
+Image::~Image()
+{
+	delete m_imp;
+}
+
+void Image::clear()
 {
-	FactoryPtr factory = Factory::Instance();
-	m_imp = factory->makeImageImp();
+	m_imp->clear();
 }
 
 unsigned int Image::getWidth()
@@ -37,10 +42,6 @@ unsigned int Image::getHeight()
 	return m_imp->getHeight();
 }
 
-Image::~Image()
-{
-	delete m_imp;
-}
 
 void Image::loadFromFile(const std::string& filename)
 {

Organism.cpp

@@ -23,7 +23,7 @@ Organism::Organism(const unsigned int genomeLength)
 {
 	m_genome.reserve(genomeLength);
 	for(unsigned int i = 0; i < genomeLength; ++i) {
-		Gene randomGene = Factory::Instance()->makeRandomGene();
+		Gene randomGene = Factory::Instance().makeRandomGene();
 		m_genome.push_back(randomGene);
 	}
 	createPhenotype();
@@ -44,8 +44,8 @@ Organism::Organism(const Organism& parentA, const Organism& parentB, const bool
 	}
 
 	if(doMutation) {
-		unsigned int index = Factory::Instance()->randGenomeIndex();
-		Gene randomGene = Factory::Instance()->makeRandomGene();
+		unsigned int index = Factory::Instance().randGenomeIndex();
+		Gene randomGene = Factory::Instance().makeRandomGene();
 		m_genome[index] = randomGene;
 	}
 

QtFactory.cpp

@@ -20,6 +20,7 @@
 
 QtFactory::QtFactory()
 {
+	std::cout << "[ QtFactory::QtFactory() ] Using QtFactory" << std::endl;
 }
 
 QtFactory::~QtFactory()