[Avida-SVN] r3567 - branches/biounit/source/classification

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2009-12-18 16:05:22 -0500 (Fri, 18 Dec 2009)
New Revision: 3567

Modified:
   branches/biounit/source/classification/cBGGenotypeManager.cc
   branches/biounit/source/classification/cBGGenotypeManager.h
Log:
Clean up a couple of todo items.

Modified: branches/biounit/source/classification/cBGGenotypeManager.cc
===================================================================
--- branches/biounit/source/classification/cBGGenotypeManager.cc	2009-12-18 20:52:40 UTC (rev 3566)
+++ branches/biounit/source/classification/cBGGenotypeManager.cc	2009-12-18 21:05:22 UTC (rev 3567)
@@ -44,7 +44,8 @@
 
 cBGGenotypeManager::~cBGGenotypeManager()
 {
-  // @TODO
+  assert(m_historic.GetSize() == 0);
+  assert(m_best == 0);
 }
 
 
@@ -170,7 +171,7 @@
   if (genotype->IsThreshold()) {
     // @TODO handle threshold removal
     // m_world->GetStats().RemoveThreshold();
-    // genotype->ClearThreshold();
+    genotype->ClearThreshold();
   }
   
   if (genotype->GetPassiveReferenceCount()) return;
@@ -196,7 +197,7 @@
     return;
   }
   
-  // @TODO - assumes asexual population
+  // @TODO - update coalescent assumes asexual population
   cBGGenotype* test_gen = getBest();
   cBGGenotype* found_gen = test_gen;
   cBGGenotype* parent_gen = (found_gen->GetParents().GetSize()) ? found_gen->GetParents()[0] : NULL;

Modified: branches/biounit/source/classification/cBGGenotypeManager.h
===================================================================
--- branches/biounit/source/classification/cBGGenotypeManager.h	2009-12-18 20:52:40 UTC (rev 3566)
+++ branches/biounit/source/classification/cBGGenotypeManager.h	2009-12-18 21:05:22 UTC (rev 3567)
@@ -81,7 +81,7 @@
   cString nameGenotype(int size, int num) const;
   
   void removeGenotype(cBGGenotype* genotype);
-  void updateCoalescent();  
+  void updateCoalescent();
   
   inline void resizeActiveList(int size);
   inline cBGGenotype* getBest();