fix: infinite loop

enh: result table display
enh: optimize next expression position find

Author: kamarton

crossmath.py

@@ -1,4 +1,5 @@
 import random
+import time
 from typing import Tuple, List
 
 from table import Table
@@ -40,27 +41,35 @@ def _gen_random_expression_free(self, operator=None) -> List:
         return [operands[0], operator, operands[1], '=', result]
 
     def _get_random_cell_for_next(self) -> Tuple[int, int, int, int]:
+        start_time = time.time()
+        counter = 0
+        cells = self.table.find_not_empty_cells()
+        if len(cells) == 0:
+            cells = [self.table.get_cell(0, 0)]
         while True:
-            cells = self.table.find_not_empty_cells()
-            if not cells:
-                cell_operand = self.table.get_cell(0, 0)
-            else:
-                cell_operand = random.choice(cells)
-            horizontal = random.choice([True, False])
-            if horizontal:
-                if self.table.get_cell(cell_operand.get_x() + 1, cell_operand.get_y()).is_not_empty():
-                    continue
-                if self.table.get_cell(cell_operand.get_x() - 1, cell_operand.get_y()).is_not_empty():
-                    continue
-            else:
-                if self.table.get_cell(cell_operand.get_x(), cell_operand.get_y() + 1).is_not_empty():
-                    continue
-                if self.table.get_cell(cell_operand.get_x(), cell_operand.get_y() - 1).is_not_empty():
-                    continue
-            return cell_operand.get_x(), cell_operand.get_y(), 1 if horizontal else 0, 0 if horizontal else 1
+            counter += 1
+            if time.time() - start_time > 0.005:
+                raise Exception('timeout: ', time.time() - start_time, 'counter: ', counter)
+            cell_operand = random.choice(cells)
+            directions = []
+            if self.table.get_cell(cell_operand.get_x() + 1, cell_operand.get_y()).is_not_empty() is False:
+                directions.append((1, 0))
+            if self.table.get_cell(cell_operand.get_x() - 1, cell_operand.get_y()).is_not_empty() is False:
+                directions.append((-1, 0))
+            if self.table.get_cell(cell_operand.get_x(), cell_operand.get_y() + 1).is_not_empty() is False:
+                directions.append((0, 1))
+            if self.table.get_cell(cell_operand.get_x(), cell_operand.get_y() - 1).is_not_empty() is False:
+                directions.append((0, -1))
+
+            if len(directions) == 0:
+                cells.remove(cell_operand)
+                continue
+            direction = random.choice(directions)
+            return cell_operand.get_x(), cell_operand.get_y(), direction[0], direction[1]
 
     def generate(self):
-        for _ in range(2):
+        start_time = time.time()
+        for _ in range(20):
             x, y, xadd, yadd = self._get_random_cell_for_next()
             expression = self._gen_random_expression()
 
@@ -69,6 +78,7 @@ def generate(self):
                 cell.set_value(expression_part)
                 x += xadd
                 y += yadd
+            print('time: ', time.time() - start_time)
 
     def print(self):
         self.table.print()

requirements.txt

@@ -0,0 +1 @@
+pandas

table.py

@@ -1,4 +1,5 @@
 from typing import List
+import pandas
 
 
 class Cell:
@@ -37,21 +38,8 @@ def get_x(self) -> int:
     def get_y(self) -> int:
         return self._y
 
-    def __str__(self):
-        if self._value is None:
-            value = '_'
-        else:
-            value = str(self._value)
-        return value
-
     def __repr__(self):
-        x = str(self._x).rjust(2, ' ')
-        y = str(self._y).rjust(2, ' ')
-        if self._value is None:
-            value = '   '
-        else:
-            value = str(self._value).center(3, ' ')
-        return f'({x} x {y}) | {value} |'
+        return '' if self._value is None else str(self._value)
 
 
 class Table:
@@ -63,11 +51,8 @@ def __init__(self):
         self._max_y: int = 0
 
     def find_not_empty_cells(self) -> List[Cell]:
-        result = []
-        for cell in self._cells:
-            if cell.is_not_empty():
-                result.append(cell)
-        return result
+        # all cells is not empty in this case
+        return self._cells[:]
 
     def get_cell(self, x: int, y: int, empty_cell: bool = True) -> Cell | None:
         for cell in self._cells:
@@ -76,12 +61,15 @@ def get_cell(self, x: int, y: int, empty_cell: bool = True) -> Cell | None:
         return TableCell(self, x, y) if empty_cell else None
 
     def print(self):
+        rows = []
         for y in range(self.get_min_y(), self.get_max_y() + 1):
-            row = []
+            cols = []
             for x in range(self.get_min_x(), self.get_max_x() + 1):
                 cell = self.get_cell(x, y)
-                row.append(cell)
-            print(row)
+                cols.append(cell)
+            rows.append(cols)
+        df = pandas.DataFrame(rows)
+        print(df)
 
     def get_min_x(self) -> int:
         return self._min_x