+ evaluate target color in ReconnectorProcessor

+ reconnector tests adapted
chrxh · Oct 21, 2023 · 22165bc · 22165bc
1 parent 5782194
commit 22165bc
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 2 deletions.
diff --git a/source/EngineGpuKernels/ReconnectorProcessor.cuh b/source/EngineGpuKernels/ReconnectorProcessor.cuh
@@ -56,10 +56,13 @@ ReconnectorProcessor::tryEstablishConnection(SimulationData& data, SimulationSta
         if (cell->creatureId != 0 && otherCell->creatureId == cell->creatureId) {
             return;
         }
-        if (CellConnectionProcessor::isConnectedConnected(cell, otherCell)) {
+        if (otherCell->barrier) {
             return;
         }
-        if (otherCell->barrier) {
+        if (otherCell->color != cell->cellFunctionData.reconnector.color) {
+            return;
+        }
+        if (CellConnectionProcessor::isConnectedConnected(cell, otherCell)) {
             return;
         }
         auto distance = data.cellMap.getDistance(cell->pos, otherCell->pos);

diff --git a/source/EngineInterface/Descriptions.h b/source/EngineInterface/Descriptions.h
@@ -284,6 +284,12 @@ struct ReconnectorDescription
     int color = 0;
 
     auto operator<=>(ReconnectorDescription const&) const = default;
+
+    ReconnectorDescription& setColor(int value)
+    {
+        color = value;
+        return *this;
+    }
 };
 
 using CellFunctionDescription = std::optional<std::variant<

diff --git a/source/EngineTests/ReconnectorTests.cpp b/source/EngineTests/ReconnectorTests.cpp
@@ -57,6 +57,45 @@ TEST_F(ReconnectorTests, establishConnection_nothingFound)
     EXPECT_TRUE(std::abs(actualReconnectorCell.activity.channels[0]) < NEAR_ZERO);
     EXPECT_TRUE(approxCompare(getEnergy(data), getEnergy(actualData)));
     EXPECT_TRUE(approxCompare(0.0f, actualReconnectorCell.activity.channels[0]));
+    EXPECT_EQ(1, actualReconnectorCell.connections.size());
+}
+
+TEST_F(ReconnectorTests, establishConnection_wrongColor)
+{
+    DataDescription data;
+    data.addCells({
+        CellDescription()
+            .setId(1)
+            .setPos({10.0f, 10.0f})
+            .setMaxConnections(2)
+            .setExecutionOrderNumber(0)
+            .setInputExecutionOrderNumber(5)
+            .setCellFunction(ReconnectorDescription().setColor(1)),
+        CellDescription()
+            .setId(2)
+            .setPos({11.0f, 10.0f})
+            .setMaxConnections(1)
+            .setExecutionOrderNumber(5)
+            .setCellFunction(NerveDescription())
+            .setActivity({1, 0, 0, 0, 0, 0, 0, 0}),
+        CellDescription().setId(3).setPos({9.0f, 10.0f}),
+    });
+    data.addConnection(1, 2);
+
+    _simController->setSimulationData(data);
+    _simController->calcTimesteps(1);
+
+    auto actualData = _simController->getSimulationData();
+    ASSERT_EQ(3, actualData.cells.size());
+
+    auto actualReconnectorCell = getCell(actualData, 1);
+
+    auto actualTargetCell = getCell(actualData, 3);
+
+    EXPECT_TRUE(std::abs(actualReconnectorCell.activity.channels[0]) < NEAR_ZERO);
+    EXPECT_EQ(1, actualReconnectorCell.connections.size());
+    EXPECT_EQ(0, actualTargetCell.connections.size());
+    EXPECT_TRUE(approxCompare(getEnergy(data), getEnergy(actualData)));
 }
 
 TEST_F(ReconnectorTests, establishConnection_success)