Merge branch 'main' into polyline_functions

Author: beverlylytle

CHANGELOG.md

@@ -11,9 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 * Added `divide_polyline`, `divide_polyline_by_length`, `Polyline.split_at_corners` and `Polyline.tangent_at_point_on_polyline`.
 
+* Added the magic method `__str__` to `compas.geoemetry.Transformation`.
+
 ### Changed
 
 * Fixed bug where mimic joints were considered configurable.
+* Fixed bug where `!=` gave incorrect results in Rhino for some compas objects.
 
 ### Removed
 

docs/gettingstarted/blender.rst

@@ -92,6 +92,21 @@ Note that the path ``~/Blender/2.91`` might be different for your setup.
     </div>
     </div>
 
+Add-ons
+=======
+
+For some Blender add-ons, not only the version of Python has to match, but also the version of Numpy.
+For example, `Sverchok <http://nortikin.github.io/sverchok/>`_, a Grasshopper-type visual programming tool for Blender,
+will not work with the version of Numpy included in the latest COMPAS releases, even though Blender will.
+
+In those cases, you can simply revert to an earlier version of Numpy that is still compatible with COMPAS
+in the environment you use with Blender. For Sverchok, this would be version ``1.17.5``,
+which is the one shipped with Blender originally. To revert simply do
+
+.. code-block:: bash
+
+    conda activate blender
+    conda install numpy=1.17.5
 
 Verify setup
 ============
@@ -105,7 +120,6 @@ In Blender, at the interactive Python prompt (>>>) import the following packages
     >>> import numpy
     >>> import scipy
 
-
 Install Python packages
 =======================
 
@@ -125,7 +139,6 @@ Otherwise, the changes will not have any effect.
     If you want to use blender with a different environment,
     you simply have to activate that environment and follow the same procedure described above.
 
-
 Start Blender
 =============
 
@@ -232,7 +245,6 @@ Especially for code that relies heavily on libraries such as Numpy and Scipy thi
     artist = MeshArtist(mesh)
     artist.draw_mesh()
 
-
 Data Blocks
 -----------
 
@@ -249,19 +261,16 @@ you will accumulate the data blocks from previous runs and after a while Blender
 ``compas_blender.clear()`` attempts to clean up not only the scene objects but also the data blocks.
 If somehow you still experience a slowdown, restarting Blender will help (all unused data blocks are then automatically removed).
 
-
 Layers
 ------
 
 There are no real layers in Blender; at least not like the layers in, for example, Rhino.
 Therefore, the Blender artists have no optional ``layer`` parameter and no ``clear_layer`` method.
 Instead, objects are grouped in collections, which can be turned on and off in the Blender UI similar to layers in Rhino.
 
-
 Collections
 -----------
 
-
 Limitations
 ===========
 

src/compas/geometry/primitives/_primitive.py

@@ -18,6 +18,10 @@ class Primitive(Base):
     def __init__(self):
         super(Primitive, self).__init__()
 
+    def __ne__(self, other):
+        # this is not obvious to ironpython
+        return not self.__eq__(other)
+
     @classmethod
     def from_json(cls, filepath):
         """Construct a primitive from structured data contained in a json file.

src/compas/geometry/transformations/transformation.py

@@ -97,9 +97,20 @@ def __eq__(self, other, tol=1e-05):
         except BaseException:
             return False
 
+    def __ne__(self, other):
+        # this is not obvious to ironpython
+        return not self.__eq__(other)
+
     def __repr__(self):
         return "Transformation({})".format(self.matrix)
 
+    def __str__(self):
+        s = "[[%s],\n" % ",".join([("%.4f" % n).rjust(10) for n in self.matrix[0]])
+        s += " [%s],\n" % ",".join([("%.4f" % n).rjust(10) for n in self.matrix[1]])
+        s += " [%s],\n" % ",".join([("%.4f" % n).rjust(10) for n in self.matrix[2]])
+        s += " [%s]]\n" % ",".join([("%.4f" % n).rjust(10) for n in self.matrix[3]])
+        return s
+
     def __len__(self):
         return len(self.matrix)
 

tests/compas/geometry/test_point.py

@@ -13,6 +13,16 @@ def test_point_operators():
     pass
 
 
+def test_point_equality():
+    p1 = Point(1, 1, 1)
+    p2 = Point(1, 1, 1)
+    p3 = Point(0, 0, 0)
+    assert p1 == p2
+    assert not (p1 != p2)
+    assert p1 != p3
+    assert not (p1 == p3)
+
+
 def test_point_inplace_operators():
     pass
 

tests/compas/geometry/test_transformations/test_transformation.py

@@ -108,10 +108,40 @@ def test_list():
     assert T.list == [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0]
 
 
-def concatenate():
+def test_concatenated():
     trans1 = [1, 2, 3]
     angle1 = [-2.142, 1.141, -0.142]
     T1 = Translation.from_vector(trans1)
     R1 = Rotation.from_euler_angles(angle1)
-    M1 = T1.concatenate(R1)
+    M1 = T1.concatenated(R1)
     assert allclose(M1, T1 * R1)
+
+
+def test___repr__():
+    trans = [1, 2, 3]
+    axes = [-2.142, 1.141, -0.142]
+    angle = 0.7854
+    R = Rotation.from_axis_and_angle(axes, angle, point=trans)
+    assert R == eval(repr(R))
+
+
+def test___str__():
+    s = '[[    0.9345,   -0.0798,    0.3469,   -0.8157],\n' + \
+        ' [   -0.1624,    0.7716,    0.6150,   -1.2258],\n' + \
+        ' [   -0.3168,   -0.6311,    0.7081,    2.4546],\n' + \
+        ' [    0.0000,    0.0000,    0.0000,    1.0000]]\n'
+    trans = [1, 2, 3]
+    axes = [-2.142, 1.141, -0.142]
+    angle = 0.7854
+    R = Rotation.from_axis_and_angle(axes, angle, point=trans)
+    assert s == str(R)
+
+
+def test___eq__():
+    i1 = Transformation()
+    i2 = Transformation()
+    t = Translation.from_vector([1, 0, 0])
+    assert i1 == i2
+    assert not (i1 != i2)
+    assert i1 != t
+    assert not (i1 == t)