Implement adjacency_matrix and expression in _FunctionStorage

Author: blegat

src/Nonlinear/ReverseAD/types.jl

@@ -42,6 +42,15 @@ struct _SubexpressionStorage
     end
 end
 
+function MOI.Nonlinear.expression(expr::_SubexpressionStorage)
+    return MOI.Nonlinear.Expression(
+        expr.nodes,
+        expr.const_values,
+    )
+end
+
+MOI.Nonlinear.adjacency_matrix(expr::_SubexpressionStorage) = expr.adj
+
 struct _FunctionStorage
     nodes::Vector{Nonlinear.Node}
     adj::SparseArrays.SparseMatrixCSC{Bool,Int}
@@ -136,6 +145,15 @@ struct _FunctionStorage
     end
 end
 
+function MOI.Nonlinear.expression(expr::_FunctionStorage)
+    return MOI.Nonlinear.Expression(
+        expr.nodes,
+        expr.const_values,
+    )
+end
+
+MOI.Nonlinear.adjacency_matrix(expr::_FunctionStorage) = expr.adj
+
 """
     NLPEvaluator(
         model::Nonlinear.Model,

src/Nonlinear/types.jl

@@ -76,9 +76,10 @@ tree.
 struct Expression
     nodes::Vector{Node}
     values::Vector{Float64}
-    Expression() = new(Node[], Float64[])
 end
 
+Expression() = Expression(Node[], Float64[])
+
 function Base.:(==)(x::Expression, y::Expression)
     return x.nodes == y.nodes && x.values == y.values
 end
@@ -107,6 +108,8 @@ struct Constraint
     }
 end
 
+expression(c::Constraint) = c.expression
+
 """
     ParameterIndex