Bug fixes

gefest/core/opt/constraints.py

@@ -22,12 +22,10 @@ def check_constraints(structure: Structure, is_lightweight: bool = False, domain
                unclosed_poly(structure, domain)]
         structurally_correct = not any(cts)
 
-        if not structurally_correct:
-            return structure
+        return structurally_correct
+
     except Exception as ex:
         print(ex)
         import traceback
         print(traceback.format_exc())
-        return False
-
-    return structure
+        return False
\ No newline at end of file

gefest/core/structure/structure.py

@@ -48,9 +48,9 @@ class Structure:
     def __str__(self):
         out_str = ''
         for i, pol in enumerate(self.polygons):
-            out_str += f'\r\n Polygon {i}, size {len(pol.points)}: \r\n'
-            for j, pt in enumerate(pol.points):
-                out_str += f'Point {j}: x={round(pt.x, 2)}, y={round(pt.y, 2)}; '
+            out_str += f'\nPolygon {i}, size {len(pol.points)}:\n'
+            out_str += ''.join(
+                [f'Point {j}: x={round(pt.x, 2)}, y={round(pt.y, 2)}; ' for j, pt in enumerate(pol.points)])
         return out_str
 
     def __repr__(self):

test/test_constraints.py

+import pytest
+
+from gefest.core.opt.constraints import check_constraints
+from gefest.core.structure.domain import Domain
+from gefest.core.structure.point import Point
+from gefest.core.structure.polygon import Polygon
+from gefest.core.structure.structure import Structure
+
+@pytest.fixture
+def domain():
+    # Create a valid domain for testing
+    return Domain(name='main', allowed_area=[(0, 0), (0, 10), (10, 10), (10, 0)],
+                  is_closed=False)
+
+@pytest.fixture
+def structure():
+    # Create a valid structure for testing
+    return Structure(polygons=[
+        Polygon(points=[Point(0, 0), Point(1, 0), Point(1, 1), Point(0, 1)]),
+        Polygon(points=[Point(2, 2), Point(3, 2), Point(3, 3), Point(2, 3)])
+    ])
+
+def test_valid_structure(structure, domain):
+    # Create a valid structure for testing
+    structure = Structure(polygons=[
+        Polygon(points=[Point(0, 0), Point(1, 0), Point(1, 1), Point(0, 1)]),
+        Polygon(points=[Point(2, 2), Point(3, 2), Point(3, 3), Point(2, 3)])
+    ])
+
+    # Check constraints on the structure
+    result = check_constraints(structure, domain=domain)
+
+    # Assert that the result is True (i.e. the structure is valid)
+    assert result is True
+
+
+def test_invalid_structure(structure, domain):
+    # Create an invalid structure for testing
+    structure.polygons.append(Polygon(points=[Point(2, 15), Point(3, 2), Point(3, 3), Point(2, 3)]))
+
+    # Check constraints on the structure
+    result = check_constraints(structure, domain=domain)
+
+    # Assert that the result is False (i.e. the structure is invalid)
+    assert result is False

test/test_structure.py

+from gefest.core.structure.point import Point
+from gefest.core.structure.polygon import Polygon
+from gefest.core.structure.structure import Structure
+
+
+def test_structure_to_string():
+    # Create a structure for testing
+    structure = Structure(polygons=[
+        Polygon(points=[Point(0, 0), Point(1, 0), Point(1, 1), Point(0, 1)]),
+        Polygon(points=[Point(2, 2), Point(3, 2), Point(3, 3), Point(2, 3)])
+    ])
+
+    # Check the string representation of the structure
+    result = str(structure)
+
+    # Define the expected output
+    expected = '\nPolygon 0, size 4:\nPoint 0: x=0, y=0; Point 1: x=1, ' \
+               'y=0; Point 2: x=1, y=1; Point 3: x=0, y=1; \nPolygon 1, ' \
+               'size 4:\nPoint 0: x=2, y=2; Point 1: x=3, y=2; Point 2: x=3, y=3; Point 3: x=2, y=3; '
+
+    # Assert that the result matches the expected output
+    assert result == expected

test/test_validation.py

-import pytest
-from gefest.core.geometry.geometry import Geometry
+from gefest.core.algs.geom.validation import *
 from gefest.core.geometry.geometry_2d import Geometry2D
 from gefest.core.structure.point import Point
-from gefest.core.structure.polygon import Polygon
 from gefest.core.structure.structure import Structure
-from gefest.core.algs.geom.validation import *
 
 geometry = Geometry2D()
 domain = Domain()
@@ -23,7 +20,7 @@ rectangle_poly = Polygon('rectangle', points=[Point(*coords) for coords in recta
 triangle_points = [(0, 0), (poly_width, poly_length), (0, poly_length)]
 triangle_poly = Polygon('triangle', points=[Point(*coords) for coords in triangle_points])
 
-out_points = [Point(x+200, y+200) for (x, y) in rectangle_points]
+out_points = [Point(x + 200, y + 200) for (x, y) in rectangle_points]
 out_poly = Polygon('out_rectangle', points=out_points)