reinstating the interaction_check update and updating some test configs to work with new code

Author: K-Johnson-Horrigan

source/sgp_mode/SGPHost.h

@@ -604,9 +604,7 @@ class SGPHost : public Host {
 
       emp::Ptr<sgp_sym_t> cur_symbiont = static_cast<sgp_sym_t*>(syms[endosym_i].Raw());
 
-      const emp::BitVector& endosym_task_profile = my_world->GetSymTaskProfile(*cur_symbiont);
-      const emp::BitVector& host_task_profile = my_world->GetHostTaskProfile(*this);
-      bool is_matching = my_world->TaskProfileCompatibilityCheck(host_task_profile,endosym_task_profile);
+      bool is_matching = my_world->GetInteractionCompatibility(*this,*cur_symbiont);
       matching_syms_to_interact_with += is_matching;
 
       }

source/sgp_mode/SGPW_InteractionMechanismSetup.cc

@@ -11,6 +11,7 @@ namespace sgpmode {
     // These are defined in SGPW_TaskProfileSetup
     SetupTaskProfileMode();
     SetupTaskProfileCompatibilityMode();
+    SetupInteractionCompatibilityMode();
     SetupHorizontalTransmissionCompatibilityMode();
 
     SetupFindHostForHorizontalTransmission();
@@ -79,10 +80,7 @@ namespace sgpmode {
           if (sym.GetDead()) { return; }
           // Will sym donate?
           bool interact = random_ptr->P(sgp_config.HEALTH_INTERACTION_CHANCE());
-
-          const auto& host_task_profile = fun_get_host_task_profile(host);
-          const auto& sym_task_profile = fun_get_sym_task_profile(sym);
-          interact = interact && fun_task_profile_compatibility_check(host_task_profile, sym_task_profile);
+          interact = interact && fun_interaction_compatibility_check(host, sym);
 
           const double donate_prop = sgp_config.MUTUALIST_CYCLE_GAIN_PROP();
           emp_assert(donate_prop <= 1.0 && donate_prop >= 0.0);
@@ -122,9 +120,7 @@ namespace sgpmode {
           auto& host_state = host.GetHardware().GetCPUState();
           // Will sym steal?
           bool interact = random_ptr->P(sgp_config.HEALTH_INTERACTION_CHANCE());
-          const auto& host_task_profile = fun_get_host_task_profile(host);
-          const auto& sym_task_profile = fun_get_sym_task_profile(sym);
-          interact = interact && fun_task_profile_compatibility_check(host_task_profile, sym_task_profile);
+          interact = interact && fun_interaction_compatibility_check(host, sym);
 
           const double steal_prop = sgp_config.PARASITE_CYCLE_LOSS_PROP();
           emp_assert(steal_prop <= 1.0 && steal_prop >= 0.0);
@@ -162,9 +158,7 @@ namespace sgpmode {
           auto& host_state = host.GetHardware().GetCPUState();
           // Will host and symbiont interact?
           bool interact = random_ptr->P(sgp_config.HEALTH_INTERACTION_CHANCE());
-          const auto& host_task_profile = fun_get_host_task_profile(host);
-          const auto& sym_task_profile = fun_get_sym_task_profile(sym);
-          interact = interact && fun_task_profile_compatibility_check(host_task_profile, sym_task_profile);
+          interact = interact && fun_interaction_compatibility_check(host, sym);
           const double sym_interaction_value = sym.GetIntVal();
           emp_assert(sym_interaction_value >= -1.0);
           emp_assert(sym_interaction_value <= 1.0 );
@@ -240,7 +234,6 @@ namespace sgpmode {
           if (!stress_extinction_update) return;
           // If host has a mutualist symbiont with a matching task profile, death_chance = mutualist death chance
           // Otherwise, base death chance.
-          const emp::BitVector& host_task_profile = fun_get_host_task_profile(host);
           bool interact = false;
           auto& endosymbionts = host.GetSymbionts();
           for (size_t sym_i = 0; sym_i < endosymbionts.size(); ++sym_i) {
@@ -250,7 +243,7 @@ namespace sgpmode {
             //   host_task_profile,
             //   fun_get_sym_task_profile(*endosym_ptr)
             // );
-            interact = fun_task_profile_compatibility_check(host_task_profile, fun_get_sym_task_profile(*endosym_ptr));
+            interact = fun_interaction_compatibility_check(host, *endosym_ptr);
             if (interact) {
               break;
             }
@@ -275,12 +268,11 @@ namespace sgpmode {
             // Otherwise, base death chance.
             double death_chance = sgp_config.BASE_DEATH_CHANCE();
             auto& endosymbionts = host.GetSymbionts();
-            const emp::BitVector& host_task_profile = fun_get_host_task_profile(host);
             for (size_t sym_i = 0; sym_i < endosymbionts.size(); ++sym_i) {
               // Check if symbiont matches task profile
               emp::Ptr<sgp_sym_t> endosym_ptr = static_cast<sgp_sym_t*>(endosymbionts[sym_i].Raw());
               const emp::BitVector& endosym_task_profile = fun_get_sym_task_profile(*endosym_ptr);
-              const bool can_escape = fun_task_profile_compatibility_check(host_task_profile, fun_get_sym_task_profile(*endosym_ptr));
+              const bool can_escape = fun_interaction_compatibility_check(host, *endosym_ptr);
               if (can_escape) {
                 death_chance = sgp_config.PARASITE_DEATH_CHANCE();
                 // Endosymbiont gets opportunity to horizontally transmit
@@ -320,7 +312,7 @@ namespace sgpmode {
             for (size_t sym_i = 0; sym_i < endosymbionts.size(); ++sym_i) {
               // Check if symbiont matches task profile
               emp::Ptr<sgp_sym_t> endosym_ptr = static_cast<sgp_sym_t*>(endosymbionts[sym_i].Raw());
-              const bool can_escape = fun_task_profile_compatibility_check(host_task_profile, fun_get_sym_task_profile(*endosym_ptr));
+              const bool can_escape = fun_interaction_compatibility_check(host, *endosym_ptr);
               if (can_escape) {
                 death_chance = sgp_config.PARASITE_DEATH_CHANCE();
                 escapee_ids.emplace_back(sym_i);
@@ -364,17 +356,16 @@ namespace sgpmode {
       before_host_cpu_exec_sig.AddAction(
         [this](sgp_host_t& host) {
           if (!stress_extinction_update) return;
-          const emp::BitVector& host_task_profile = fun_get_host_task_profile(host);
           emp::vector<size_t> escapee_ids; // Any parasite escapees?
           bool interact = false;
           double endosym_interaction_value = 0.0;
           auto& endosymbionts = host.GetSymbionts();
           for (size_t sym_i = 0; sym_i < endosymbionts.size(); ++sym_i) {
             // Check if symbiont matches task profile
             emp::Ptr<sgp_sym_t> endosym_ptr = static_cast<sgp_sym_t*>(endosymbionts[sym_i].Raw());
-            interact = fun_task_profile_compatibility_check(
-              host_task_profile,
-              fun_get_sym_task_profile(*endosym_ptr)
+            interact = fun_interaction_compatibility_check(
+              host,
+              *endosym_ptr
             );
             if (interact) {
               endosym_interaction_value = endosym_ptr->GetIntVal();

source/test/sgp_mode_test/functional_tests/HealthMode.test.cc

@@ -48,7 +48,7 @@ void ConfigureHealthTestConfig(sgpmode::SymConfigSGP& config) {
 
   // general sgp settings
   config.TASK_ENV_CFG_PATH("source/test/sgp_mode_test/hardware-test-env.json");
-  config.TASK_PROFILE_COMPATIBILITY_MODE("task-any-match");
+  config.INTERACTION_PROFILE_COMPATIBILITY_MODE("task-any-match");
   config.TASK_PROFILE_MODE("self-all");
   config.CYCLES_PER_UPDATE(4);
   config.TASK_IO_BANK_SIZE(10);

source/test/sgp_mode_test/functional_tests/TagMatching.test.cc

@@ -27,9 +27,9 @@ TEST_CASE("SGP Tag Matching for organism interaction compatibility", "[sgp]"){
   config.TASK_ENV_CFG_PATH("source/test/sgp_mode_test/hardware-test-env.json");
   config.FILE_PATH("TempChangingEnv_test_output");
   config.SEED(89);
-  config.POP_SIZE(0);
-  config.GRID_X(2);
-  config.GRID_Y(2);
+  config.INIT_POP_SIZE(0);
+  config.WORLD_WIDTH(2);
+  config.WORLD_HEIGHT(2);
   config.CYCLES_PER_UPDATE(4);
   config.TAG_MATCHING(1);
   config.INTERACTION_PROFILE_COMPATIBILITY_MODE("tag-probabilistic-match");