Update to work with new modes metric tracker

emilydolson · Oct 12, 2018 · c04afea · c04afea
1 parent 2bdb9fb
commit c04afea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/avida-core/source/main/cWorld.cc b/avida-core/source/main/cWorld.cc
@@ -248,7 +248,7 @@ bool cWorld::setup(World* new_world, cUserFeedback* feedback, const Apto::Map<Ap
       return emp::to_string(tax.GetInfo().AsString().GetCString());
     }, "sequence", "Avida instruction sequence for this taxon.");
 
-  OEE_stats.New(systematics_manager, skel_fun, [null_inst](const std::string & org){return org.size();}, m_conf->WORLD_X.Get() * m_conf->WORLD_Y.Get() * 200000);
+  OEE_stats.New(systematics_manager, skel_fun, [null_inst](const std::string & org){return org.size();}, true, m_conf->WORLD_X.Get() * m_conf->WORLD_Y.Get() * 200000);
   OEE_stats->SetGenerationInterval(m_conf->FILTER_TIME.Get());
   OEE_stats->SetResolution(m_conf->OEE_RES.Get());
 

diff --git a/avida-core/source/main/cWorld.h b/avida-core/source/main/cWorld.h
@@ -184,12 +184,12 @@ class cWorld
   bool all_tasks = false;
   int latest_gen = -1; // Force time to go forward
 
-  using systematics_t = emp::Systematics<Avida::InstructionSequence, Avida::InstructionSequence, emp::datastruct::oee_data<std::string>>;
-  using taxon_t = emp::Taxon< Avida::InstructionSequence, emp::datastruct::oee_data<std::string >>;
+  using systematics_t = emp::Systematics<Avida::InstructionSequence, Avida::InstructionSequence>;
+  using taxon_t = emp::Taxon< Avida::InstructionSequence>;
 
   emp::Ptr<systematics_t> systematics_manager;
   // // If there are multiple instruction ets this could be a problem
-  emp::Ptr<emp::OEETracker<Avida::InstructionSequence, Avida::InstructionSequence, std::string, emp::datastruct::oee_data<std::string > > > OEE_stats;
+  emp::Ptr<emp::OEETracker<systematics_t, std::string, emp::SeenBloomFilter> > OEE_stats;
   Genome curr_genome;
 
   Data::ManagerPtr& GetDataManager() { return m_data_mgr; }