merged

Author: EliasH-E

source/sgp_mode/SymbiontImpact.h

@@ -27,10 +27,6 @@ double CheckSymbiont(SGPHost host, SGPSymbiont symbiont,
   host.ClearReproSyms();
   host.SetPoints(0.0);
   for (size_t i = 0; i < SYM_CHECK_UPDATES; i++) {
-    // world.GetUpdate() isn't changing since the whole world isn't being
-    // updated, so we need to do this resetting manually
-    if (i % (30 / world.GetConfig()->CYCLES_PER_UPDATE()) == 0)
-      host.GetCPU().state.used_resources->reset();
     host.GetCPU().RunCPUStep(emp::WorldPosition::invalid_id,
                              world.GetConfig()->CYCLES_PER_UPDATE());
   }
@@ -40,8 +36,6 @@ double CheckSymbiont(SGPHost host, SGPSymbiont symbiont,
   host.AddSymbiont(&symbiont);
   symbiont.SetPoints(0.0);
   for (size_t i = 0; i < SYM_CHECK_UPDATES; i++) {
-    if (i % (30 / world.GetConfig()->CYCLES_PER_UPDATE()) == 0)
-      host.GetCPU().state.used_resources->reset();
     // Instead of randomly ordering the host and symbiont (like in
     // Host::Process()), alternate every update. That way it's deterministic and
     // we don't need to have access to the emp::Random.

source/test/sgp_mode_test/OnlyNOT.test.cc

@@ -0,0 +1,58 @@
+#include "../../sgp_mode/GenomeLibrary.h"
+#include "../../sgp_mode/CPU.h"
+#include "../../sgp_mode/SGPHost.h"
+#include "../../sgp_mode/SGPHost.cc"
+#include "../../sgp_mode/SGPWorld.h"
+#include "../../sgp_mode/SGPWorldSetup.cc"
+#include "../../sgp_mode/SGPDataNodes.h"
+
+#include "../../catch/catch.hpp"
+
+TEST_CASE("Organisms, without mutation can only do NOT operations", "[sgp]") {
+     
+  emp::Random random(1);
+  SymConfigSGP config;
+  config.SEED(2);
+  config.ORGANISM_TYPE(HEALTH);
+  config.STRESS_TYPE(PARASITE);
+  config.MUTATION_RATE(0.0);
+  config.MUTATION_SIZE(0.000);
+  SGPWorld world(random, &config, LogicTasks);
+
+  // Mock Organism to check reproduction
+  class TestOrg : public Organism {
+  public:
+    bool IsHost() override { return true; }
+    void AddPoints(double p) override {}
+    double GetPoints() override { return 0; }
+  };
+
+  TestOrg organism;
+
+  // NOT builder
+  ProgramBuilder builder;
+  (builder.AddNot)();
+  CPU cpu(&organism, &world, builder.Build(100));
+  
+  
+  
+  cpu.RunCPUStep(0, 100);
+  
+  //The result of a AND bitwise operations when one of the inputs, in binary, is all ones will be the other input
+  long all_ones_binary = 4294967295;
+  cpu.state.input_buf.push(all_ones_binary);
+  cpu.RunCPUStep(0, 100);
+  world.Update();
+
+  //Checks both that NOT is being done and no other operations are being done
+  for (auto data : world.GetTaskSet()) {
+    
+      if(data.task.name != "NOT"){
+    
+       REQUIRE(data.n_succeeds_host == 0);
+      }
+      else{
+        REQUIRE(data.n_succeeds_host > 0);
+      }
+  }
+}