Life game with real print terminal

sandbox/life_game/__init__.py

@@ -1 +0,0 @@
-__author__ = 'bux'

sandbox/life_game/run.py

@@ -0,0 +1,84 @@
+import sys
+import collections
+from sandbox.life_game.simulation import CellBornBehaviour, CellDieBehaviour, Cell, Empty
+
+from sandbox.life_game.utils import get_subjects_from_str_representation
+from synergine2.core import Core
+from synergine2.cycle import CycleManager
+from synergine2.simulation import Simulation
+from synergine2.terminals import Terminal
+from synergine2.terminals import TerminalPackage
+from synergine2.terminals import TerminalManager
+from synergine2.xyz_utils import get_str_representation_from_positions
+
+
+class SimplePrintTerminal(Terminal):
+    def __init__(self):
+        super().__init__()
+        self.subjects = None
+
+    def receive(self, value):
+        self.update_with_package(value)
+        self.print_str_representation()
+
+    def update_with_package(self, package: TerminalPackage):
+        self.subjects = package.subjects if package.subjects else self.subjects
+        for subject_id, actions in package.actions.items():
+            for action, value in actions.items():
+                if action == CellBornBehaviour:
+                    # Remove Empty subject
+                    self.subjects = [s for s in self.subjects[:] if s.id != subject_id]
+                    # Add born subject
+                    self.subjects.append(value)
+                if action == CellDieBehaviour:
+                    # Remove Cell subject
+                    self.subjects = [s for s in self.subjects[:] if s.id != subject_id]
+                    # Add Empty subject
+                    self.subjects.append(value)
+
+    def print_str_representation(self):
+        items_positions = collections.defaultdict(list)
+        for subject in self.subjects:
+            if type(subject) == Cell:
+                items_positions['1'].append(subject.position)
+            if type(subject) == Empty:
+                items_positions['0'].append(subject.position)
+        print(get_str_representation_from_positions(
+            items_positions,
+            separator=' ',
+            #force_items_as=(('0', ' '),),
+        ))
+        print()
+
+
+def main():
+    start_str_representation = """
+        0 0 0 0 0 0 0 0 0 0 0
+        0 0 0 1 1 1 1 0 0 0 0
+        0 0 0 1 0 0 1 0 0 0 0
+        0 1 1 1 0 0 1 1 1 0 0
+        0 1 0 0 0 0 0 0 1 0 0
+        0 1 0 0 0 0 0 0 1 0 0
+        0 1 1 1 0 0 1 1 1 0 0
+        0 0 0 1 0 0 1 0 0 0 0
+        0 0 0 1 1 1 1 0 0 0 0
+        0 0 0 0 0 0 0 0 0 0 0
+        0 0 0 0 0 0 0 0 0 0 0
+    """
+    simulation = Simulation()
+    subjects = get_subjects_from_str_representation(
+        start_str_representation,
+        simulation,
+    )
+    simulation.subjects = subjects
+
+    core = Core(
+        simulation=simulation,
+        cycle_manager=CycleManager(subjects=subjects),
+        terminal_manager=TerminalManager([SimplePrintTerminal()]),
+    )
+    core.run()
+
+
+if __name__ == '__main__':
+    main()

sandbox/life_game/simulation.py

@@ -29,6 +29,7 @@ class CellDieBehaviour(Behaviour):
         )
         self.simulation.subjects.remove(self.subject)
         self.simulation.subjects.append(new_empty)
+        return new_empty
 
 
 class CellBornBehaviour(Behaviour):
@@ -47,6 +48,7 @@ class CellBornBehaviour(Behaviour):
         )
         self.simulation.subjects.remove(self.subject)
         self.simulation.subjects.append(new_cell)
+        return new_cell
 
 
 class Cell(XYZSubjectMixin, Subject):

sandbox/life_game/utils.py

@@ -0,0 +1,25 @@
+from sandbox.life_game.simulation import Empty
+from sandbox.life_game.simulation import Cell
+from synergine2.simulation import Subjects, Simulation
+from synergine2.xyz_utils import get_positions_from_str_representation
+
+
+def get_subjects_from_str_representation(
+    str_representations: str,
+    simulation: Simulation,
+) -> [Cell, Empty]:
+    subjects = Subjects(simulation=simulation)
+    items_positions = get_positions_from_str_representation(str_representations)
+    for item, positions in items_positions.items():
+        for position in positions:
+            if item == '0':
+                subjects.append(Empty(
+                    simulation=simulation,
+                    position=position,
+                ))
+            if item == '1':
+                subjects.append(Cell(
+                    simulation=simulation,
+                    position=position,
+                ))
+    return subjects

