completeness check compares connected genome nodes and number of actu…

…al connected cells
chrxh · Dec 14, 2023 · fc63edc · fc63edc
1 parent 578bfb9
commit fc63edc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/source/Base/Resources.h b/source/Base/Resources.h
@@ -2,7 +2,7 @@
 
 namespace Const
 {
-    std::string const ProgramVersion = "4.5.0";
+    std::string const ProgramVersion = "4.5.1";
     std::string const DiscordLink = "https://discord.gg/7bjyZdXXQ2";
 
     std::string const BasePath = "resources/";

diff --git a/source/EngineGpuKernels/ConstructorProcessor.cuh b/source/EngineGpuKernels/ConstructorProcessor.cuh
@@ -100,6 +100,9 @@ __inline__ __device__ void ConstructorProcessor::completenessCheck(SimulationDat
         constructor.isComplete = true;
         return;
     }
+
+    auto numConnectedGenomeNodes = GenomeDecoder::getNumNodesRecursively(constructor.genome, constructor.genomeSize, true, false);
+
     auto constexpr ContainerSize = 256;
     Cell* temp[ContainerSize * 2];
     HashSet<Cell*, HashFunctor<Cell*>> visitedCells(ContainerSize * 2, temp);
@@ -110,7 +113,7 @@ __inline__ __device__ void ConstructorProcessor::completenessCheck(SimulationDat
     auto connectionIndex = 0;
     Cell* lastCells[ContainerSize];
     int lastIndices[ContainerSize];
-
+    int scannedCells = 1;
     do {
         auto goBack = false;
         if (connectionIndex < currentCell->numConnections) {
@@ -120,14 +123,7 @@ __inline__ __device__ void ConstructorProcessor::completenessCheck(SimulationDat
                 if (nextCell->creatureId != cell->creatureId) {
                     goBack = true;
                 } else {
-                    if (nextCell->cellFunction == CellFunction_Constructor && !GenomeDecoder::hasEmptyGenome(nextCell->cellFunctionData.constructor)
-                        && !nextCell->cellFunctionData.constructor.isConstructionBuilt
-                        && !GenomeDecoder::containsSectionSelfReplication(
-                            nextCell->cellFunctionData.constructor.genome + Const::GenomeHeaderSize,
-                            nextCell->cellFunctionData.constructor.genomeSize - Const::GenomeHeaderSize)) {
-                        constructor.isComplete = false;
-                        return;
-                    }
+                    ++scannedCells;
                     lastCells[depth] = currentCell;
                     lastIndices[depth] = connectionIndex;
                     currentCell = nextCell;
@@ -153,7 +149,7 @@ __inline__ __device__ void ConstructorProcessor::completenessCheck(SimulationDat
         }
     } while (true);
 
-    constructor.isComplete = true;
+    constructor.isComplete = scannedCells == numConnectedGenomeNodes;
 }
 
 __inline__ __device__ void ConstructorProcessor::processCell(SimulationData& data, SimulationStatistics& statistics, Cell* cell)
@@ -365,7 +361,7 @@ ConstructorProcessor::startNewConstruction(SimulationData& data, SimulationStati
 
     if (GenomeDecoder::containsSelfReplication(constructor)) {
         constructor.offspringCreatureId = 1 + data.numberGen1.random(65535);
-        hostCell->genomeNumNodes = GenomeDecoder::getNumNodesRecursively(constructor.genome, toInt(constructor.genomeSize), true, true);
+        hostCell->genomeNumNodes = GenomeDecoder::getNumNodesRecursively(constructor.genome, toInt(constructor.genomeSize), true, false);
     } else {
         constructor.offspringCreatureId = hostCell->creatureId;
     }

diff --git a/source/EngineGpuKernels/GenomeDecoder.cuh b/source/EngineGpuKernels/GenomeDecoder.cuh
@@ -621,7 +621,7 @@ __inline__ __device__ void GenomeDecoder::setNextConstructionAngle2(uint8_t* gen
 
 __inline__ __device__ void GenomeDecoder::setNextConstructorSeparation(uint8_t* genome, int nodeAddress, bool separation)
 {
-    genome[nodeAddress + Const::CellBasicBytes + Const::ConstructorFixedBytes + 3 + Const::ConstructorSeparation] = convertBoolToByte(separation);
+    genome[nodeAddress + Const::CellBasicBytes + Const::ConstructorFixedBytes + 3 + Const::GenomeHeaderSeparationPos] = convertBoolToByte(separation);
 }
 
 __inline__ __device__ int GenomeDecoder::getNextSubGenomeSize(uint8_t* genome, int genomeSize, int nodeAddress)

diff --git a/source/EngineGpuKernels/MutationProcessor.cuh b/source/EngineGpuKernels/MutationProcessor.cuh
@@ -365,7 +365,7 @@ __inline__ __device__ void MutationProcessor::cellFunctionMutation(SimulationDat
     GenomeDecoder::setNextCellFunctionType(targetGenome, nodeAddress, newCellFunction);
     GenomeDecoder::setRandomCellFunctionData(data, targetGenome, nodeAddress + Const::CellBasicBytes, newCellFunction, makeSelfCopy, Const::GenomeHeaderSize);
     if (newCellFunction == CellFunction_Constructor && !makeSelfCopy) {
-        GenomeDecoder::setNextConstructorSeparation(targetGenome, nodeAddress, false);  //currently no subgenome with separation property wished
+        GenomeDecoder::setNextConstructorSeparation(targetGenome, nodeAddress, false);  //currently no sub-genome with separation property wished
     }
 
     for (int i = nodeAddress + Const::CellBasicBytes + origCellFunctionSize; i < genomeSize; ++i) {
@@ -449,7 +449,7 @@ __inline__ __device__ void MutationProcessor::insertMutation(SimulationData& dat
     GenomeDecoder::setNextCellColor(targetGenome, nodeAddress, newColor);
     GenomeDecoder::setRandomCellFunctionData(data, targetGenome, nodeAddress + Const::CellBasicBytes, newCellFunction, makeSelfCopy, Const::GenomeHeaderSize);
     if (newCellFunction == CellFunction_Constructor && !makeSelfCopy) {
-        GenomeDecoder::setNextConstructorSeparation(targetGenome, nodeAddress, false);      //currently no subgenome with separation property wished
+        GenomeDecoder::setNextConstructorSeparation(targetGenome, nodeAddress, false);      //currently no sub-genome with separation property wished
     }
 
     for (int i = nodeAddress; i < genomeSize; ++i) {

diff --git a/source/EngineInterface/GenomeConstants.h b/source/EngineInterface/GenomeConstants.h
@@ -22,8 +22,6 @@ namespace Const
     auto constexpr ConstructorConstructionAngle1Pos = 3;
     auto constexpr ConstructorConstructionAngle2Pos = 4;
 
-    auto constexpr ConstructorSeparation = 2;
-
     auto constexpr CellBasicBytes = 8;
     auto constexpr NeuronBytes = 64 + 8 + 8;
     auto constexpr TransmitterBytes = 1;

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "alien",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "dependencies": [
     {
       "name": "glew",