Merge pull request #3017 from jsiirola/ad-named-expr

Fix differentiation of `Expressions` containing `native_numeric_types`
Pyomo · Oct 20, 2023 · 12be54c · 12be54c
2 parents 40c3dae + 4c13589
commit 12be54c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pyomo/core/expr/calculus/diff_with_pyomo.py b/pyomo/core/expr/calculus/diff_with_pyomo.py
@@ -328,7 +328,7 @@ def _diff_GeneralExpression(node, val_dict, der_dict):
     val_dict: ComponentMap
     der_dict: ComponentMap
     """
-    der_dict[node.expr] += der_dict[node]
+    der_dict[node.arg(0)] += der_dict[node]
 
 
 def _diff_ExternalFunctionExpression(node, val_dict, der_dict):

diff --git a/pyomo/core/tests/unit/test_derivs.py b/pyomo/core/tests/unit/test_derivs.py
@@ -230,6 +230,17 @@ def e2(m, i):
         symbolic = reverse_sd(m.o.expr)
         self.assertAlmostEqual(derivs[m.x], pyo.value(symbolic[m.x]), tol)
 
+    def test_constant_named_expressions(self):
+        m = pyo.ConcreteModel()
+        m.x = pyo.Var(initialize=3)
+        m.e = pyo.Expression(expr=2)
+
+        e = m.x * m.e
+        derivs = reverse_ad(e)
+        symbolic = reverse_sd(e)
+        self.assertAlmostEqual(derivs[m.x], pyo.value(symbolic[m.x]), tol + 3)
+        self.assertAlmostEqual(derivs[m.x], approx_deriv(e, m.x), tol)
+
     def test_multiple_named_expressions(self):
         m = pyo.ConcreteModel()
         m.x = pyo.Var()