refactor to use functors for point awards

Author: Gabe-Rose

source/sgp_mode/SGPConfigSetup.h

@@ -10,8 +10,7 @@
 
 namespace sgpmode {
 
-// TODO - rename TASK_TYPE to be more specific
-
+// TODO rename SymConfigSGP to avoid confusion and add clarity with sym/host nameing conventtions
 EMP_EXTEND_CONFIG(SymConfigSGP, SymConfigBase,
   GROUP(SGP, "Complex Genomes Settings"),
   VALUE(CYCLES_PER_UPDATE, size_t, 4, "Number of CPU cycles that organisms run every update"),
@@ -22,7 +21,6 @@ EMP_EXTEND_CONFIG(SymConfigSGP, SymConfigBase,
   VALUE(HOST_MIN_CYCLES_BEFORE_REPRO, size_t, 0, "Number of CPU cycles organisms must wait between reproductions"),
   VALUE(SYM_MIN_CYCLES_BEFORE_REPRO, size_t, 0, "Number of CPU cycles organisms must wait between reproductions"),
 
-  // NOTE - Might be able to eliminate ORGANISM_TYPE if interaction modes are allowed to be "layered on"
   VALUE(INTERACTION_MECHANISM, std::string, "default", "What sgp organisms should population the world? (Options: 'default')"),
   VALUE(VT_TASK_MATCH, bool, false, "Should task matching be required for vertical transmission? (0 for no, 1 for yes)"),
   VALUE(TASK_PROFILE_MODE, std::string, "self-all", "What should we use for task profiles for host-symbiont compatibility, preferential ousting, etc.? Options are parent-all, self-all, self-first, parent-first. 'all' means all tasks, 'first' means only first task performed."),
@@ -42,7 +40,6 @@ EMP_EXTEND_CONFIG(SymConfigSGP, SymConfigBase,
   VALUE(PARASITE_NUM_OFFSPRING_ON_STRESS_INTERACTION, size_t, 1, "Number of offspring stress parasite can produce when host dies during stress event"),
   VALUE(PARASITE_ESCAPEE_TIMING, std::string, "on-match-host-death", "When should parasites have the opportunity to produce escapees during a stress event? Options: on-match-host-death, on-match"),
 
-  // NOTE - HEALTH_X is less descriptive than STRESS_X; shift language to HEALTH_INTERACTION_X?
   GROUP(HEALTH, "Health interaction settings"),
   VALUE(ENABLE_HEALTH, bool, false, "Health interactions enabled?"),
   VALUE(HEALTH_TYPE, std::string, "mutualist", "What kind of health symbionts are used?"),

source/sgp_mode/SGPSymbiont.h

@@ -383,6 +383,7 @@ void ProcessOutputBuffer() {
         );
         double task_points = new_points - GetPoints();
 
+        /*
         //Parasitic Nutrient symbionts receieve less rewards from completing tasks to incentivize matching tasks with hosts
         if(my_world->GetConfig().ENABLE_NUTRIENT() && my_world->GetNutrientSymType() == nutrient_sym_mode_t::PARASITE){
           task_points *= my_world->GetConfig().PARASITE_BASE_TASK_VALUE_PROP();
@@ -393,7 +394,9 @@ void ProcessOutputBuffer() {
         // // Enforce limits on points
 
         //^^^ 386 through here are doing the work in 455 in SGPHost - could be refactored
-
+        */
+        //World handles point movement between hosts and symbionts
+        my_world->ApplySymPoints(*this, task_points, task_id);
         my_world->GetSymTaskSuccesses()[task_id] += 1;
       }
     }

source/sgp_mode/SGPW_InteractionMechanismSetup.cc

@@ -29,7 +29,9 @@ namespace sgpmode {
       SetupNutrientInteractions();
     } // default is no nutrient interactions, which is set in SGPWorld constructor
 
+    
     SetupHostTaskRewards();
+    SetupSymTaskRewards();
 
   }
 
@@ -742,6 +744,35 @@ namespace sgpmode {
     }
   }
 
+  /*
+  * Input: None
+  * Outpt: None
+  * Purpose: Sets up functor to decide what happens when a sym tries to receive point reward for completing a task
+  */
+  void SGPWorld::SetupSymTaskRewards() {
+    if (sgp_config.ENABLE_NUTRIENT() == false) {
+      fun_apply_sym_points = [this](
+        sgp_sym_t& sym,
+        double task_value_before,
+        size_t task_id
+      ) {
+        sym.AddPoints(task_value_before);
+      };
+    } else {
+      fun_apply_sym_points = [this](
+        sgp_sym_t& sym,
+        double task_value_before,
+        size_t task_id
+      ) {
+        double task_value = task_value_before;
+        if(GetNutrientSymType() == nutrient_sym_mode_t::PARASITE){
+          task_value *= sgp_config.PARASITE_BASE_TASK_VALUE_PROP();
+        }
+        sym.AddPoints(task_value);
+      };
+    }
+  
+  }
 
 
 

source/sgp_mode/SGPWorld.h

@@ -102,6 +102,12 @@ class SGPWorld : public SymWorld {
     size_t     /* task id */
   )>;
 
+  using func_apply_sym_points_t = std::function<void(
+    sgp_sym_t&,
+    double,     /* task value before nutrient interaction */
+    size_t     /* task id */
+  )>;
+
   // using fun_process_endosym_t = std::function<void(
   //   sgp_sym_t&,                /* endosymbiont */
   //   const emp::WorldPosition&, /* sym pos */
@@ -428,6 +434,7 @@ class SGPWorld : public SymWorld {
   fun_calc_host_nutrient_interaction_t fun_calc_host_nutrient_interaction;
   fun_calc_sym_nutrient_interaction_t fun_calc_sym_nutrient_interaction;
   func_apply_host_points_t fun_apply_host_points;
+  func_apply_sym_points_t fun_apply_sym_points;
 
   // NOTE - Don't love this being owned by the world.
   //        Not sure of better alterative. Need to know this in InitializeState
@@ -543,6 +550,7 @@ class SGPWorld : public SymWorld {
   void SetupSymReproduction();
   void SetupHostReproduction();
   void SetupHostTaskRewards();
+  void SetupSymTaskRewards();
   void SetupTaskProfileMode();
   void SetupTaskProfileCompatibilityMode();
   void SetupHorizontalTransmissionCompatibilityMode();
@@ -708,6 +716,14 @@ class SGPWorld : public SymWorld {
     fun_apply_host_points(host,task_value_before, task_id);
   }
 
+  void ApplySymPoints(
+     sgp_sym_t& sym,
+    double task_value_before,
+    size_t task_id
+  ) {
+    fun_apply_sym_points(sym,task_value_before, task_id);
+  }
+
   const emp::BitVector& GetSymTaskProfile(
     sgp_sym_t& sym
   ) {