sleipnirgroup-jormungandr 0.6.3.dev2__tar.gz → 0.6.4.dev1__tar.gz

{sleipnirgroup_jormungandr-0.6.3.dev2 → sleipnirgroup_jormungandr-0.6.4.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sleipnirgroup-jormungandr
-Version: 0.6.3.dev2
+Version: 0.6.4.dev1
 Summary: Reverse mode autodiff library and NLP solver DSL
 License-Expression: BSD-3-Clause
 License-File: LICENSE.txt

{sleipnirgroup_jormungandr-0.6.3.dev2 → sleipnirgroup_jormungandr-0.6.4.dev1}/include/sleipnir/autodiff/variable_block.hpp

@@ -461,22 +461,6 @@ class VariableBlock : public SleipnirBase {
     return *this;
   }
 
-  /// Compound matrix division-assignment operator.
-  ///
-  /// @param rhs Variable to divide.
-  /// @return Result of division.
-  VariableBlock<Mat>& operator/=(const MatrixLike auto& rhs) {
-    slp_assert(rhs.rows() == 1 && rhs.cols() == 1);
-
-    for (int row = 0; row < rows(); ++row) {
-      for (int col = 0; col < cols(); ++col) {
-        (*this)[row, col] /= rhs[0, 0];
-      }
-    }
-
-    return *this;
-  }
-
   /// Compound matrix division-assignment operator.
   ///
   /// @param rhs Variable to divide.

{sleipnirgroup_jormungandr-0.6.3.dev2 → sleipnirgroup_jormungandr-0.6.4.dev1}/python/cpp/docstrings.hpp

@@ -1377,15 +1377,6 @@ Returns:
 static const char *__doc_slp_VariableBlock_operator_idiv =
 R"doc(Compound matrix division-assignment operator.
 
-Parameter ``rhs``:
-    Variable to divide.
-
-Returns:
-    Result of division.)doc";
-
-static const char *__doc_slp_VariableBlock_operator_idiv_2 =
-R"doc(Compound matrix division-assignment operator.
-
 Parameter ``rhs``:
     Variable to divide.
 

{sleipnirgroup_jormungandr-0.6.3.dev2 → sleipnirgroup_jormungandr-0.6.4.dev1}/python/src/sleipnir/__init__.py

@@ -2,4 +2,4 @@
 
 from ._sleipnir import *  # noqa: F403
 
-__version__ = "0.6.3.dev2"
+__version__ = "0.6.4.dev1"

{sleipnirgroup_jormungandr-0.6.3.dev2 → sleipnirgroup_jormungandr-0.6.4.dev1}/python/test/autodiff/variable_matrix_test.py

@@ -213,6 +213,51 @@ def test_subslicing():
     ).all()
 
 
+def test_compound_assignment_operators():
+    A1 = VariableMatrix([[1]])
+    A2 = VariableMatrix([[1, 2], [3, 4]])
+    B = VariableMatrix([[1, 2], [3, 4]])
+    b = 2
+
+    # VariableMatrix matrix-matrix operators
+    A2 += B
+    assert (A2.value() == np.array([[2, 4], [6, 8]])).all()
+    A2 -= B
+    assert (A2.value() == np.array([[1, 2], [3, 4]])).all()
+    A2 *= B
+    assert (A2.value() == np.array([[7, 10], [15, 22]])).all()
+    A2.set_value(np.array([[1, 2], [3, 4]]))
+
+    # VariableBlock matrix-matrix operators
+    A2[:, :] += B
+    assert (A2.value() == np.array([[2, 4], [6, 8]])).all()
+    A2[:, :] -= B
+    assert (A2.value() == np.array([[1, 2], [3, 4]])).all()
+    A2[:, :] *= B
+    assert (A2.value() == np.array([[7, 10], [15, 22]])).all()
+    A2.set_value(np.array([[1, 2], [3, 4]]))
+
+    # VariableMatrix matrix-scalar operators
+    A1 += b
+    assert (A1.value() == np.array([[3]])).all()
+    A1 -= b
+    assert (A1.value() == np.array([[1]])).all()
+    A2 *= b
+    assert (A2.value() == np.array([[2, 4], [6, 8]])).all()
+    A2 /= b
+    assert (A2.value() == np.array([[1, 2], [3, 4]])).all()
+
+    # VariableBlock matrix-scalar operators
+    A2[:1, :1] += b
+    assert (A2.value() == np.array([[3, 2], [3, 4]])).all()
+    A2[:1, :1] -= b
+    assert (A2.value() == np.array([[1, 2], [3, 4]])).all()
+    A2[:, :] *= b
+    assert (A2.value() == np.array([[2, 4], [6, 8]])).all()
+    A2[:, :] /= b
+    assert (A2.value() == np.array([[1, 2], [3, 4]])).all()
+
+
 def test_iterators():
     A = VariableMatrix([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0], [7.0, 8.0, 9.0]])
     sub_A = A[2:3, 1:3]