apply patch

bknueven · bknueven · commit cd8c6ae6a9e3 · 2024-03-07T16:19:49.000-07:00
diff --git a/pyomo/contrib/appsi/cmodel/src/expression.cpp b/pyomo/contrib/appsi/cmodel/src/expression.cpp
@@ -1789,7 +1789,8 @@ int build_expression_tree(py::handle pyomo_expr,
 
   if (expr_types.expr_type_map[py::type::of(pyomo_expr)].cast<ExprType>() ==
       named_expr)
-    pyomo_expr = pyomo_expr.attr("expr");
+    return build_expression_tree(pyomo_expr.attr("expr"), appsi_expr, var_map,
+                                 param_map, expr_types);
 
   if (appsi_expr->is_leaf()) {
     ;

Original file line number	Diff line number	Diff line change
`@@ -1789,7 +1789,8 @@ int build_expression_tree(py::handle pyomo_expr,`
`1789`	`1789`
`1790`	`1790`	`if (expr_types.expr_type_map[py::type::of(pyomo_expr)].cast<ExprType>() ==`
`1791`	`1791`	`named_expr)`
`1792`		`- pyomo_expr = pyomo_expr.attr("expr");`
	`1792`	`+ return build_expression_tree(pyomo_expr.attr("expr"), appsi_expr, var_map,`
	`1793`	`+ param_map, expr_types);`
`1793`	`1794`
`1794`	`1795`	`if (appsi_expr->is_leaf()) {`
`1795`	`1796`	`;`