Fix phenotype equality operator

emilydolson · Nov 19, 2018 · 5bfcb40 · 5bfcb40
1 parent 14e854e
commit 5bfcb40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/avida-core/source/main/cWorld.cc b/avida-core/source/main/cWorld.cc
@@ -82,7 +82,7 @@ cWorld::cWorld(cAvidaConfig* cfg, const cString& wd)
       delete test_cpu;
       tax->GetData().RecordFitness(test_info.GetGenotypeFitness());
       Phenotype p;
-      p.merit = test_info.GetTestPhenotype().GetMerit().GetDouble();
+      // p.merit = test_info.GetTestPhenotype().GetMerit().GetDouble();
       p.gestation_time = test_info.GetTestPhenotype().GetGestationTime();
       p.start_generation = test_info.GetTestPhenotype().GetGeneration();
       auto tasks = test_info.GetTestPhenotype().GetCurTaskCount();
@@ -284,7 +284,7 @@ bool cWorld::setup(World* new_world, cUserFeedback* feedback, const Apto::Map<Ap
   OnOffspringReady([this](Avida::InstructionSequence seq){ 
     systematics_manager->AddOrg(seq, next_cell_id, GetStats().GetUpdate(), false);
     emp::Ptr<taxon_t> tax = systematics_manager->GetMostRecent();
-    if (tax->GetData().GetPhenotype().merit == -1) {
+    if (tax->GetData().GetPhenotype().gestation_time == -1) {
       eval_fun(tax);
     }
   });

diff --git a/avida-core/source/main/cWorld.h b/avida-core/source/main/cWorld.h
@@ -62,21 +62,20 @@ class cUserFeedback;
 template<class T> class tDataEntry;
 
 struct Phenotype {
-  double merit = -1;
   int gestation_time = -1;
   int start_generation = -1;
   emp::vector<int> final_task_count;
 
-  // bool operator==(const Phenotype & other) {
-  //   return merit == other.merit && gestation_time == other.gestation_time && final_task_count == other.final_task_count; 
-  // }
+  bool operator==(const Phenotype & other) const {
+    return gestation_time == other.gestation_time && final_task_count == other.final_task_count; 
+  }
 
   bool operator<(const Phenotype & other) const {
-    return merit < other.merit || gestation_time < other.gestation_time || final_task_count < other.final_task_count; 
+    return std::tie(gestation_time, final_task_count) < std::tie(other.gestation_time, other.final_task_count); 
   }
 
   bool operator!=(const Phenotype & other) const {
-    return merit != other.merit || gestation_time != other.gestation_time || final_task_count != other.final_task_count; 
+    return gestation_time != other.gestation_time || final_task_count != other.final_task_count; 
   }