#2869 - Pull in changes from 4.0.0a1-dev and resolve conflicts

2025-01-03 09:54:11 +00:00
parent 2108b914e3 491de6fc47
commit 55ddcb7eb4
402 changed files with 481 additions and 404 deletions
--- a/tests/unit_tests/_primaite/_game/init.py
+++ b/tests/unit_tests/_primaite/_game/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/unit_tests/_primaite/_game/_agent/init.py
+++ b/tests/unit_tests/_primaite/_game/_agent/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/unit_tests/_primaite/_game/_agent/test_actions.py
+++ b/tests/unit_tests/_primaite/_game/_agent/test_actions.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from unittest.mock import Mock

 import pytest
--- a/tests/unit_tests/_primaite/_game/_agent/test_agent_log.py
+++ b/tests/unit_tests/_primaite/_game/_agent/test_agent_log.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from uuid import uuid4

 import pytest
--- a/tests/unit_tests/_primaite/_game/_agent/test_observations.py
+++ b/tests/unit_tests/_primaite/_game/_agent/test_observations.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import List

 import pytest
--- a/tests/unit_tests/_primaite/_game/_agent/test_probabilistic_agent.py
+++ b/tests/unit_tests/_primaite/_game/_agent/test_probabilistic_agent.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from primaite.game.agent.actions import ActionManager
 from primaite.game.agent.observations.observation_manager import NestedObservation, ObservationManager
 from primaite.game.agent.rewards import RewardFunction
--- a/tests/unit_tests/_primaite/_game/_agent/test_sticky_rewards.py
+++ b/tests/unit_tests/_primaite/_game/_agent/test_sticky_rewards.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK

 from primaite.game.agent.rewards import (
    GreenAdminDatabaseUnreachablePenalty,