socha 2.2.1__tar.gz → 2.2.2__tar.gz

{socha-2.2.1 → socha-2.2.2}/Cargo.lock

@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "_socha"
-version = "2.2.1"
+version = "2.2.2"
 dependencies = [
  "libm",
  "libmath",
@@ -27,15 +27,15 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bitflags"
@@ -63,9 +63,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "indoc"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "libc"
@@ -106,15 +106,15 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "memoffset"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 dependencies = [
  "autocfg",
 ]
@@ -156,9 +156,9 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
  "unicode-ident",
 ]
@@ -221,7 +221,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -234,14 +234,14 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.59",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -304,9 +304,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "scopeguard"
@@ -356,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.53"
+version = "2.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -464,9 +464,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
+checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
 
 [[package]]
 name = "yaserde"

{socha-2.2.1 → socha-2.2.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "_socha"
-version = "2.2.1"
+version = "2.2.2"
 edition = "2021"
 
 [lib]

{socha-2.2.1 → socha-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socha
-Version: 2.2.1
+Version: 2.2.2
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
@@ -200,6 +200,10 @@ you can of course pass start arguments.
 
 ## Preparing Your Player for the Competition
 
+> Please note that the competition system runs on a Linux system with an `x86_64` architecture.
+> To use your client on the competition system, you will need to download the socha package
+> built for the `manylinux2014_x86_64` platform and the Python version `310`.
+
 To ensure that your player is usable for the competition system,
 you need to download all the dependencies that your client uses
 because the system will run on a docker container without access to the internet and sudo permission.
@@ -217,7 +221,7 @@ If you want to do it manually, follow the steps below to download the dependenci
 1. Open your terminal or console wherever you want to create your directory that you will upload.
 2. Type `mkdir my_player` to create a new directory named `my_player`. You can name yours whatever you want.
 3. Enter the directory using `cd my_player`.
-4. Run the command: `pip download socha xsdata==22.7 -d dependencies` in the directory.
+4. Run the command: `pip download socha --only-binary=:all: --platform manylinux2014_x86_64 --python-version 310 -d dependencies` in the directory.
    This command downloads the dependencies you need into the folder `dependencies`.
 5. Ensure to add all your dependencies that your client uses.
 6. After the download, create a last directory using `mkdir .pip_cache`.

{socha-2.2.1 → socha-2.2.2}/README.md

@@ -176,6 +176,10 @@ you can of course pass start arguments.
 
 ## Preparing Your Player for the Competition
 
+> Please note that the competition system runs on a Linux system with an `x86_64` architecture.
+> To use your client on the competition system, you will need to download the socha package
+> built for the `manylinux2014_x86_64` platform and the Python version `310`.
+
 To ensure that your player is usable for the competition system,
 you need to download all the dependencies that your client uses
 because the system will run on a docker container without access to the internet and sudo permission.
@@ -193,7 +197,7 @@ If you want to do it manually, follow the steps below to download the dependenci
 1. Open your terminal or console wherever you want to create your directory that you will upload.
 2. Type `mkdir my_player` to create a new directory named `my_player`. You can name yours whatever you want.
 3. Enter the directory using `cd my_player`.
-4. Run the command: `pip download socha xsdata==22.7 -d dependencies` in the directory.
+4. Run the command: `pip download socha --only-binary=:all: --platform manylinux2014_x86_64 --python-version 310 -d dependencies` in the directory.
    This command downloads the dependencies you need into the folder `dependencies`.
 5. Ensure to add all your dependencies that your client uses.
 6. After the download, create a last directory using `mkdir .pip_cache`.

{socha-2.2.1 → socha-2.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "socha"
-version = "2.2.1"
+version = "2.2.2"
 authors = [{ name = "maxblan", email = "stu222782@mail.uni-kiel.de" }]
 description = "This is the package for the Software-Challenge Germany 2024. This Season the game will be 'Mississippi Queen'."
 readme = "README.md"

{socha-2.2.1 → socha-2.2.2}/python/socha/_socha.pyi

@@ -1,5 +1,6 @@
 from typing import Any, List, Optional, Set, Tuple
 
+
 class PluginConstants:
     ROUND_LIMIT: int
     START_COAL: int
@@ -19,6 +20,7 @@ class PluginConstants:
     MAX_ISLANDS: int
     MIN_ISLANDS: int
 
+
 class CartesianCoordinate:
     x: int
     y: int
@@ -28,6 +30,7 @@ class CartesianCoordinate:
     def to_index(self) -> Optional[int]: ...
     def from_index(index: int) -> CartesianCoordinate: ...
 
+
 class CubeCoordinates:
     q: int
     r: int
@@ -46,6 +49,7 @@ class CubeCoordinates:
     def distance_to(self, other: CubeCoordinates) -> int: ...
     def turn_count_to(self, target: CubeDirection) -> int: ...
 
+
 class CubeDirection:
     Right: int
     DownRight: int
@@ -62,15 +66,19 @@ class CubeDirection:
     def rotated_by(self, turns: int) -> CubeDirection: ...
     def ordinal(self) -> int: ...
 
+
 class Move:
     actions: List[Accelerate | Advance | Push | Turn]
 
-    def __init__(self, actions: List[Accelerate | Advance | Push | Turn]) -> None: ...
+    def __init__(self, actions: List[Accelerate |
+                 Advance | Push | Turn]) -> None: ...
+
 
 class TeamEnum:
     One: int
     Two: int
 
+
 class Ship:
     team: TeamEnum
     position: CubeCoordinates
@@ -99,9 +107,12 @@ class Ship:
     def accelerate_by(self, diff: int) -> None: ...
     def read_resolve(self) -> None: ...
     def resolve_direction(self, reverse: bool) -> None: ...
-    def update_position(self, distance: int, advance_info: AdvanceInfo) -> None: ...
+    def update_position(self, distance: int,
+                        advance_info: AdvanceInfo) -> None: ...
+
     def __str__(self) -> str: ...
 
+
 class AccelerationProblem:
     ZeroAcc: Any
     AboveMaxSpeed: Any
@@ -111,6 +122,7 @@ class AccelerationProblem:
 
     def message(self) -> str: ...
 
+
 class Accelerate:
     acc: int
 
@@ -118,6 +130,7 @@ class Accelerate:
     def perform(self, state: Any) -> Ship | BaseException: ...
     def __str__(self) -> str: ...
 
+
 class AdvanceProblem:
     MovementPointsMissing: Any
     InsufficientPush: Any
@@ -128,12 +141,14 @@ class AdvanceProblem:
 
     def message(self) -> str: ...
 
+
 class Advance:
     distance: int
 
     def __init__(self, distance: int) -> None: ...
     def perform(self, state: GameState) -> Ship | BaseException: ...
 
+
 class PushProblem:
     MovementPointsMissing: Any
     SameFieldPush: Any
@@ -144,11 +159,14 @@ class PushProblem:
 
     def message(self) -> str: ...
 
+
 class Push:
     direction: CubeDirection
 
     def __init__(self, direction: CubeDirection) -> None: ...
-    def perform(self, state: GameState) -> Tuple[Ship, Ship] | BaseException: ...
+    def perform(self, state: GameState) -> Tuple[Ship,
+                                                 Ship] | BaseException: ...
+
 
 class TurnProblem:
     RotationOnSandbankNotAllowed: Any
@@ -157,6 +175,7 @@ class TurnProblem:
 
     def message(self) -> str: ...
 
+
 class Turn:
     direction: CubeDirection
 
@@ -164,10 +183,14 @@ class Turn:
     def perform(self, state: GameState) -> Ship | BaseException: ...
     def coal_cost(self, ship: Ship) -> int: ...
 
+
 class Passenger:
     direction: CubeDirection
     passenger: int
 
+    def __init__(direction: CubeDirection, passenger: int) -> None: ...
+
+
 class FieldType:
     Water: 0
     Island: 1
@@ -175,14 +198,18 @@ class FieldType:
     Goal: 3
     Sandbank: 4
 
+
 class Field:
     field_type: FieldType
     passenger: Optional[Passenger]
 
-    def __init__(field_type: FieldType, passenger: Optional[Passenger]) -> None: ...
+    def __init__(field_type: FieldType,
+                 passenger: Optional[Passenger]) -> None: ...
+
     def is_empty(self: Field) -> bool: ...
     def is_field_type(self: Field, field_type: FieldType) -> bool: ...
 
+
 class Segment:
     direction: CubeDirection
     center: CubeCoordinates
@@ -197,12 +224,17 @@ class Segment:
     def tip(self) -> CubeCoordinates: ...
     def get(self, coordinates: CubeCoordinates) -> Optional[Field]: ...
     def set(self, coordinates: CubeCoordinates, field: Field) -> None: ...
-    def local_to_global(self, coordinates: CubeCoordinates) -> CubeCoordinates: ...
-    def global_to_local(self, coordinates: CubeCoordinates) -> CubeCoordinates: ...
+
+    def local_to_global(
+        self, coordinates: CubeCoordinates) -> CubeCoordinates: ...
+    def global_to_local(
+        self, coordinates: CubeCoordinates) -> CubeCoordinates: ...
+
     def contains(self, coordinates: CubeCoordinates) -> bool: ...
     def array_coords(self, coords: CubeCoordinates) -> CartesianCoordinate: ...
     def cube_coords(self, coords: CartesianCoordinate) -> CubeCoordinates: ...
 
+
 class Board:
     segments: List[Segment]
     next_direction: CubeDirection
@@ -211,29 +243,39 @@ class Board:
         self, segments: List[Segment], next_direction: CubeDirection
     ) -> None: ...
     def get_segment(self, index: int) -> Optional[Segment]: ...
+
     def segment_with_index_at(
         self, coords: CubeCoordinates
     ) -> Optional[tuple[int, Segment]]: ...
     def get(self, coords: CubeCoordinates) -> Optional[Field]: ...
     def does_field_have_stream(self, coords: CubeCoordinates) -> bool: ...
+
     def get_field_in_direction(
         self, direction: CubeDirection, coords: CubeCoordinates
     ) -> Optional[Field]: ...
+
     def set_field_in_direction(
         self, direction: CubeDirection, coords: CubeCoordinates, field: Field
     ) -> None: ...
+
     def get_coordinate_by_index(
         self, segment_index: int, x_index: int, y_index: int
     ) -> CubeCoordinates: ...
+
     def segment_distance(
         self, coordinate1: CubeCoordinates, coordinate2: CubeCoordinates
     ) -> int: ...
     def segment_index(self, coordinate: CubeCoordinates) -> Optional[int]: ...
-    def find_segment(self, coordinate: CubeCoordinates) -> Optional[Segment]: ...
-    def neighboring_fields(self, coords: CubeCoordinates) -> List[Optional[Field]]: ...
+
+    def find_segment(
+        self, coordinate: CubeCoordinates) -> Optional[Segment]: ...
+    def neighboring_fields(
+        self, coords: CubeCoordinates) -> List[Optional[Field]]: ...
+
     def effective_speed(self, ship: Ship) -> int: ...
     def is_sandbank(self, coords: CubeCoordinates) -> bool: ...
     def pickup_passenger(self, state: GameState) -> GameState: ...
+
     def pickup_passenger_at_position(self, pos: CubeCoordinates) -> Optional[Field]:
         """
         Picks up a passenger at the specified position using the CubeCoordinates.
@@ -272,12 +314,16 @@ class Board:
             board.find_nearest_field_types(CubeCoordinates(0, 0), FieldType.Water)
             ```
         """
+    
+    def pretty_print(self) -> None: ...
+
 
 class TeamPoints:
     ship_points: int
     coal_points: int
     finish_points: int
 
+
 class AdvanceInfo:
     costs: int
     problem: AdvanceProblem
@@ -286,6 +332,7 @@ class AdvanceInfo:
     def advances(self, distance: Optional[int]) -> List[Advance]: ...
     def distance(self) -> int: ...
 
+
 class GameState:
     board: Board
     turn: int
@@ -304,6 +351,7 @@ class GameState:
     def determine_ahead_team(self) -> Ship: ...
     def calculate_points(self, ship: Ship) -> int: ...
     def is_current_ship_on_current(self) -> bool: ...
+
     def perform_action(
         self, action: Accelerate | Advance | Push | Turn
     ) -> GameState: ...
@@ -318,6 +366,7 @@ class GameState:
     def ship_points(self, ship: Ship) -> int: ...
     def must_push(self) -> bool: ...
     def check_ship_advance_limit(self, ship: Ship) -> AdvanceInfo: ...
+
     def calculate_advance_info(
         self, start: CubeCoordinates, direction: CubeDirection, max_movement_points: int
     ) -> AdvanceInfo: ...
@@ -327,6 +376,7 @@ class GameState:
     def possible_advances(self) -> List[Advance]: ...
     def sandbank_advances_for(self, ship: Ship) -> Optional[List[Advance]]: ...
     def possible_moves(self) -> List[Move]: ...
+
     def possible_action_comb(
         self,
         current_state: GameState,
@@ -334,10 +384,13 @@ class GameState:
         depth: int,
         max_depth: int,
     ) -> List[List[Accelerate | Advance | Push | Turn]]: ...
+
     def possible_actions(
         self, rank: int
     ) -> List[Accelerate | Advance | Push | Turn]: ...
-    def coal_for_action(self, action: Accelerate | Advance | Push | Turn) -> int: ...
+    def coal_for_action(self, action: Accelerate |
+                        Advance | Push | Turn) -> int: ...
+
     def can_move(self) -> bool: ...
     def is_over(self) -> bool: ...
     def is_winner(self, ship: Ship) -> bool: ...

{socha-2.2.1 → socha-2.2.2}/python/socha/api/networking/game_client.py

@@ -12,8 +12,7 @@ from typing import List, Union
 from socha._socha import GameState, Move
 from socha.api.networking.utils import (
     handle_move,
-    if_last_game_state,
-    if_not_last_game_state,
+    message_to_state,
 )
 from socha.api.networking.xml_protocol_interface import XMLProtocolInterface
 from socha.api.protocol.protocol import (
@@ -190,7 +189,8 @@ class GameClient(XMLProtocolInterface):
         logging.info(
             f"Creating game with {player_1}, {player_2} and game type '{game_type}'"
         )
-        self.send(Prepare(game_type=game_type, pause=pause, slot=[player_1, player_2]))
+        self.send(Prepare(game_type=game_type,
+                  pause=pause, slot=[player_1, player_2]))
 
     def observe(self, room_id: str):
         logging.info(f"Observing game room '{room_id}'")
@@ -224,10 +224,12 @@ class GameClient(XMLProtocolInterface):
         """
 
         if isinstance(message, Joined):
-            logging.log(15, f"Game joined received with room id '{message.room_id}'")
+            logging.log(
+                15, f"Game joined received with room id '{message.room_id}'")
             self._game_handler.on_game_joined(room_id=message.room_id)
         elif isinstance(message, Left):
-            logging.log(15, f"Game left received with room id '{message.room_id}'")
+            logging.log(
+                15, f"Game left received with room id '{message.room_id}'")
             self._game_handler.on_game_left()
         elif isinstance(message, Prepared):
             logging.log(
@@ -239,8 +241,10 @@ class GameClient(XMLProtocolInterface):
                 reservations=message.reservation,
             )
         elif isinstance(message, Observed):
-            logging.log(15, f"Game observing received with room id '{message.room_id}'")
-            self._game_handler.on_observed(game_client=self, room_id=message.room_id)
+            logging.log(
+                15, f"Game observing received with room id '{message.room_id}'")
+            self._game_handler.on_observed(
+                game_client=self, room_id=message.room_id)
         elif isinstance(message, Room) and not self.headless:
             room_id = message.room_id
 
@@ -251,17 +255,20 @@ class GameClient(XMLProtocolInterface):
                 self._game_handler.on_error(str(message))
                 self.stop()
             elif isinstance(message.data.class_binding, MoveRequest):
-                logging.log(15, f"Move request received for room id '{room_id}'")
+                logging.log(
+                    15, f"Move request received for room id '{room_id}'")
                 self._on_move_request(room_id)
             elif isinstance(message.data.class_binding, State):
                 logging.log(15, f"State received for room id '{room_id}'")
                 self._on_state(message)
             elif isinstance(message.data.class_binding, Result):
                 logging.log(15, f"Result received for room id '{room_id}'")
-                self._game_handler.history[-1].append(message.data.class_binding)
+                self._game_handler.history[-1].append(
+                    message.data.class_binding)
                 self._game_handler.on_game_over(message.data.class_binding)
             else:
-                logging.log(15, f"Room message received for room id '{room_id}'")
+                logging.log(
+                    15, f"Room message received for room id '{room_id}'")
                 self._game_handler.on_room_message(message.data.class_binding)
         else:
             room_id = message.room_id
@@ -281,17 +288,9 @@ class GameClient(XMLProtocolInterface):
             logging.error(f"{move_response} is not a valid move.")
 
     def _on_state(self, message):
-        last_game_state = None
-        for item in self._game_handler.history[-1][::-1]:
-            if isinstance(item, GameState):
-                last_game_state = item
-                break
-        if last_game_state:
-            _game_state = if_last_game_state(message, last_game_state)
-        else:
-            _game_state = if_not_last_game_state(message)
-        self._game_handler.history[-1].append(_game_state)
-        self._game_handler.on_update(_game_state)
+        _state = message_to_state(message)
+        self._game_handler.history[-1].append(_state)
+        self._game_handler.on_update(_state)
 
     def start(self):
         """
@@ -329,9 +328,11 @@ class GameClient(XMLProtocolInterface):
             )
             self._game_handler.while_disconnected(player_client=self)
         if self.auto_reconnect:
-            logging.info("The server left. Client tries to reconnect to the server.")
+            logging.info(
+                "The server left. Client tries to reconnect to the server.")
             for _ in range(3):
-                logging.info("Try to establish a connection with the server...")
+                logging.info(
+                    "Try to establish a connection with the server...")
                 try:
                     self.connect()
                     if self.network_interface.connected:
@@ -375,8 +376,10 @@ class GameClient(XMLProtocolInterface):
                     while_waiting.start()
                     gc.collect()
                 elif self.running:
-                    logging.error(f"Received a object of unknown class: {response}")
-                    raise NotImplementedError("Received object of unknown class.")
+                    logging.error(
+                        f"Received a object of unknown class: {response}")
+                    raise NotImplementedError(
+                        "Received object of unknown class.")
             else:
                 self._game_handler.while_disconnected(player_client=self)