Merge pull request #1138 from compas-dev/lts-backports/sync-230423

LTS backports/sync 230423

Author: gonzalocasas

.github/workflows/ironpython.yml

@@ -23,7 +23,7 @@ jobs:
       - name: "[RPC tests] Install CPython dependencies"
         run: |
           python -m pip install --upgrade pip
-          pip install cython --install-option='--no-cython-compile'
+          pip install cython --config-settings="--build-option=--no-cython-compile"
       - name: "[RPC tests] Install COMPAS on CPython"
         run: |
           pip install --no-cache-dir .

AUTHORS.md

@@ -36,3 +36,4 @@
 - Chen Kasirer <<[email protected]>> [@chenkasirer](https://github.com/chenkasirer)
 - Nickolas Maslarinos <<[email protected]>> [@nmaslarinos](https://github.com/nmaslarinos)
 - Katerina Toumpektsi <<[email protected]>> [@katarametin](https://github.com/katarametin)
+- Joelle Baehr-Bruyere <<[email protected]>> [@baehrjo](https://github.com/baehrjo)

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed bug that caused a new-line at the end of the `compas.HERE` constant in IronPython for Mac.
 * Fixed Grasshopper `draw_polylines` method to return `PolylineCurve` instead of `Polyline` because the latter shows as only points.
 * Fixed uninstall post-process.
+* Fixed `area_polygon` that was, in some cases, returning a negative area
+* Fixed support for `System.Decimal` data type on json serialization.
 
 ### Removed
 

src/compas/data/encoders.py

@@ -8,14 +8,26 @@
 
 from compas.data.exceptions import DecoderError
 
+IDictionary = None
+numpy_support = False
+dotnet_support = False
+
 # We don't do this from `compas.IPY` to avoid circular imports
 if "ironpython" == platform.python_implementation().lower():
+    dotnet_support = True
+
     try:
+        import System
         from System.Collections.Generic import IDictionary
     except:  # noqa: E722
-        IDictionary = None
-else:
-    IDictionary = None
+        pass
+
+try:
+    import numpy as np
+
+    numpy_support = True
+except ImportError:
+    numpy_support = False
 
 
 def cls_from_dtype(dtype):
@@ -113,11 +125,7 @@ def default(self, o):
         if hasattr(o, "__next__"):
             return list(o)
 
-        try:
-            import numpy as np
-        except ImportError:
-            pass
-        else:
+        if numpy_support:
             if isinstance(o, np.ndarray):
                 return o.tolist()
             if isinstance(
@@ -144,6 +152,10 @@ def default(self, o):
             if isinstance(o, np.void):
                 return None
 
+        if dotnet_support:
+            if isinstance(o, System.Decimal):
+                return float(o)
+
         return super(DataEncoder, self).default(o)
 
 

src/compas/geometry/_core/size.py

@@ -65,7 +65,7 @@ def area_polygon(polygon):
             area += 0.5 * length_vector(n)
         else:
             area -= 0.5 * length_vector(n)
-    return area
+    return abs(area)
 
 
 def area_polygon_xy(polygon):

tests/compas/data/test_json.py

@@ -1,12 +1,12 @@
 import compas
-
-from compas.geometry import Point, Vector, Frame
-from compas.geometry import Box
-from compas.geometry import Transformation
-
-from compas.datastructures import Network
 from compas.datastructures import Mesh
+from compas.datastructures import Network
 from compas.datastructures import VolMesh
+from compas.geometry import Box
+from compas.geometry import Frame
+from compas.geometry import Point
+from compas.geometry import Transformation
+from compas.geometry import Vector
 
 
 def test_json_native():
@@ -15,20 +15,6 @@ def test_json_native():
     assert after == [[], [], {}, "", 1, 1.0, True, None]
 
 
-if not compas.IPY:
-    import numpy as np
-
-    def test_json_numpy():
-        before = [
-            np.array([1, 2, 3]),
-            np.array([1.0, 2.0, 3.0]),
-            np.float64(1.0),
-            np.int32(1),
-        ]
-        after = compas.json_loads(compas.json_dumps(before))
-        assert after == [[1, 2, 3], [1.0, 2.0, 3.0], 1.0, 1]
-
-
 def test_json_primitive():
     before = Point(0, 0, 0)
     after = compas.json_loads(compas.json_dumps(before))

tests/compas/data/test_json_dotnet.py

@@ -0,0 +1,13 @@
+import compas
+
+try:
+    import System
+
+    def test_decimal():
+        before = System.Decimal(100.0)
+
+        after = compas.json_loads(compas.json_dumps(before))
+        assert after == 100.0
+
+except ImportError:
+    pass

tests/compas/data/test_json_numpy.py

@@ -0,0 +1,17 @@
+import compas
+
+try:
+    import numpy as np
+
+    def test_json_numpy():
+        before = [
+            np.array([1, 2, 3]),
+            np.array([1.0, 2.0, 3.0]),
+            np.float64(1.0),
+            np.int32(1),
+        ]
+        after = compas.json_loads(compas.json_dumps(before))
+        assert after == [[1, 2, 3], [1.0, 2.0, 3.0], 1.0, 1]
+
+except ImportError:
+    pass

tests/compas/geometry/test_core.py

@@ -3,7 +3,7 @@
 import pytest
 
 from compas.geometry import Polyhedron
-from compas.geometry import Polygon
+from compas.geometry import Point, Polygon
 from compas.geometry import Rotation
 from compas.geometry import allclose
 from compas.geometry import angle_vectors
@@ -230,6 +230,16 @@ def test_area_triangle(triangle, R):
     assert close(triangle.area, 0.5)
 
 
+def test_area_polygon():
+    # create a test closed (here planar xy) non-convex polygon :
+    polygon = [Point(-7, -15, 0), Point(-5, 9, 0), Point(13, 0, 0), Point(0, -2, 0), Point(0, -6, 0), Point(-4, -10, 0)]
+
+    assert area_polygon(polygon) >= 0
+    # the same polygon with vertices list shifted by 3 positions :
+    polygon_ = polygon[3:] + polygon[:3]
+    assert area_polygon(polygon_) >= 0
+
+
 # ==============================================================================
 # normals
 # ==============================================================================\