synergine2/core.py

@@ -0,0 +1,35 @@
+from synergine2.cycle import CycleManager
+from synergine2.simulation import Simulation
+from synergine2.terminals import TerminalManager
+from synergine2.terminals import TerminalPackage
+
+
+class Core(object):
+    def __init__(
+        self,
+        simulation: Simulation,
+        cycle_manager: CycleManager,
+        terminal_manager: TerminalManager=None,
+
+    ):
+        self.simulation = simulation
+        self.cycle_manager = cycle_manager
+        self.terminal_manager = terminal_manager or TerminalManager([])
+
+    def run(self):
+        try:
+            self.terminal_manager.start()
+
+            start_package = TerminalPackage(subjects=self.simulation.subjects)
+            self.terminal_manager.send(start_package)
+
+            while True:
+                # TODO: receive from terminals
+                actions = self.cycle_manager.next()
+                cycle_package = TerminalPackage(actions=actions)
+                self.terminal_manager.send(cycle_package)
+                import time
+                time.sleep(1)  # TODO: tick control
+        except KeyboardInterrupt:
+            pass  # Just stop while
+        self.terminal_manager.stop()

synergine2/cycle.py

@@ -1,4 +1,5 @@
 import multiprocessing
+import collections
 
 from synergine2.processing import ProcessManager
 from synergine2.simulation import Subject, Behaviour, Mechanism
@@ -19,19 +20,23 @@ class CycleManager(object):
             )
 
         self.subjects = subjects
-        self._process_manager = process_manager
-        self._current_cycle = 0
+        self.process_manager = process_manager
+        self.current_cycle = 0
 
     def next(self):
         results = {}
-        results_by_processes = self._process_manager.execute_jobs(self.subjects)
+        results_by_processes = self.process_manager.execute_jobs(self.subjects)
+        actions = collections.defaultdict(dict)
         for process_results in results_by_processes:
             results.update(process_results)
         for subject in self.subjects[:]:  # Duplicate list to prevent conflicts with behaviours subjects manipulations
             for behaviour_class in results[subject.id]:
                 # TODO: Ajouter une etape de selection des actions a faire (genre neuronnal)
                 # TODO: les behaviour_class ont le même uniqueid apres le process ?
-                subject.behaviours[behaviour_class].action(results[subject.id][behaviour_class])
+                action_result = subject.behaviours[behaviour_class].action(results[subject.id][behaviour_class])
+                actions[subject.id][behaviour_class] = action_result
+
+        return actions
 
     def computing(self, subjects):
         # compute mechanisms (prepare check to not compute slienced or not used mechanisms)

synergine2/simulation.py

@@ -82,8 +82,9 @@ class Behaviour(object):
         """
         raise NotImplementedError()
 
-    def action(self, data):
+    def action(self, data) -> object:
         """
         Method called in main process
