[Avida-SVN] r2716 - branches/uml-merge/source/orchid

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-07-07 16:45:27 -0400 (Mon, 07 Jul 2008)
New Revision: 2716

Modified:
   branches/uml-merge/source/orchid/cOrchidFactory.cc
   branches/uml-merge/source/orchid/cOrchidFactory.h
   branches/uml-merge/source/orchid/cOrchidPopulation.h
Log:
fixed buildOrchidPopulation.

Modified: branches/uml-merge/source/orchid/cOrchidFactory.cc
===================================================================
--- branches/uml-merge/source/orchid/cOrchidFactory.cc	2008-07-07 19:57:33 UTC (rev 2715)
+++ branches/uml-merge/source/orchid/cOrchidFactory.cc	2008-07-07 20:45:27 UTC (rev 2716)
@@ -22,9 +22,12 @@
  NOTE: We need to extend cOrchidOrganisms with a pointer to the cOrchidPopulation in which
  it lives.  Will probably have to touch BuildOrchidOrganism to get that to work...
  */
-cOrchidPopulation* cOrchidFactory::BuildOrchidPopulation(const cWorld* world) 
+cOrchidPopulation* cOrchidFactory::BuildOrchidPopulation(cWorld* world) 
 {
-  return 0;
+	cOrchidPopulation* pop = new cOrchidPopulation();
+	cUMLModel* mod = new cUMLModel((const char*)world->GetConfig().ORCHID_SEED_MODEL.Get());
+	pop->SetUMLModel(mod);
+  return pop;
 }
 
 

Modified: branches/uml-merge/source/orchid/cOrchidFactory.h
===================================================================
--- branches/uml-merge/source/orchid/cOrchidFactory.h	2008-07-07 19:57:33 UTC (rev 2715)
+++ branches/uml-merge/source/orchid/cOrchidFactory.h	2008-07-07 20:45:27 UTC (rev 2716)
@@ -13,7 +13,7 @@
   //! Build an OrchidOrganism.
   static cOrchidOrganism* BuildOrchidOrganism(cWorld* world);
   //! Build an OrchidPopulation.
-  static cOrchidPopulation* BuildOrchidPopulation(const cWorld* world);
+  static cOrchidPopulation* BuildOrchidPopulation(cWorld* world);
   //! Transmit a parent's model and bonus info to its offspring
   static void cOrchidInheritParentInfo (cOrchidOrganism* parent, cOrchidOrganism* child);
 

Modified: branches/uml-merge/source/orchid/cOrchidPopulation.h
===================================================================
--- branches/uml-merge/source/orchid/cOrchidPopulation.h	2008-07-07 19:57:33 UTC (rev 2715)
+++ branches/uml-merge/source/orchid/cOrchidPopulation.h	2008-07-07 20:45:27 UTC (rev 2716)
@@ -4,9 +4,10 @@
 class cOrchidPopulation
 {
 public:
-  cOrchidPopulation();
+  cOrchidPopulation() {}
   
   cUMLModel* GetUMLModel() { return m_model; }
+  void SetUMLModel(cUMLModel* mod) { m_model = mod; }
 
 protected:
   cUMLModel* m_model;