+        Return value will be give to terminals
         """
         raise NotImplementedError()

synergine2/terminals.py

@@ -4,17 +4,19 @@ from multiprocessing import Process
 from queue import Empty
 
 import time
+from synergine2.simulation import Simulation, Subject
 
 STOP_SIGNAL = '__STOP_SIGNAL__'
 
 
 class TerminalPackage(object):
-    def __init__(self, value):
-        self._value = value
-
-    @property
-    def value(self):
-        return self._value
+    def __init__(
+            self,
+            subjects: [Subject]=None,
+            actions: ['TODO']=None,
+    ):
+        self.subjects = subjects
+        self.actions = actions or {}
 
 
 class Terminal(object):
@@ -36,8 +38,11 @@ class Terminal(object):
         """
         Override this method to create your daemon terminal
         """
-        while self.read():
-            time.sleep(self.DEFAULT_SLEEP)
+        try:
+            while self.read():
+                time.sleep(self.DEFAULT_SLEEP)
+        except KeyboardInterrupt:
+            pass
 
     def read(self):
         while True:
@@ -51,11 +56,11 @@ class Terminal(object):
             except Empty:
                 return True  # Finished to read Queue
 
-    def receive(self, package: TerminalPackage):
+    def receive(self, value):
         raise NotImplementedError()
 
-    def send(self, package: TerminalPackage):
-        self._output_queue.put(package)
+    def send(self, value):
+        self._output_queue.put(value)
 
 
 class TerminalManager(object):
@@ -82,17 +87,17 @@ class TerminalManager(object):
         for output_queue in self._outputs_queues:
             output_queue.put(STOP_SIGNAL)
 
-    def send(self, package: TerminalPackage):
+    def send(self, value):
         for output_queue in self._outputs_queues:
-            output_queue.put(package)
+            output_queue.put(value)
 
     def receive(self) -> []:
-        packages = []
+        values = []
         for input_queue in self._inputs_queues:
             try:
                 while True:
-                    packages.append(input_queue.get(block=False, timeout=None))
+                    values.append(input_queue.get(block=False, timeout=None))
             except Empty:
                 pass  # Queue is empty
 
-        return packages
+        return values

synergine2/xyz_utils.py

@@ -48,6 +48,7 @@ def get_str_representation_from_positions(
     tabulation='',
     start_with='',
     end_with='',
+    force_items_as=None,
 ) -> str:
     positions = []
     for item_positions in items_positions.values():
@@ -76,7 +77,14 @@ def get_str_representation_from_positions(
         if position[2] != current_z:
             str_representation += '----' + "\n" + tabulation
 
-        added_value = item
+        str_item = item
+        if force_items_as:
+            for force_item_as in force_items_as:
+                if force_item_as[0] == item:
+                    str_item = force_item_as[1]
+                    break
+
+        added_value = str_item
         if position[0] != start_x:
             added_value = separator + added_value
 

tests/test_life_game.py

@@ -1,13 +1,32 @@
 import collections
-from sandbox.life_game.simulation import Cell, Empty
+from sandbox.life_game.simulation import Cell
+from sandbox.life_game.simulation import Empty
+from sandbox.life_game.utils import get_subjects_from_str_representation
 from synergine2.cycle import CycleManager
-from synergine2.simulation import Simulation, Subjects
-from synergine2.utils import initialize_subject
+from synergine2.simulation import Simulation
+from synergine2.simulation import Subjects
 from synergine2.xyz_utils import get_str_representation_from_positions
-from tests import BaseTest, str_kwargs
+from tests import BaseTest
+from tests import str_kwargs
 
 
-class TestSimpleSimulation(BaseTest):
+class LifeGameBaseTest(BaseTest):
+    def _get_str_representation_of_subjects(self, subjects: list):
+        items_positions = collections.defaultdict(list)
+
+        for subject in subjects:
+            if type(subject) == Cell:
+                items_positions['1'].append(subject.position)
+            if type(subject) == Empty:
+                items_positions['0'].append(subject.position)
+
+        return get_str_representation_from_positions(
+            items_positions,
+            **str_kwargs
+        )
+
+
+class TestSimpleSimulation(LifeGameBaseTest):
     def test_cycles_evolution(self):
         simulation = Simulation()
         subjects = self._get_subjects(simulation)
@@ -78,16 +97,104 @@ class TestSimpleSimulation(BaseTest):
             ))
         return cells
 
-    def _get_str_representation_of_subjects(self, subjects: list):
-        items_positions = collections.defaultdict(list)
 
-        for subject in subjects:
-            if type(subject) == Cell:
-                items_positions['1'].append(subject.position)
-            if type(subject) == Empty:
-                items_positions['0'].append(subject.position)
+class TestMultipleSimulations(LifeGameBaseTest):
+    def test_cross(self):
+        str_representations = [
+            """
+            0 0 0 0 0 0 0 0 0 0 0
+            0 0 0 1 1 1 1 0 0 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 1 1 1 0 0 1 1 1 0 0
+            0 1 0 0 0 0 0 0 1 0 0
+            0 1 0 0 0 0 0 0 1 0 0
+            0 1 1 1 0 0 1 1 1 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 0 1 1 1 1 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+        """,
+            """
+            0 0 0 0 1 1 0 0 0 0 0
+            0 0 0 1 1 1 1 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+            0 1 0 1 0 0 1 0 1 0 0
+            1 1 0 0 0 0 0 0 1 1 0
+            1 1 0 0 0 0 0 0 1 1 0
+            0 1 0 1 0 0 1 0 1 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+            0 0 0 1 1 1 1 0 0 0 0
+            0 0 0 0 1 1 0 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+        """,
+            """
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 1 1 0 0 1 1 0 0 0
+            1 1 1 0 0 0 0 1 1 1 0
+            0 0 0 0 0 0 0 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+            1 1 1 0 0 0 0 1 1 1 0
+            0 0 1 1 0 0 1 1 0 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+        """,
+            """
+            0 0 0 0 0 0 0 0 0 0 0
+            0 0 0 1 1 1 1 0 0 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 1 1 1 0 0 1 1 1 0 0
+            0 1 0 0 0 0 0 0 1 0 0
+            0 1 0 0 0 0 0 0 1 0 0
+            0 1 1 1 0 0 1 1 1 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 0 1 1 1 1 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+        """,
+            """
+            0 0 0 0 1 1 0 0 0 0 0
+            0 0 0 1 1 1 1 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+            0 1 0 1 0 0 1 0 1 0 0
+            1 1 0 0 0 0 0 0 1 1 0
+            1 1 0 0 0 0 0 0 1 1 0
+            0 1 0 1 0 0 1 0 1 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+            0 0 0 1 1 1 1 0 0 0 0
+            0 0 0 0 1 1 0 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+        """,
+            """
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 1 1 0 0 1 1 0 0 0
+            1 1 1 0 0 0 0 1 1 1 0
+            0 0 0 0 0 0 0 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+            1 1 1 0 0 0 0 1 1 1 0
+            0 0 1 1 0 0 1 1 0 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 0 1 0 0 1 0 0 0 0
+            0 0 0 0 0 0 0 0 0 0 0
+        """
+        ]
 
-        return get_str_representation_from_positions(
-            items_positions,
-            **str_kwargs
+        simulation = Simulation()
+        subjects = get_subjects_from_str_representation(
+            str_representations[0],
+            simulation,
+        )
+        simulation.subjects = subjects
+
+        cycle_manager = CycleManager(
+            subjects=subjects,
         )
+
+        for str_representation in str_representations:
+            assert str_representation == \
+               self._get_str_representation_of_subjects(
+                    subjects,
+                )
+            cycle_manager.next()

tests/test_terminals.py

@@ -1,21 +1,20 @@
 import time
 
 from synergine2.terminals import Terminal
-from synergine2.terminals import TerminalPackage
 from synergine2.terminals import TerminalManager
 from tests import BaseTest
 
 
 class MultiplyTerminal(Terminal):
-    def receive(self, package: TerminalPackage):
-        self.send(TerminalPackage(package.value * 2))
-        self.send(TerminalPackage(package.value * 4))
+    def receive(self, value):
+        self.send(value * 2)
+        self.send(value * 4)
 
 
 class DivideTerminal(Terminal):
-    def receive(self, package: TerminalPackage):
-        self.send(TerminalPackage(package.value / 2))
-        self.send(TerminalPackage(package.value / 4))
+    def receive(self, value):
+        self.send(value / 2)
+        self.send(value / 4)
 
 
 class TestTerminals(BaseTest):
@@ -26,19 +25,19 @@ class TestTerminals(BaseTest):
             ]
         )
         terminals_manager.start()
-        terminals_manager.send(TerminalPackage(42))
+        terminals_manager.send(42)
 
         # We wait max 2s (see time.sleep) to consider
         # process have finished. If not, it will fail
-        packages = []
+        values = []
         for i in range(200):
-            packages.extend(terminals_manager.receive())
-            if len(packages) == 2:
+            values.extend(terminals_manager.receive())
+            if len(values) == 2:
                 break
             time.sleep(0.01)
 
-        assert 2 == len(packages)
-        values = [p.value for p in packages]
+        assert 2 == len(values)
+        values = [v for v in values]
         assert 84 in values
         assert 168 in values
 
@@ -52,19 +51,19 @@ class TestTerminals(BaseTest):
             ]
         )
         terminals_manager.start()
-        terminals_manager.send(TerminalPackage(42))
+        terminals_manager.send(42)
 
         # We wait max 2s (see time.sleep) to consider
         # process have finished. If not, it will fail
-        packages = []
+        values = []
         for i in range(200):
-            packages.extend(terminals_manager.receive())
-            if len(packages) == 4:
+            values.extend(terminals_manager.receive())
+            if len(values) == 4:
                 break
             time.sleep(0.01)
 
-        assert 4 == len(packages)
-        values = [p.value for p in packages]
+        assert 4 == len(values)
+        values = [v for v in values]
         assert 84 in values
         assert 168 in values
         assert 21 in values